Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d17139 authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/mce: Mark mce_end() noinstr 



[ Upstream commit b4813539d37fa31fed62cdfab7bd2dd8929c5b2e ]

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


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bca5aa92

arch/x86/kernel/cpu/mce/core.c

+11 −3
Original line number Diff line number Diff line
@@ -1080,10 +1080,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;
@@ -1127,7 +1130,8 @@ static int mce_end(int order) 
		/*

		 * Don't reset anything. That's done by the Monarch.

		 */

		return 0;

		ret = 0;

		goto out;

	}



	/*
@@ -1142,6 +1146,10 @@ static int mce_end(int order) 
	 * Let others run again.

	 */

	atomic_set(&mce_executing, 0);



out:

	instrumentation_end();



	return ret;

}