On Wed, 2006-11-01 at 15:27 -0800, Andrew Morton wrote: > On Wed, 01 Nov 2006 21:28:13 +1100 > Rusty Russell <rusty at rustcorp.com.au> wrote: > > +#ifdef CONFIG_DEBUG_KERNEL > > + /* Deliberately clobber regs using "not %reg" to find bugs. */ > > That would be considered to be abusive of CONFIG_DEBUG_KERNEL. A > CONFIG_DEBUG_PARAVIRT which depends on CONFIG_DEBUG_KERNEL would be more > harmonious. I wasn't sure. Making a config option for what is a one-liner seemed overkill. == Don't abuse CONFIG_DEBUG_KERNEL, add CONFIG_DEBUG_PARAVIRT. Signed-off-by: Rusty Russell <rusty at rustcorp.com.au> diff -r 2707c89d72f0 arch/i386/Kconfig.debug --- a/arch/i386/Kconfig.debug Thu Nov 02 10:14:50 2006 +1100 +++ b/arch/i386/Kconfig.debug Thu Nov 02 11:41:20 2006 +1100 @@ -87,4 +87,14 @@ config DOUBLEFAULT option saves about 4k and might cause you much additional grey hair. +config DEBUG_PARAVIRT + bool "Enable some paravirtualization debugging" + default y + depends on PARAVIRT && DEBUG_KERNEL + help + Currently deliberately clobbers regs which are allowed to be + clobbered in inlined paravirt hooks, even in native mode. + If turning this off solves a problem, then DISABLE_INTERRUPTS() or + ENABLE_INTERRUPTS() is lying about what registers can be clobbered. + endmenu diff -r 2707c89d72f0 arch/i386/kernel/alternative.c --- a/arch/i386/kernel/alternative.c Thu Nov 02 10:14:50 2006 +1100 +++ b/arch/i386/kernel/alternative.c Thu Nov 02 11:36:54 2006 +1100 @@ -359,7 +359,7 @@ void apply_paravirt(struct paravirt_patc used = paravirt_ops.patch(p->instrtype, p->clobbers, p->instr, p->len); -#ifdef CONFIG_DEBUG_KERNEL +#ifdef CONFIG_DEBUG_PARAVIRT /* Deliberately clobber regs using "not %reg" to find bugs. */ for (i = 0; i < 3; i++) { if (p->len - used >= 2 && (p->clobbers & (1 << i))) {