Commit 78a03235 authored by Sohil Mehta's avatar Sohil Mehta Committed by Ingo Molnar
Browse files

x86/nmi: Consolidate NMI panic variables 



Commit:

  c305a4e9 ("x86: Move sysctls into arch/x86")

recently moved the sysctl handling of panic_on_unrecovered_nmi and
panic_on_io_nmi to x86-specific code. These variables no longer need to
be declared in the generic header file.

Relocate the variable definitions and declarations closer to where they
are used. This makes all the NMI panic options consistent and easier to
track.

[ mingo: Fixed up the SHA1 of the commit reference. ]

Signed-off-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarNikolay Borisov <nik.borisov@suse.com>
Cc: Joel Granados <joel.granados@kernel.org>
Link: https://lore.kernel.org/r/20250327234629.3953536-3-sohil.mehta@intel.com
parent 2e016da1

arch/x86/include/asm/nmi.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ extern void release_evntsel_nmi(unsigned int); 
#endif /* CONFIG_X86_LOCAL_APIC */



extern int unknown_nmi_panic;

extern int panic_on_unrecovered_nmi;

extern int panic_on_io_nmi;



#define NMI_FLAG_FIRST	1

arch/x86/kernel/dumpstack.c

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <asm/stacktrace.h>

#include <asm/unwind.h>



int panic_on_unrecovered_nmi;

int panic_on_io_nmi;

static int die_counter;



static struct pt_regs exec_summary_regs;

arch/x86/kernel/nmi.c

+3 −0
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ static DEFINE_PER_CPU(struct nmi_stats, nmi_stats); 
static int ignore_nmis __read_mostly;



int unknown_nmi_panic;

int panic_on_unrecovered_nmi;

int panic_on_io_nmi;



/*

 * Prevent NMI reason port (0x61) being accessed simultaneously, can

 * only be used in NMI handler.

include/linux/panic.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ extern bool panic_triggering_all_cpu_backtrace; 
extern int panic_timeout;

extern unsigned long panic_print;

extern int panic_on_oops;

extern int panic_on_unrecovered_nmi;

extern int panic_on_io_nmi;

extern int panic_on_warn;



extern unsigned long panic_on_taint;