Skip to contentSkip to conversation

x86/cpu changes for v3.11

GIT PULL Ingo Molnar 1 participant 1 message Jul 1, 2013 x86

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-cpu-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cpu-for-linus

HEAD: 719038de98bc8479b771c582a1e4a1e86079da22 x86/intel/cacheinfo: Shut up last long-standing warning

Two changes:

- Extend 32-bit double fault debugging aid to 64-bit
- Fix a build warning

Thanks,

Ingo

------------------>
Borislav Petkov (2):
x86: Extend #DF debugging aid to 64-bit x86/intel/cacheinfo: Shut up last long-standing warning

 arch/x86/Kconfig.debug                             |  1 -
 arch/x86/include/asm/processor.h                   |  2 +-
 arch/x86/kernel/Makefile                           |  2 +-
 arch/x86/kernel/cpu/intel_cacheinfo.c              | 52 +++++++++++-----------
 .../x86/kernel/{doublefault_32.c => doublefault.c} | 15 +++++++
 arch/x86/kernel/traps.c                            |  3 ++
 6 files changed, 45 insertions(+), 30 deletions(-)
 rename arch/x86/kernel/{doublefault_32.c => doublefault.c} (84%)
arch/x86/Kconfig.debug +0 -1
index c198b7e..b6a7701 100644
@@ -122,7 +122,6 @@ config DEBUG_NX_TEST
 config DOUBLEFAULT
 	default y
 	bool "Enable doublefault exception handler" if EXPERT
-	depends on X86_32
 	---help---
 	  This option allows trapping of rare doublefault exceptions that
 	  would otherwise cause a system to silently reboot. Disabling this
arch/x86/include/asm/processor.h +1 -1
index 22224b3..5b87d52 100644
@@ -981,5 +981,5 @@ bool xen_set_default_idle(void);
 #endif
 
 void stop_this_cpu(void *dummy);
-
+void df_debug(struct pt_regs *regs, long error_code);
 #endif /* _ASM_X86_PROCESSOR_H */
arch/x86/kernel/Makefile +1 -1
index 7bd3bd3..4ce822e 100644
@@ -67,7 +67,7 @@ obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
 obj-y				+= kprobes/
 obj-$(CONFIG_MODULES)		+= module.o
-obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o
+obj-$(CONFIG_DOUBLEFAULT)	+= doublefault.o
 obj-$(CONFIG_KGDB)		+= kgdb.o
 obj-$(CONFIG_VM86)		+= vm86_32.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
arch/x86/kernel/cpu/intel_cacheinfo.c +25 -27

61 lines not on this page · raw message

arch/x86/kernel/doublefault.c renamed from arch/x86/kernel/doublefault_32.c +15 -0
similarity index 84%
rename from arch/x86/kernel/doublefault_32.c
rename to arch/x86/kernel/doublefault.c
index 155a13f..5d3fe8d 100644
@@ -9,6 +9,8 @@
 #include <asm/processor.h>
 #include <asm/desc.h>
 
+#ifdef CONFIG_X86_32
+
 #define DOUBLEFAULT_STACKSIZE (1024)
 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
 #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
@@ -67,3 +69,16 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
 		.__cr3		= __pa_nodebug(swapper_pg_dir),
 	}
 };
+
+/* dummy for do_double_fault() call */
+void df_debug(struct pt_regs *regs, long error_code) {}
+
+#else /* !CONFIG_X86_32 */
+
+void df_debug(struct pt_regs *regs, long error_code)
+{
+	pr_emerg("PANIC: double fault, error_code: 0x%lx\n", error_code);
+	show_regs(regs);
+	panic("Machine halted.");
+}
+#endif
arch/x86/kernel/traps.c +3 -0
index 772e2a8..167d481 100644
@@ -254,6 +254,9 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
 	tsk->thread.error_code = error_code;
 	tsk->thread.trap_nr = X86_TRAP_DF;
 
+#ifdef CONFIG_DOUBLEFAULT
+	df_debug(regs, error_code);
+#endif
 	/*
 	 * This is always a kernel trap and never fixable (and thus must
 	 * never return).