x86/mce: Remove mce_report_event()
Subsystems (3)
Borislav Petkov
maintainerPATCH 1/1 x86/mce: Remove mce_report_event()
From: Borislav Petkov <[email protected]>
Calling this function has been wrong for a while now:
* Can't call schedule_work() in #MC context.
* mce_notify_irq() either.
* None of that noodling is needed anymore - all it needs to do is kick the IRQ work which would self-IPI so that once the #MC handler is done, the work queue will run and process queued MCE records.
So remove it.
--- arch/x86/kernel/cpu/mce/core.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
arch/x86/kernel/cpu/mce/core.c +2 -18
@@ -460,23 +460,6 @@ static void mce_irq_work_cb(struct irq_work *entry)mce_schedule_work (); } -static void mce_report_event (struct pt_regs *regs) -{ -if (regs->flags & (X86_VM_MASK |X86_EFLAGS_IF )) { -mce_notify_irq (); -/* -* Triggering the work queue here is just an insurance -* policy in case the syscall exit notify handler -* doesn't run soon enough or ends up running on the -* wrong CPU (can happen when audit sleeps) -*/ -mce_schedule_work (); -return ; - } - -irq_work_queue (&mce_irq_work); -} -/* * Check if the address reported by the CPU is in a format we can parse. * It would be possible to add code for most other cases, but all would
@@ -1301,7 +1284,8 @@ void do_machine_check(struct pt_regs *regs, long error_code)mce_panic ("Fatal machine check on current CPU" , &m, msg);if (worst >0 ) -mce_report_event (regs); +irq_work_queue (&mce_irq_work); +mce_wrmsrl (MSR_IA32_MCG_STATUS ,0 );sync_core ();
Signature · 1 line
2.21.0
tip-bot for Borislav Petkov
merge botx86/mce: Remove mce_report_event()
Commit-ID: 39f0584ee695f1d75f4181b209602b9c49e73821 Gitweb: https://git.kernel.org/tip/39f0584ee695f1d75f4181b209602b9c49e73821 Author: Borislav Petkov <[email protected]> AuthorDate: Tue, 12 Mar 2019 19:39:23 +0100 Committer: Borislav Petkov <[email protected]> CommitDate: Fri, 29 Mar 2019 15:34:03 +0100
x86/mce: Remove mce_report_event()
Calling this function has been wrong for a while now:
* Can't call schedule_work() in #MC context.
* mce_notify_irq() either.
* None of that noodling is needed anymore - all it needs to do is kick the IRQ work which would self-IPI so that once the #MC handler is done, the work queue will run and process queued MCE records.
So remove it.
--- arch/x86/kernel/cpu/mce/core.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
arch/x86/kernel/cpu/mce/core.c +2 -18
@@ -460,23 +460,6 @@ static void mce_irq_work_cb(struct irq_work *entry)mce_schedule_work (); } -static void mce_report_event (struct pt_regs *regs) -{ -if (regs->flags & (X86_VM_MASK |X86_EFLAGS_IF )) { -mce_notify_irq (); -/* -* Triggering the work queue here is just an insurance -* policy in case the syscall exit notify handler -* doesn't run soon enough or ends up running on the -* wrong CPU (can happen when audit sleeps) -*/ -mce_schedule_work (); -return ; - } - -irq_work_queue (&mce_irq_work); -} -/* * Check if the address reported by the CPU is in a format we can parse. * It would be possible to add code for most other cases, but all would
@@ -1331,7 +1314,8 @@ void do_machine_check(struct pt_regs *regs, long error_code)mce_panic ("Fatal machine check on current CPU" , &m, msg);if (worst >0 ) -mce_report_event (regs); +irq_work_queue (&mce_irq_work); +mce_wrmsrl (MSR_IA32_MCG_STATUS ,0 );sync_core ();