Re: current git kernel crashes UML system during boot

[Borislav Petkov]

From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Sun, May 30, 2010 at 01:57:05PM +0200

> On Sun, May 30, 2010 at 13:39, Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote:
> > 2010/5/27 Toralf FÃrster <toralf.foerster@xxxxxx>:
> >> I bisected it to this :
> 
> > After fixing the missing/superfluous slab inclusion issues, I bisected
> > it further to
> >
> > commit d61931d89be506372d01a90d1755f6d0a9fafe2d
> > Author: Borislav Petkov <borislav.petkov@xxxxxxx>
> > Date: Â Fri Mar 5 17:34:46 2010 +0100
> >
> > Â Âx86: Add optimized popcnt variants
> >
> > Â ÂAdd support for the hardware version of the Hamming weight function,
> > Â Âpopcnt, present in CPUs which advertize it under CPUID, Function
> > Â Â0x0000_0001_ECX[23]. On CPUs which don't support it, we fallback to the
> > Â Âdefault lib/hweight.c sw versions.
> >
> > Â ÂA synthetic benchmark comparing popcnt with __sw_hweight64 showed almost
> > Â Âa 3x speedup on a F10h machine.
> >
> > Â ÂSigned-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
> > Â ÂLKML-Reference: <20100318112015.GC11152@aftab>
> > Â ÂSigned-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
> >
> > I reverted that commit on top of current mainline (and fixed up the
> > conflicts), and now
> > it boots again.
> 
> I tried adding
> 
> config ARCH_HWEIGHT_CFLAGS
>         string
>         default "-fcall-saved-ecx -fcall-saved-edx" if !64_BIT
>         default "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx
> -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10
> -fcall-saved-r11" if 64_BIT
> 
> to arch/um/Kconfig.x86. Now it got a bit further, but it still crashes:

Ok, this is a kinda stab in the dark but from what I could decypher
from the include hell, one possible fix should be if UML didn't include
<arch/x86/include/asm/arch_hweight.h> but use the software hweight
version only.

Can you guys check whether the following fixes the issue?

Thanks.

--
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 545776e..c9dad12 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -444,7 +444,11 @@ static inline int fls(int x)
 
 #define ARCH_HAS_FAST_MULTIPLIER 1
 
+#ifdef CONFIG_UML
+#include <asm-generic/bitops/arch_hweight.h>
+#else
 #include <asm/arch_hweight.h>
+#endif
 
 #include <asm-generic/bitops/const_hweight.h>
 

-- 
Regards/Gruss,
    Boris.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/