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

Commit c0ec382e authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/RAS: Remove mce.usable_addr 



It is useless and we can use the function instead. Besides,
mcelog(8) hasn't managed to make use of it yet. So kill it.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1448350880-5573-3-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8b38937b

arch/x86/include/uapi/asm/mce.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct mce { 
	__u8  cpuvendor;	/* cpu vendor as encoded in system.h */

	__u8  inject_flags;	/* software inject flags */

	__u8  severity;

	__u8  usable_addr;

	__u8  pad;

	__u32 cpuid;	/* CPUID 1 EAX */

	__u8  cs;		/* code segment */

	__u8  bank;	/* machine check bank */

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

+4 −8
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static int srao_decode_notifier(struct notifier_block *nb, unsigned long val, 
	if (!mce)

		return NOTIFY_DONE;



	if (mce->usable_addr && (mce->severity == MCE_AO_SEVERITY)) {

	if (mce_usable_address(mce) && (mce->severity == MCE_AO_SEVERITY)) {

		pfn = mce->addr >> PAGE_SHIFT;

		memory_failure(pfn, MCE_VECTOR, 0);

	}
@@ -610,12 +610,9 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 


		severity = mce_severity(&m, mca_cfg.tolerant, NULL, false);



		if (severity == MCE_DEFERRED_SEVERITY && memory_error(&m)) {

			if (m.status & MCI_STATUS_ADDRV) {

		if (severity == MCE_DEFERRED_SEVERITY && memory_error(&m))

			if (m.status & MCI_STATUS_ADDRV)

				m.severity = severity;

				m.usable_addr = mce_usable_address(&m);

			}

		}



		/*

		 * Don't get the IP here because it's unlikely to
@@ -623,7 +620,7 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
		 */

		if (!(flags & MCP_DONTLOG) && !mca_cfg.dont_log_ce)

			mce_log(&m);

		else if (m.usable_addr) {

		else if (mce_usable_address(&m)) {

			/*

			 * Although we skipped logging this, we still want

			 * to take action. Add to the pool so the registered
@@ -1091,7 +1088,6 @@ void do_machine_check(struct pt_regs *regs, long error_code) 


		/* assuming valid severity level != 0 */

		m.severity = severity;

		m.usable_addr = mce_usable_address(&m);



		mce_log(&m);