Skip to content

Commit dd7b2f0

Browse files
ozbenhmpe
authored andcommitted
powerpc/mm: Fix lazy icache flush on pre-POWER5
On 64-bit CPUs with no-execute support and non-snooping icache, such as 970 or POWER4, we have a software mechanism to ensure coherency of the cache (using exec faults when needed). This was broken due to a logic error when the code was rewritten from assembly to C, previously the assembly code did: BEGIN_FTR_SECTION mr r4,r30 mr r5,r7 bl hash_page_do_lazy_icache END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE) Which tests that: (cpu_features & (NOEXECUTE | COHERENT_ICACHE)) == NOEXECUTE Which says that the current cpu does have NOEXECUTE, but does not have COHERENT_ICACHE. Fixes: 91f1da9 ("powerpc/mm: Convert 4k hash insert to C") Fixes: 89ff725 ("powerpc/mm: Convert __hash_page_64K to C") Fixes: a43c0eb ("powerpc/mm: Convert 4k insert from asm to C") Cc: stable@vger.kernel.org # v4.5+ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> [mpe: Change log verbosification] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
1 parent 10c77db commit dd7b2f0

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

arch/powerpc/mm/hash64_4k.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
5555
*/
5656
rflags = htab_convert_pte_flags(new_pte);
5757

58-
if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
58+
if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
5959
!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
6060
rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);
6161

arch/powerpc/mm/hash64_64k.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int __hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
8787
subpg_pte = new_pte & ~subpg_prot;
8888
rflags = htab_convert_pte_flags(subpg_pte);
8989

90-
if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
90+
if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
9191
!cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) {
9292

9393
/*
@@ -258,7 +258,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access,
258258

259259
rflags = htab_convert_pte_flags(new_pte);
260260

261-
if (!cpu_has_feature(CPU_FTR_NOEXECUTE) &&
261+
if (cpu_has_feature(CPU_FTR_NOEXECUTE) &&
262262
!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
263263
rflags = hash_page_do_lazy_icache(rflags, __pte(old_pte), trap);
264264

0 commit comments

Comments
 (0)