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

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

x86/mce: Mark mce_panic() noinstr 



[ Upstream commit 3c7ce80a818fa7950be123cac80cd078e5ac1013 ]

And allow instrumentation inside it because it does calls to other
facilities which will not be tagged noinstr.

Fixes

  vmlinux.o: warning: objtool: do_machine_check()+0xc73: call to mce_panic() leaves .noinstr.text section

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-8-bp@alien8.de


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

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

+12 −3
Original line number Diff line number Diff line
@@ -310,11 +310,17 @@ static void wait_for_panic(void) 
	panic("Panicing machine check CPU died");

}



static void mce_panic(const char *msg, struct mce *final, char *exp)

static noinstr void mce_panic(const char *msg, struct mce *final, char *exp)

{

	int apei_err = 0;

	struct llist_node *pending;

	struct mce_evt_llist *l;

	int apei_err = 0;



	/*

	 * Allow instrumentation around external facilities usage. Not that it

	 * matters a whole lot since the machine is going to panic anyway.

	 */

	instrumentation_begin();



	if (!fake_panic) {

		/*
@@ -329,7 +335,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp) 
	} else {

		/* Don't log too much for fake panic */

		if (atomic_inc_return(&mce_fake_panicked) > 1)

			return;

			goto out;

	}

	pending = mce_gen_pool_prepare_records();

	/* First print corrected ones that are still unlogged */
@@ -367,6 +373,9 @@ static void mce_panic(const char *msg, struct mce *final, char *exp) 
		panic(msg);

	} else

		pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);



out:

	instrumentation_end();

}



/* Support code for software error injection */