Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix incorrect stw{, ux, u, x} instructions in __set_pte_at

The placeholder for instruction selection should use the second
argument's operand, which is %1, not %0. This could generate incorrect
assembly code if the memory addressing of operand %0 is a different
form from that of operand %1.

Also remove the %Un placeholder because having %Un placeholders
for two operands which are based on the same local var (ptep) doesn't
make much sense. By the way, it doesn't change the current behaviour
because "<>" constraint is missing for the associated "=m".

[chleroy: revised commit log iaw segher's comments and removed %U0]

Fixes: 9bf2b5cdc5fe ("powerpc: Fixes for CONFIG_PTE_64BIT for SMP support")
Cc: <stable@vger.kernel.org> # v2.6.28+
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/96354bd77977a6a933fe9020da57629007fdb920.1603358942.git.christophe.leroy@csgroup.eu

authored by

Mathieu Desnoyers and committed by
Michael Ellerman
d85be8a4 7c6c86b3

+4 -4
+2 -2
arch/powerpc/include/asm/book3s/32/pgtable.h
··· 522 522 if (pte_val(*ptep) & _PAGE_HASHPTE) 523 523 flush_hash_entry(mm, ptep, addr); 524 524 __asm__ __volatile__("\ 525 - stw%U0%X0 %2,%0\n\ 525 + stw%X0 %2,%0\n\ 526 526 eieio\n\ 527 - stw%U0%X0 %L2,%1" 527 + stw%X1 %L2,%1" 528 528 : "=m" (*ptep), "=m" (*((unsigned char *)ptep+4)) 529 529 : "r" (pte) : "memory"); 530 530
+2 -2
arch/powerpc/include/asm/nohash/pgtable.h
··· 192 192 */ 193 193 if (IS_ENABLED(CONFIG_PPC32) && IS_ENABLED(CONFIG_PTE_64BIT) && !percpu) { 194 194 __asm__ __volatile__("\ 195 - stw%U0%X0 %2,%0\n\ 195 + stw%X0 %2,%0\n\ 196 196 eieio\n\ 197 - stw%U0%X0 %L2,%1" 197 + stw%X1 %L2,%1" 198 198 : "=m" (*ptep), "=m" (*((unsigned char *)ptep+4)) 199 199 : "r" (pte) : "memory"); 200 200 return;