Commit 4fbce464 authored by Borislav Petkov's avatar Borislav Petkov

x86/mce: Allow instrumentation during task work queueing

Fixes

  vmlinux.o: warning: objtool: do_machine_check()+0xdb1: call to queue_task_work() leaves .noinstr.text section
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-6-bp@alien8.de
parent 487d654d
...@@ -1459,6 +1459,14 @@ noinstr void do_machine_check(struct pt_regs *regs) ...@@ -1459,6 +1459,14 @@ noinstr void do_machine_check(struct pt_regs *regs)
if (worst != MCE_AR_SEVERITY && !kill_current_task) if (worst != MCE_AR_SEVERITY && !kill_current_task)
goto out; goto out;
/*
* Enable instrumentation around the external facilities like
* task_work_add() (via queue_task_work()), fixup_exception() etc.
* For now, that is. Fixing this properly would need a lot more involved
* reorganization.
*/
instrumentation_begin();
/* Fault was in user mode and we need to take some action */ /* Fault was in user mode and we need to take some action */
if ((m.cs & 3) == 3) { if ((m.cs & 3) == 3) {
/* If this triggers there is no way to recover. Die hard. */ /* If this triggers there is no way to recover. Die hard. */
...@@ -1487,6 +1495,9 @@ noinstr void do_machine_check(struct pt_regs *regs) ...@@ -1487,6 +1495,9 @@ noinstr void do_machine_check(struct pt_regs *regs)
if (m.kflags & MCE_IN_KERNEL_COPYIN) if (m.kflags & MCE_IN_KERNEL_COPYIN)
queue_task_work(&m, msg, kill_me_never); queue_task_work(&m, msg, kill_me_never);
} }
instrumentation_end();
out: out:
mce_wrmsrl(MSR_IA32_MCG_STATUS, 0); mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment