Commit 4a24d80b authored by Smita Koralahalli's avatar Smita Koralahalli Committed by Borislav Petkov
Browse files

x86/mce, cper: Pass x86 CPER through the MCA handling chain 



The kernel uses ACPI Boot Error Record Table (BERT) to report fatal
errors that occurred in a previous boot. The MCA errors in the BERT are
reported using the x86 Processor Error Common Platform Error Record
(CPER) format. Currently, the record prints out the raw MSR values and
AMD relies on the raw record to provide MCA information.

Extract the raw MSR values of MCA registers from the BERT and feed them
into mce_log() to decode them properly.

The implementation is SMCA-specific as the raw MCA register values are
given in the register offset order of the SMCA address space.

 [ bp: Massage. ]

[ Fix a build breakage in patch v1. ]
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarSmita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarPunit Agrawal <punit1.agrawal@toshiba.co.jp>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Link: https://lkml.kernel.org/r/20201119182938.151155-1-Smita.KoralahalliChannabasappa@amd.com
parent 098416e6

arch/x86/include/asm/acpi.h

+11 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ static inline u64 x86_default_get_root_pointer(void) 
extern int x86_acpi_numa_init(void);

#endif /* CONFIG_ACPI_NUMA */



struct cper_ia_proc_ctx;



#ifdef CONFIG_ACPI_APEI

static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr)

{
@@ -177,6 +179,15 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) 
	 */

	return PAGE_KERNEL_NOENC;

}



int arch_apei_report_x86_error(struct cper_ia_proc_ctx *ctx_info,

			       u64 lapic_id);

#else

static inline int arch_apei_report_x86_error(struct cper_ia_proc_ctx *ctx_info,

					     u64 lapic_id)

{

	return -EINVAL;

}

#endif



#define ACPI_TABLE_UPGRADE_MAX_PHYS (max_low_pfn_mapped << PAGE_SHIFT)

arch/x86/include/asm/mce.h

+6 −0
Original line number Diff line number Diff line
@@ -199,16 +199,22 @@ static inline void enable_copy_mc_fragile(void) 
}

#endif



struct cper_ia_proc_ctx;



#ifdef CONFIG_X86_MCE

int mcheck_init(void);

void mcheck_cpu_init(struct cpuinfo_x86 *c);

void mcheck_cpu_clear(struct cpuinfo_x86 *c);

void mcheck_vendor_init_severity(void);

int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info,

			       u64 lapic_id);

#else

static inline int mcheck_init(void) { return 0; }

static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {}

static inline void mcheck_cpu_clear(struct cpuinfo_x86 *c) {}

static inline void mcheck_vendor_init_severity(void) {}

static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info,

					     u64 lapic_id) { return -EINVAL; }

#endif



#ifdef CONFIG_X86_ANCIENT_MCE

arch/x86/kernel/acpi/apei.c

+5 −0
Original line number Diff line number Diff line
@@ -43,3 +43,8 @@ void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) 
	apei_mce_report_mem_error(sev, mem_err);

#endif

}



int arch_apei_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)

{

	return apei_smca_report_x86_error(ctx_info, lapic_id);

}

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

+61 −0
Original line number Diff line number Diff line
@@ -51,6 +51,67 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err) 
}

EXPORT_SYMBOL_GPL(apei_mce_report_mem_error);



int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id)

{

	const u64 *i_mce = ((const u64 *) (ctx_info + 1));

	unsigned int cpu;

	struct mce m;



	if (!boot_cpu_has(X86_FEATURE_SMCA))

		return -EINVAL;



	/*

	 * The starting address of the register array extracted from BERT must

	 * match with the first expected register in the register layout of

	 * SMCA address space. This address corresponds to banks's MCA_STATUS

	 * register.

	 *

	 * Match any MCi_STATUS register by turning off bank numbers.

	 */

	if ((ctx_info->msr_addr & MSR_AMD64_SMCA_MC0_STATUS) !=

				  MSR_AMD64_SMCA_MC0_STATUS)

		return -EINVAL;



	/*

	 * The register array size must be large enough to include all the

	 * SMCA registers which need to be extracted.

	 *

	 * The number of registers in the register array is determined by

	 * Register Array Size/8 as defined in UEFI spec v2.8, sec N.2.4.2.2.

	 * The register layout is fixed and currently the raw data in the

	 * register array includes 6 SMCA registers which the kernel can

	 * extract.

	 */

	if (ctx_info->reg_arr_size < 48)

		return -EINVAL;



	mce_setup(&m);



	m.extcpu = -1;

	m.socketid = -1;



	for_each_possible_cpu(cpu) {

		if (cpu_data(cpu).initial_apicid == lapic_id) {

			m.extcpu = cpu;

			m.socketid = cpu_data(m.extcpu).phys_proc_id;

			break;

		}

	}



	m.apicid = lapic_id;

	m.bank = (ctx_info->msr_addr >> 4) & 0xFF;

	m.status = *i_mce;

	m.addr = *(i_mce + 1);

	m.misc = *(i_mce + 2);

	/* Skipping MCA_CONFIG */

	m.ipid = *(i_mce + 4);

	m.synd = *(i_mce + 5);



	mce_log(&m);



	return 0;

}



#define CPER_CREATOR_MCE						\

	GUID_INIT(0x75a574e3, 0x5052, 0x4b29, 0x8a, 0x8e, 0xbe, 0x2c,	\

		  0x64, 0x90, 0xb8, 0x9d)

drivers/firmware/efi/cper-x86.c

+8 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
// Copyright (C) 2018, Advanced Micro Devices, Inc.



#include <linux/cper.h>

#include <linux/acpi.h>



/*

 * We don't need a "CPER_IA" prefix since these are all locally defined.
@@ -347,9 +348,13 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc) 
			       ctx_info->mm_reg_addr);

		}



		if (ctx_info->reg_ctx_type != CTX_TYPE_MSR ||

		    arch_apei_report_x86_error(ctx_info, proc->lapic_id)) {

			printk("%sRegister Array:\n", newpfx);

		print_hex_dump(newpfx, "", DUMP_PREFIX_OFFSET, 16, groupsize,

			       (ctx_info + 1), ctx_info->reg_arr_size, 0);

			print_hex_dump(newpfx, "", DUMP_PREFIX_OFFSET, 16,

				       groupsize, (ctx_info + 1),

				       ctx_info->reg_arr_size, 0);

		}



		ctx_info = (struct cper_ia_proc_ctx *)((long)ctx_info + size);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE