From: Roger Pau Monné Date: Wed, 26 Feb 2020 16:38:11 +0000 (+0100) Subject: x86: track when in #MC context X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~623 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=125c582bfdd4b673ee4458b0a41277ae9d52448b;p=xen.git x86: track when in #MC context Add helpers to track when executing in #MC handler context. This is modeled after the in_irq helpers. Note that there are no users of in_mce_handler() introduced by the change, further users will be added by followup changes. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d61e582af3..e5bd4f542c 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -93,7 +93,9 @@ void x86_mce_vector_register(x86_mce_vector_t hdlr) void do_machine_check(const struct cpu_user_regs *regs) { + mce_enter(); _machine_check_vector(regs); + mce_exit(); } /* diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h index 069e48fce9..276e3419d7 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -8,6 +8,7 @@ typedef struct { unsigned int __softirq_pending; unsigned int __local_irq_count; unsigned int nmi_count; + unsigned int mce_count; bool_t __mwait_wakeup; } __cacheline_aligned irq_cpustat_t; @@ -23,6 +24,11 @@ typedef struct { #define nmi_enter() (nmi_count(smp_processor_id())++) #define nmi_exit() (nmi_count(smp_processor_id())--) +#define mce_count(cpu) __IRQ_STAT(cpu, mce_count) +#define in_mce_handler() (mce_count(smp_processor_id()) != 0) +#define mce_enter() (mce_count(smp_processor_id())++) +#define mce_exit() (mce_count(smp_processor_id())--) + void ack_bad_irq(unsigned int irq); extern void apic_intr_init(void);