Skip to content

Commit aec86b0

Browse files
committed
powerpc/64s: Fix crashes when toggling entry flush barrier
The entry flush mitigation can be enabled/disabled at runtime via a debugfs file (entry_flush), which causes the kernel to patch itself to enable/disable the relevant mitigations. However depending on which mitigation we're using, it may not be safe to do that patching while other CPUs are active. For example the following crash: sleeper[15639]: segfault (11) at c000000000004c20 nip c000000000004c20 lr c000000000004c20 Shows that we returned to userspace with a corrupted LR that points into the kernel, due to executing the partially patched call to the fallback entry flush (ie. we missed the LR restore). Fix it by doing the patching under stop machine. The CPUs that aren't doing the patching will be spinning in the core of the stop machine logic. That is currently sufficient for our purposes, because none of the patching we do is to that code or anywhere in the vicinity. Fixes: f796437 ("powerpc/64s: flush L1D on kernel entry") Cc: [email protected] # v5.10+ Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 8ec7791 commit aec86b0

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

arch/powerpc/lib/feature-fixups.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,9 @@ void do_uaccess_flush_fixups(enum l1d_flush_type types)
299299
: "unknown");
300300
}
301301

302-
void do_entry_flush_fixups(enum l1d_flush_type types)
302+
static int __do_entry_flush_fixups(void *data)
303303
{
304+
enum l1d_flush_type types = *(enum l1d_flush_type *)data;
304305
unsigned int instrs[3], *dest;
305306
long *start, *end;
306307
int i;
@@ -369,6 +370,19 @@ void do_entry_flush_fixups(enum l1d_flush_type types)
369370
: "ori type" :
370371
(types & L1D_FLUSH_MTTRIG) ? "mttrig type"
371372
: "unknown");
373+
374+
return 0;
375+
}
376+
377+
void do_entry_flush_fixups(enum l1d_flush_type types)
378+
{
379+
/*
380+
* The call to the fallback flush can not be safely patched in/out while
381+
* other CPUs are executing it. So call __do_entry_flush_fixups() on one
382+
* CPU while all other CPUs spin in the stop machine core with interrupts
383+
* hard disabled.
384+
*/
385+
stop_machine(__do_entry_flush_fixups, &types, NULL);
372386
}
373387

374388
void do_rfi_flush_fixups(enum l1d_flush_type types)

0 commit comments

Comments
 (0)