Skip to content

Commit eab6870

Browse files
djbwIngo Molnar
authored andcommitted
x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec()
Mark Rutland noticed that GCC optimization passes have the potential to elide necessary invocations of the array_index_mask_nospec() instruction sequence, so mark the asm() volatile. Mark explains: "The volatile will inhibit *some* cases where the compiler could lift the array_index_nospec() call out of a branch, e.g. where there are multiple invocations of array_index_nospec() with the same arguments: if (idx < foo) { idx1 = array_idx_nospec(idx, foo) do_something(idx1); } < some other code > if (idx < foo) { idx2 = array_idx_nospec(idx, foo); do_something_else(idx2); } ... since the compiler can determine that the two invocations yield the same result, and reuse the first result (likely the same register as idx was in originally) for the second branch, effectively re-writing the above as: if (idx < foo) { idx = array_idx_nospec(idx, foo); do_something(idx); } < some other code > if (idx < foo) { do_something_else(idx); } ... if we don't take the first branch, then speculatively take the second, we lose the nospec protection. There's more info on volatile asm in the GCC docs: https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#Volatile " Reported-by: Mark Rutland <[email protected]> Signed-off-by: Dan Williams <[email protected]> Acked-by: Mark Rutland <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Linus Torvalds <[email protected]> Cc: <[email protected]> Cc: Peter Zijlstra <[email protected]> Fixes: babdde2 ("x86: Implement array_index_mask_nospec") Link: https://lkml.kernel.org/lkml/152838798950.14521.4893346294059739135.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Ingo Molnar <[email protected]>
1 parent 6cb2b08 commit eab6870

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/barrier.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,
3838
{
3939
unsigned long mask;
4040

41-
asm ("cmp %1,%2; sbb %0,%0;"
41+
asm volatile ("cmp %1,%2; sbb %0,%0;"
4242
:"=r" (mask)
4343
:"g"(size),"r" (index)
4444
:"cc");

0 commit comments

Comments
 (0)