Skip to contentSkip to conversation

x86/delay: Fix the wrong asm constraint in `delay_loop()`

PATCH New Ammar Faizi 1 participant 1 message Jan 10, 2022 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/delay: Fix the wrong asm constraint in `delay_loop()`

The asm constraint does not reflect that the asm statement can modify the value of @loops. But the asm statement in delay_loop() does change the @loops.

If by any chance the compiler inlines this function, it may clobber random stuff (e.g. local variable, important temporary value in reg, etc.).

Fortunately, delay_loop() is only called indirectly (so it can't inline), and then the register it clobbers is %rax (which is by the nature of the calling convention, it's a caller saved register), so it didn't yield any bug.

^ That shouldn't be an excuse for using the wrong constraint anyway.

This changes "a" (as an input) to "+a" (as an input and output).

Fixes e01b70ef3eb3080fecc35e15f68cd274c0a48163 ("x86: fix bug in arch/i386/lib/delay.c file, delay_loop function")
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc "Kirill A. Shutemov" <[email protected]>
Cc Joerg Roedel <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc GNU/Weeb Mailing List <[email protected]>
---
 arch/x86/lib/delay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/lib/delay.c +2 -2
index 65d15df6212d..0e65d00e2339 100644
@@ -54,8 +54,8 @@ static void delay_loop(u64 __loops)
 		"	jnz 2b		\n"
 		"3:	dec %0		\n"
 
-		: /* we don't need output */
-		:"a" (loops)
+		: "+a" (loops)
+		:
 	);
 }
 

base-commit: bf4eebf8cfa2cd50e20b7321dfb3effdcdc6e909

Signature · 1 line
2.32.0