The following commit has been merged into the ras/core branch of tip: Commit-ID: b4813539d37fa31fed62cdfab7bd2dd8929c5b2e Gitweb: https://git.kernel.org/tip/b4813539d37fa31fed62cdfab7bd2dd8929c5b2e Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Mon, 01 Nov 2021 16:43:33 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 13 Dec 2021 14:13:12 +01:00 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: Borislav Petkov <bp@xxxxxxx> Link: https://lore.kernel.org/r/20211208111343.8130-9-bp@xxxxxxxxx --- arch/x86/kernel/cpu/mce/core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index ec0f7bb..4bdcca8 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1064,10 +1064,13 @@ static int mce_start(int *no_way_out) * Synchronize between CPUs after main scanning loop. * 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; + int ret = -1; + + /* Allow instrumentation around external facilities. */ + instrumentation_begin(); if (!timeout) goto reset; @@ -1108,7 +1111,8 @@ static int mce_end(int order) /* * Don't reset anything. That's done by the Monarch. */ - return 0; + ret = 0; + goto out; } /* @@ -1124,6 +1128,10 @@ reset: * Let others run again. */ atomic_set(&mce_executing, 0); + +out: + instrumentation_end(); + return ret; }
![]() |