Commit 4a8fba4b authored by Sohil Mehta's avatar Sohil Mehta Committed by Ingo Molnar
Browse files

x86/nmi: Use a macro to initialize NMI descriptors 



The NMI descriptors for each NMI type are stored in an array. However,
they are currently initialized using raw numbers, which makes it
difficult to understand the code.

Introduce a macro to initialize the NMI descriptors using the NMI type
enum values to make the code more readable.

No functional change intended.

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>
Link: https://lore.kernel.org/r/20250327234629.3953536-4-sohil.mehta@intel.com
parent 78a03235

arch/x86/kernel/nmi.c

+11 −20
Original line number Diff line number Diff line
@@ -49,27 +49,20 @@ struct nmi_desc { 
	struct list_head head;

};



static struct nmi_desc nmi_desc[NMI_MAX] = 

{

	{

		.lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[0].lock),

		.head = LIST_HEAD_INIT(nmi_desc[0].head),

	},

	{

		.lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[1].lock),

		.head = LIST_HEAD_INIT(nmi_desc[1].head),

	},

	{

		.lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[2].lock),

		.head = LIST_HEAD_INIT(nmi_desc[2].head),

	},

	{

		.lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[3].lock),

		.head = LIST_HEAD_INIT(nmi_desc[3].head),

	},

#define NMI_DESC_INIT(type) { \

	.lock = __RAW_SPIN_LOCK_UNLOCKED(&nmi_desc[type].lock), \

	.head = LIST_HEAD_INIT(nmi_desc[type].head), \

}



static struct nmi_desc nmi_desc[NMI_MAX] = {

	NMI_DESC_INIT(NMI_LOCAL),

	NMI_DESC_INIT(NMI_UNKNOWN),

	NMI_DESC_INIT(NMI_SERR),

	NMI_DESC_INIT(NMI_IO_CHECK),

};



#define nmi_to_desc(type) (&nmi_desc[type])



struct nmi_stats {

	unsigned int normal;

	unsigned int unknown;
@@ -107,8 +100,6 @@ static int __init setup_unknown_nmi_panic(char *str) 
}

__setup("unknown_nmi_panic", setup_unknown_nmi_panic);



#define nmi_to_desc(type) (&nmi_desc[type])



static u64 nmi_longest_ns = 1 * NSEC_PER_MSEC;



static int __init nmi_warning_debugfs(void)