Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 541048a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, reboot: Fix typo in nmi reboot path
  x86, NMI: Add to_cpumask() to silence compile warning
  x86, NMI: NMI selftest depends on the local apic
  x86: Add stack top margin for stack overflow checking
  x86, NMI: NMI-selftest should handle the UP case properly
  x86: Fix the 32-bit stackoverflow-debug build
  x86, NMI: Add knob to disable using NMI IPIs to stop cpus
  x86, NMI: Add NMI IPI selftest
  x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus
  x86: Clean up the range of stack overflow checking
  x86: Panic on detection of stack overflow
  x86: Check stack overflow in detail
parents bcede2f6 e58d4292

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1824,6 +1824,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
	nomfgpt		[X86-32] Disable Multi-Function General Purpose

			Timer usage (for AMD Geode machines).



	nonmi_ipi	[X86] Disable using NMI IPIs during panic/reboot to

			shutdown the other cpus.  Instead use the REBOOT_VECTOR

			irq.



	nopat		[X86] Disable PAT (page attribute table extension of

			pagetables) support.

Documentation/sysctl/kernel.txt

+14 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ show up in /proc/sys/kernel: 
- panic

- panic_on_oops

- panic_on_unrecovered_nmi

- panic_on_stackoverflow

- pid_max

- powersave-nap               [ PPC only ]

- printk
@@ -393,6 +394,19 @@ Controls the kernel's behaviour when an oops or BUG is encountered. 


==============================================================



panic_on_stackoverflow:



Controls the kernel's behavior when detecting the overflows of

kernel, IRQ and exception stacks except a user stack.

This file shows up if CONFIG_DEBUG_STACKOVERFLOW is enabled.



0: try to continue operation.



1: panic immediately.



==============================================================





pid_max:



PID allocation wrap value.  When the kernel's next PID value

arch/x86/Kconfig.debug

+17 −2
Original line number Diff line number Diff line
@@ -63,8 +63,11 @@ config DEBUG_STACKOVERFLOW 
	bool "Check for stack overflows"

	depends on DEBUG_KERNEL

	---help---

	  This option will cause messages to be printed if free stack space

	  drops below a certain limit.

	  Say Y here if you want to check the overflows of kernel, IRQ

	  and exception stacks. This option will cause messages of the

	  stacks in detail when free stack space drops below a certain

	  limit.

	  If in doubt, say "N".



config X86_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"
@@ -284,4 +287,16 @@ config DEBUG_STRICT_USER_COPY_CHECKS 


	  If unsure, or if you run an older (pre 4.4) gcc, say N.



config DEBUG_NMI_SELFTEST

	bool "NMI Selftest"

	depends on DEBUG_KERNEL && X86_LOCAL_APIC

	---help---

	  Enabling this option turns on a quick NMI selftest to verify

	  that the NMI behaves correctly.



	  This might help diagnose strange hangs that rely on NMI to

	  function properly.



	  If unsure, say N.



endmenu

arch/x86/include/asm/smp.h

+6 −0
Original line number Diff line number Diff line
@@ -225,5 +225,11 @@ extern int hard_smp_processor_id(void); 


#endif /* CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_DEBUG_NMI_SELFTEST

extern void nmi_selftest(void);

#else

#define nmi_selftest() do { } while (0)

#endif



#endif /* __ASSEMBLY__ */

#endif /* _ASM_X86_SMP_H */

arch/x86/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_APB_TIMER) += apb_timer.o 
obj-$(CONFIG_AMD_NB)		+= amd_nb.o

obj-$(CONFIG_DEBUG_RODATA_TEST)	+= test_rodata.o

obj-$(CONFIG_DEBUG_NX_TEST)	+= test_nx.o

obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o



obj-$(CONFIG_KVM_GUEST)		+= kvm.o

obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o