Commit e01b70ef authored Jun 02, 2008 by Jiri Hladky Committed by Ingo Molnar Jun 17, 2008

x86: fix bug in arch/i386/lib/delay.c file, delay_loop function



when trying to understand how Bogomips are implemented I have found a
bug in arch/i386/lib/delay.c file, delay_loop function.

The function fails for loops > 2^31+1. It because SF is set when dec
returns numbers > 2^31.

The fix is to use jnz instruction instead of jns (and add one decl
instruction to the end to have exactly the same number of loops as in
original version).

Martin Mares observed:

> It is a long time since I have hacked that file, but you should definitely
> make sure that the function is never called with a zero argument. In such
> case, the original version made just a single pass, but your version
> makes 2^32 of them.

fixed that.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 06651906

arch/x86/lib/delay_32.c

+16 −9

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		*
		* Copyright (C) 1993 Linus Torvalds
		* Copyright (C) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
		* Copyright (C) 2008 Jiri Hladky <hladky _dot_ jiri _at_ gmail _dot_ com>
		*
		* The __delay function must _NOT_ be inlined as its execution time
		* depends wildly on alignment on many x86 processors. The additional
		@@ -28,16 +29,22 @@
		/* simple loop based delay: */
		static void delay_loop(unsigned long loops)
		{
		int d0;

		__asm__ __volatile__(
		"\tjmp 1f\n"
		" test %0,%0 \n"
		" jz 3f \n"
		" jmp 1f \n"

		".align 16 \n"
		"1:\tjmp 2f\n"
		"1: jmp 2f \n"

		".align 16 \n"
		"2:\tdecl %0\n\tjns 2b"
		:"=&a" (d0)
		:"0" (loops));
		"2: decl %0 \n"
		" jnz 2b \n"
		"3: decl %0 \n"

		: /* we don't need output */
		:"a" (loops)
		);
		}

		/* TSC based delay: */

Admin message