Commit b4813539 authored by Borislav Petkov's avatar Borislav Petkov

x86/mce: Mark mce_end() noinstr

It is called by the #MC handler which is noinstr.

Fixes

  vmlinux.o: warning: objtool: do_machine_check()+0xbd6: call to memset() leaves .noinstr.text section
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-9-bp@alien8.de
parent 3c7ce80a
...@@ -1064,10 +1064,13 @@ static int mce_start(int *no_way_out) ...@@ -1064,10 +1064,13 @@ static int mce_start(int *no_way_out)
* Synchronize between CPUs after main scanning loop. * Synchronize between CPUs after main scanning loop.
* This invokes the bulk of the Monarch processing. * This invokes the bulk of the Monarch processing.
*/ */
static int mce_end(int order) static noinstr int mce_end(int order)
{ {
int ret = -1;
u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC; u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC;
int ret = -1;
/* Allow instrumentation around external facilities. */
instrumentation_begin();
if (!timeout) if (!timeout)
goto reset; goto reset;
...@@ -1108,7 +1111,8 @@ static int mce_end(int order) ...@@ -1108,7 +1111,8 @@ static int mce_end(int order)
/* /*
* Don't reset anything. That's done by the Monarch. * Don't reset anything. That's done by the Monarch.
*/ */
return 0; ret = 0;
goto out;
} }
/* /*
...@@ -1124,6 +1128,10 @@ static int mce_end(int order) ...@@ -1124,6 +1128,10 @@ static int mce_end(int order)
* Let others run again. * Let others run again.
*/ */
atomic_set(&mce_executing, 0); atomic_set(&mce_executing, 0);
out:
instrumentation_end();
return ret; return ret;
} }
......
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