x86/mce: Remove mce_inject_log() in favor of mce_log() (81736abd) · Commits · 戴 / test

The mutex in mce_inject_log() became unnecessary with commit ("x86/mce: Factor out and deprecate the /dev/mcelog driver"), though the original reason for its presence only vanished with commit ("x86/mcelog: Get rid of RCU remnants"). Drop the mutex. And as that makes mce_inject_log() identical to mce_log(), get rid of the former in favor of the latter. Signed-off-by:

Jan H. Schönherr <jschoenh@amazon.de> Signed-off-by:

Borislav Petkov <bp@suse.de> Reviewed-by:

Tony Luck <tony.luck@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: linux-edac <linux-edac@vger.kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20191210000733.17979-7-jschoenh@amazon.de

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

+1 −10

Original line number	Diff line number	Diff line
		@@ -53,8 +53,6 @@

		#include "internal.h"

		static DEFINE_MUTEX(mce_log_mutex);

		/* sysfs synchronization */
		static DEFINE_MUTEX(mce_sysfs_mutex);

		@@ -156,14 +154,7 @@ void mce_log(struct mce *m)
		if (!mce_gen_pool_add(m))
		irq_work_queue(&mce_irq_work);
		}

		void mce_inject_log(struct mce *m)
		{
		mutex_lock(&mce_log_mutex);
		mce_log(m);
		mutex_unlock(&mce_log_mutex);
		}
		EXPORT_SYMBOL_GPL(mce_inject_log);
		EXPORT_SYMBOL_GPL(mce_log);

		static struct notifier_block mce_srao_nb;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ static void do_inject(void)
		i_mce.status \|= MCI_STATUS_SYNDV;

		if (inj_type == SW_INJ) {
		mce_inject_log(&i_mce);
		mce_log(&i_mce);
		return;
		}

arch/x86/kernel/cpu/mce/internal.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -84,8 +84,6 @@ static inline int apei_clear_mce(u64 record_id)
		}
		#endif

		void mce_inject_log(struct mce *m);

		/*
		* We consider records to be equivalent if bank+status+addr+misc all match.
		* This is only used when the system is going down because of a fatal error

Admin message