| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <4F563067.1090100@redhat.com>
Date: Tue, 06 Mar 2012 12:42:31 -0300
From: Mauro Carvalho Chehab <mchehab@...hat.com>
To: Borislav Petkov <bp@...64.org>
CC: Tony Luck <tony.luck@...el.com>, Ingo Molnar <mingo@...e.hu>,
EDAC devel <linux-edac@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>,
Borislav Petkov <borislav.petkov@....com>
Subject: Re: [PATCH 3/3] EDAC: Convert AMD EDAC pieces to use RAS printk buffer
Em 06-03-2012 10:31, Borislav Petkov escreveu:
> From: Borislav Petkov <borislav.petkov@....com>
>
> This is an initial version of the patch which converts MCE decoding
> facilities to use the RAS printk buffer. When there's no userspace agent
> running (i.e., /sys/devices/system/ras/agent == 0), we fall back to the
> default printk'ing into dmesg which is what we've been doing so far.
>
> Signed-off-by: Borislav Petkov <borislav.petkov@....com>
> ---
> drivers/edac/amd64_edac.c | 3 +-
> drivers/edac/edac_core.h | 13 +++-
> drivers/edac/edac_mc.c | 23 +++--
> drivers/edac/mce_amd.c | 217 ++++++++++++++++++++++++---------------------
> 4 files changed, 142 insertions(+), 114 deletions(-)
>
> diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
> index c9eee6d33e9a..1d8feadb3610 100644
> --- a/drivers/edac/amd64_edac.c
> +++ b/drivers/edac/amd64_edac.c
> @@ -1,6 +1,7 @@
> -#include "amd64_edac.h"
> #include <asm/amd_nb.h>
> +#include <asm/ras.h>
>
> +#include "amd64_edac.h"
> static struct edac_pci_ctl_info *amd64_ctl_pci;
>
> static int report_gart_errors;
> diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
> index e48ab3108ad8..c06c82046e83 100644
> --- a/drivers/edac/edac_core.h
> +++ b/drivers/edac/edac_core.h
> @@ -49,8 +49,17 @@
> #define edac_printk(level, prefix, fmt, arg...) \
> printk(level "EDAC " prefix ": " fmt, ##arg)
>
> -#define edac_mc_printk(mci, level, fmt, arg...) \
> - printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg)
> +#define edac_mc_printk(mci, level, fmt, arg...) \
> +({ \
> + if (ras_agent) { \
> + unsigned pr_lvl = BIT((unsigned)(level[1] - '0')); \
> + \
> + ras_printk(pr_lvl, HW_ERR "EDAC MC%d: " fmt, \
> + mci->mc_idx, ##arg); \
> + } \
> + else \
> + printk(level "EDAC MC%d: " fmt, mci->mc_idx, ##arg); \
> +})
NAK.
>
> #define edac_mc_chipset_printk(mci, level, prefix, fmt, arg...) \
> printk(level "EDAC " prefix " MC%d: " fmt, mci->mc_idx, ##arg)
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index ca6c04d350ee..e7091dbb516f 100644
> --- a/drivers/edac/edac_mc.c
> +++ b/drivers/edac/edac_mc.c
> @@ -30,8 +30,10 @@
> #include <asm/uaccess.h>
> #include <asm/page.h>
> #include <asm/edac.h>
> +#include <asm/ras.h>
> #include "edac_core.h"
> #include "edac_module.h"
> +#include "mce_amd.h"
>
> /* lock to memory controller's control array */
> static DEFINE_MUTEX(mem_ctls_mutex);
> @@ -704,11 +706,14 @@ void edac_mc_handle_ce(struct mem_ctl_info *mci,
> if (edac_mc_get_log_ce())
> /* FIXME - put in DIMM location */
> edac_mc_printk(mci, KERN_WARNING,
> - "CE page 0x%lx, offset 0x%lx, grain %d, syndrome "
> - "0x%lx, row %d, channel %d, label \"%s\": %s\n",
> - page_frame_number, offset_in_page,
> - mci->csrows[row].grain, syndrome, row, channel,
> - mci->csrows[row].channels[channel].label, msg);
> + "CE page 0x%lx, offset 0x%lx, grain %d,"
> + " syndrome 0x%lx, row %d, channel %d,"
> + " label \"%s\": %s\n",
> + page_frame_number, offset_in_page,
> + mci->csrows[row].grain, syndrome,
> + row, channel,
> + mci->csrows[row].channels[channel].label,
> + msg);
>
> mci->ce_count++;
> mci->csrows[row].ce_count++;
> @@ -782,10 +787,10 @@ void edac_mc_handle_ue(struct mem_ctl_info *mci,
>
> if (edac_mc_get_log_ue())
> edac_mc_printk(mci, KERN_EMERG,
> - "UE page 0x%lx, offset 0x%lx, grain %d, row %d, "
> - "labels \"%s\": %s\n", page_frame_number,
> - offset_in_page, mci->csrows[row].grain, row,
> - labels, msg);
> + "UE page 0x%lx, offset 0x%lx, grain %d,"
> + " row %d, labels \"%s\": %s\n",
> + page_frame_number, offset_in_page,
> + mci->csrows[row].grain, row, labels, msg);
>
> if (edac_mc_get_panic_on_ue())
> panic("EDAC MC%d: UE page 0x%lx, offset 0x%lx, grain %d, "
> diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
> index bd926ea2e00c..e347d3680e13 100644
> --- a/drivers/edac/mce_amd.c
> +++ b/drivers/edac/mce_amd.c
> @@ -1,5 +1,7 @@
> #include <linux/module.h>
> #include <linux/slab.h>
> +#include <trace/events/mce.h>
> +#include <asm/ras.h>
>
> #include "mce_amd.h"
>
> @@ -137,9 +139,9 @@ static bool f12h_dc_mce(u16 ec, u8 xec)
> ret = true;
>
> if (ll == LL_L2)
> - pr_cont("during L1 linefill from L2.\n");
> + ras_printk(PR_CONT, "during L1 linefill from L2.\n");
> else if (ll == LL_L1)
> - pr_cont("Data/Tag %s error.\n", R4_MSG(ec));
> + ras_printk(PR_CONT, "Data/Tag %s error.\n", R4_MSG(ec));
> else
> ret = false;
> }
> @@ -149,7 +151,7 @@ static bool f12h_dc_mce(u16 ec, u8 xec)
> static bool f10h_dc_mce(u16 ec, u8 xec)
> {
> if (R4(ec) == R4_GEN && LL(ec) == LL_L1) {
> - pr_cont("during data scrub.\n");
> + ras_printk(PR_CONT, "during data scrub.\n");
> return true;
> }
> return f12h_dc_mce(ec, xec);
> @@ -158,7 +160,7 @@ static bool f10h_dc_mce(u16 ec, u8 xec)
> static bool k8_dc_mce(u16 ec, u8 xec)
> {
> if (BUS_ERROR(ec)) {
> - pr_cont("during system linefill.\n");
> + ras_printk(PR_CONT, "during system linefill.\n");
> return true;
> }
>
> @@ -178,14 +180,14 @@ static bool f14h_dc_mce(u16 ec, u8 xec)
> switch (r4) {
> case R4_DRD:
> case R4_DWR:
> - pr_cont("Data/Tag parity error due to %s.\n",
> + ras_printk(PR_CONT, "Data/Tag parity error due to %s.\n",
> (r4 == R4_DRD ? "load/hw prf" : "store"));
> break;
> case R4_EVICT:
> - pr_cont("Copyback parity error on a tag miss.\n");
> + ras_printk(PR_CONT, "Copyback parity error on a tag miss.\n");
> break;
> case R4_SNOOP:
> - pr_cont("Tag parity error during snoop.\n");
> + ras_printk(PR_CONT, "Tag parity error during snoop.\n");
> break;
> default:
> ret = false;
> @@ -195,17 +197,17 @@ static bool f14h_dc_mce(u16 ec, u8 xec)
> if ((II(ec) != II_MEM && II(ec) != II_IO) || LL(ec) != LL_LG)
> return false;
>
> - pr_cont("System read data error on a ");
> + ras_printk(PR_CONT, "System read data error on a ");
>
> switch (r4) {
> case R4_RD:
> - pr_cont("TLB reload.\n");
> + ras_printk(PR_CONT, "TLB reload.\n");
> break;
> case R4_DWR:
> - pr_cont("store.\n");
> + ras_printk(PR_CONT, "store.\n");
> break;
> case R4_DRD:
> - pr_cont("load.\n");
> + ras_printk(PR_CONT, "load.\n");
> break;
> default:
> ret = false;
> @@ -225,28 +227,29 @@ static bool f15h_dc_mce(u16 ec, u8 xec)
>
> switch (xec) {
> case 0x0:
> - pr_cont("Data Array access error.\n");
> + ras_printk(PR_CONT, "Data Array access error.\n");
> break;
>
> case 0x1:
> - pr_cont("UC error during a linefill from L2/NB.\n");
> + ras_printk(PR_CONT, "UC error during a linefill "
> + "from L2/NB.\n");
> break;
>
> case 0x2:
> case 0x11:
> - pr_cont("STQ access error.\n");
> + ras_printk(PR_CONT, "STQ access error.\n");
> break;
>
> case 0x3:
> - pr_cont("SCB access error.\n");
> + ras_printk(PR_CONT, "SCB access error.\n");
> break;
>
> case 0x10:
> - pr_cont("Tag error.\n");
> + ras_printk(PR_CONT, "Tag error.\n");
> break;
>
> case 0x12:
> - pr_cont("LDQ access error.\n");
> + ras_printk(PR_CONT, "LDQ access error.\n");
> break;
>
> default:
> @@ -255,9 +258,9 @@ static bool f15h_dc_mce(u16 ec, u8 xec)
> } else if (BUS_ERROR(ec)) {
>
> if (!xec)
> - pr_cont("during system linefill.\n");
> + ras_printk(PR_CONT, "during system linefill.\n");
> else
> - pr_cont(" Internal %s condition.\n",
> + ras_printk(PR_CONT, " Internal %s condition.\n",
> ((xec == 1) ? "livelock" : "deadlock"));
> } else
> ret = false;
> @@ -270,12 +273,12 @@ static void amd_decode_dc_mce(struct mce *m)
> u16 ec = EC(m->status);
> u8 xec = XEC(m->status, xec_mask);
>
> - pr_emerg(HW_ERR "Data Cache Error: ");
> + ras_printk(PR_EMERG, "Data Cache Error: ");
>
> /* TLB error signatures are the same across families */
> if (TLB_ERROR(ec)) {
> if (TT(ec) == TT_DATA) {
> - pr_cont("%s TLB %s.\n", LL_MSG(ec),
> + ras_printk(PR_CONT, "%s TLB %s.\n", LL_MSG(ec),
> ((xec == 2) ? "locked miss"
> : (xec ? "multimatch" : "parity")));
> return;
> @@ -283,7 +286,7 @@ static void amd_decode_dc_mce(struct mce *m)
> } else if (fam_ops->dc_mce(ec, xec))
> ;
> else
> - pr_emerg(HW_ERR "Corrupted DC MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted DC MCE info?\n");
> }
>
> static bool k8_ic_mce(u16 ec, u8 xec)
> @@ -295,19 +298,19 @@ static bool k8_ic_mce(u16 ec, u8 xec)
> return false;
>
> if (ll == 0x2)
> - pr_cont("during a linefill from L2.\n");
> + ras_printk(PR_CONT, "during a linefill from L2.\n");
> else if (ll == 0x1) {
> switch (R4(ec)) {
> case R4_IRD:
> - pr_cont("Parity error during data load.\n");
> + ras_printk(PR_CONT, "Parity error during data load.\n");
> break;
>
> case R4_EVICT:
> - pr_cont("Copyback Parity/Victim error.\n");
> + ras_printk(PR_CONT, "Copyback Parity/Victim error.\n");
> break;
>
> case R4_SNOOP:
> - pr_cont("Tag Snoop error.\n");
> + ras_printk(PR_CONT, "Tag Snoop error.\n");
> break;
>
> default:
> @@ -330,9 +333,9 @@ static bool f14h_ic_mce(u16 ec, u8 xec)
> ret = false;
>
> if (r4 == R4_IRD)
> - pr_cont("Data/tag array parity error for a tag hit.\n");
> + ras_printk(PR_CONT, "Data/tag array parity error for a tag hit.\n");
> else if (r4 == R4_SNOOP)
> - pr_cont("Tag error during snoop/victimization.\n");
> + ras_printk(PR_CONT, "Tag error during snoop/victimization.\n");
> else
> ret = false;
> }
> @@ -348,15 +351,16 @@ static bool f15h_ic_mce(u16 ec, u8 xec)
>
> switch (xec) {
> case 0x0 ... 0xa:
> - pr_cont("%s.\n", f15h_ic_mce_desc[xec]);
> + ras_printk(PR_CONT, "%s.\n", f15h_ic_mce_desc[xec]);
> break;
>
> case 0xd:
> - pr_cont("%s.\n", f15h_ic_mce_desc[xec-2]);
> + ras_printk(PR_CONT, "%s.\n", f15h_ic_mce_desc[xec-2]);
> break;
>
> case 0x10 ... 0x14:
> - pr_cont("Decoder %s parity error.\n", f15h_ic_mce_desc[xec-4]);
> + ras_printk(PR_CONT, "Decoder %s parity error.\n",
> + f15h_ic_mce_desc[xec-4]);
> break;
>
> default:
> @@ -370,19 +374,20 @@ static void amd_decode_ic_mce(struct mce *m)
> u16 ec = EC(m->status);
> u8 xec = XEC(m->status, xec_mask);
>
> - pr_emerg(HW_ERR "Instruction Cache Error: ");
> + ras_printk(PR_EMERG, "Instruction Cache Error: ");
>
> if (TLB_ERROR(ec))
> - pr_cont("%s TLB %s.\n", LL_MSG(ec),
> + ras_printk(PR_CONT, "%s TLB %s.\n", LL_MSG(ec),
> (xec ? "multimatch" : "parity error"));
> else if (BUS_ERROR(ec)) {
> bool k8 = (boot_cpu_data.x86 == 0xf && (m->status & BIT_64(58)));
>
> - pr_cont("during %s.\n", (k8 ? "system linefill" : "NB data read"));
> + ras_printk(PR_CONT, "during %s.\n", (k8 ? "system linefill"
> + : "NB data read"));
> } else if (fam_ops->ic_mce(ec, xec))
> ;
> else
> - pr_emerg(HW_ERR "Corrupted IC MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted IC MCE info?\n");
> }
>
> static void amd_decode_bu_mce(struct mce *m)
> @@ -390,30 +395,33 @@ static void amd_decode_bu_mce(struct mce *m)
> u16 ec = EC(m->status);
> u8 xec = XEC(m->status, xec_mask);
>
> - pr_emerg(HW_ERR "Bus Unit Error");
> + ras_printk(PR_EMERG, "Bus Unit Error");
>
> if (xec == 0x1)
> - pr_cont(" in the write data buffers.\n");
> + ras_printk(PR_CONT, " in the write data buffers.\n");
> else if (xec == 0x3)
> - pr_cont(" in the victim data buffers.\n");
> + ras_printk(PR_CONT, " in the victim data buffers.\n");
> else if (xec == 0x2 && MEM_ERROR(ec))
> - pr_cont(": %s error in the L2 cache tags.\n", R4_MSG(ec));
> + ras_printk(PR_CONT, ": %s error in the L2 cache tags.\n",
> + R4_MSG(ec));
> else if (xec == 0x0) {
> if (TLB_ERROR(ec))
> - pr_cont(": %s error in a Page Descriptor Cache or "
> - "Guest TLB.\n", TT_MSG(ec));
> + ras_printk(PR_CONT, ": %s error in a Page Descriptor "
> + "Cache or Guest TLB.\n",
> + TT_MSG(ec));
> else if (BUS_ERROR(ec))
> - pr_cont(": %s/ECC error in data read from NB: %s.\n",
> - R4_MSG(ec), PP_MSG(ec));
> + ras_printk(PR_CONT, ": %s/ECC error in data read from NB: %s.\n",
> + R4_MSG(ec), PP_MSG(ec));
> else if (MEM_ERROR(ec)) {
> u8 r4 = R4(ec);
>
> if (r4 >= 0x7)
> - pr_cont(": %s error during data copyback.\n",
> - R4_MSG(ec));
> + ras_printk(PR_CONT, ": %s error during data copyback.\n",
> + R4_MSG(ec));
> else if (r4 <= 0x1)
> - pr_cont(": %s parity/ECC error during data "
> - "access from L2.\n", R4_MSG(ec));
> + ras_printk(PR_CONT, ": %s parity/ECC error "
> + "during data access from L2.\n",
> + R4_MSG(ec));
> else
> goto wrong_bu_mce;
> } else
> @@ -424,7 +432,7 @@ static void amd_decode_bu_mce(struct mce *m)
> return;
>
> wrong_bu_mce:
> - pr_emerg(HW_ERR "Corrupted BU MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted BU MCE info?\n");
> }
>
> static void amd_decode_cu_mce(struct mce *m)
> @@ -432,28 +440,28 @@ static void amd_decode_cu_mce(struct mce *m)
> u16 ec = EC(m->status);
> u8 xec = XEC(m->status, xec_mask);
>
> - pr_emerg(HW_ERR "Combined Unit Error: ");
> + ras_printk(PR_EMERG, "Combined Unit Error: ");
>
> if (TLB_ERROR(ec)) {
> if (xec == 0x0)
> - pr_cont("Data parity TLB read error.\n");
> + ras_printk(PR_CONT, "Data parity TLB read error.\n");
> else if (xec == 0x1)
> - pr_cont("Poison data provided for TLB fill.\n");
> + ras_printk(PR_CONT, "Poison data provided for TLB fill.\n");
> else
> goto wrong_cu_mce;
> } else if (BUS_ERROR(ec)) {
> if (xec > 2)
> goto wrong_cu_mce;
>
> - pr_cont("Error during attempted NB data read.\n");
> + ras_printk(PR_CONT, "Error during attempted NB data read.\n");
> } else if (MEM_ERROR(ec)) {
> switch (xec) {
> case 0x4 ... 0xc:
> - pr_cont("%s.\n", f15h_cu_mce_desc[xec - 0x4]);
> + ras_printk(PR_CONT, "%s.\n", f15h_cu_mce_desc[xec - 0x4]);
> break;
>
> case 0x10 ... 0x14:
> - pr_cont("%s.\n", f15h_cu_mce_desc[xec - 0x7]);
> + ras_printk(PR_CONT, "%s.\n", f15h_cu_mce_desc[xec - 0x7]);
> break;
>
> default:
> @@ -464,7 +472,7 @@ static void amd_decode_cu_mce(struct mce *m)
> return;
>
> wrong_cu_mce:
> - pr_emerg(HW_ERR "Corrupted CU MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted CU MCE info?\n");
> }
>
> static void amd_decode_ls_mce(struct mce *m)
> @@ -473,12 +481,12 @@ static void amd_decode_ls_mce(struct mce *m)
> u8 xec = XEC(m->status, xec_mask);
>
> if (boot_cpu_data.x86 >= 0x14) {
> - pr_emerg("You shouldn't be seeing an LS MCE on this cpu family,"
> - " please report on LKML.\n");
> + ras_printk(PR_EMERG, "You shouldn't be seeing an LS MCE on this"
> + " cpu family, please report on LKML.\n");
> return;
> }
>
> - pr_emerg(HW_ERR "Load Store Error");
> + ras_printk(PR_EMERG, "Load Store Error");
>
> if (xec == 0x0) {
> u8 r4 = R4(ec);
> @@ -486,14 +494,14 @@ static void amd_decode_ls_mce(struct mce *m)
> if (!BUS_ERROR(ec) || (r4 != R4_DRD && r4 != R4_DWR))
> goto wrong_ls_mce;
>
> - pr_cont(" during %s.\n", R4_MSG(ec));
> + ras_printk(PR_CONT, " during %s.\n", R4_MSG(ec));
> } else
> goto wrong_ls_mce;
>
> return;
>
> wrong_ls_mce:
> - pr_emerg(HW_ERR "Corrupted LS MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted LS MCE info?\n");
> }
>
> static bool k8_nb_mce(u16 ec, u8 xec)
> @@ -502,15 +510,15 @@ static bool k8_nb_mce(u16 ec, u8 xec)
>
> switch (xec) {
> case 0x1:
> - pr_cont("CRC error detected on HT link.\n");
> + ras_printk(PR_CONT, "CRC error detected on HT link.\n");
> break;
>
> case 0x5:
> - pr_cont("Invalid GART PTE entry during GART table walk.\n");
> + ras_printk(PR_CONT, "Invalid GART PTE entry during GART table walk.\n");
> break;
>
> case 0x6:
> - pr_cont("Unsupported atomic RMW received from an IO link.\n");
> + ras_printk(PR_CONT, "Unsupported atomic RMW received from an IO link.\n");
> break;
>
> case 0x0:
> @@ -518,11 +526,11 @@ static bool k8_nb_mce(u16 ec, u8 xec)
> if (boot_cpu_data.x86 == 0x11)
> return false;
>
> - pr_cont("DRAM ECC error detected on the NB.\n");
> + ras_printk(PR_CONT, "DRAM ECC error detected on the NB.\n");
> break;
>
> case 0xd:
> - pr_cont("Parity error on the DRAM addr/ctl signals.\n");
> + ras_printk(PR_CONT, "Parity error on the DRAM addr/ctl signals.\n");
> break;
>
> default:
> @@ -552,9 +560,9 @@ static bool f10h_nb_mce(u16 ec, u8 xec)
>
> case 0xf:
> if (TLB_ERROR(ec))
> - pr_cont("GART Table Walk data error.\n");
> + ras_printk(PR_CONT, "GART Table Walk data error.\n");
> else if (BUS_ERROR(ec))
> - pr_cont("DMA Exclusion Vector Table Walk error.\n");
> + ras_printk(PR_CONT, "DMA Exclusion Vector Table Walk error.\n");
> else
> ret = false;
>
> @@ -563,7 +571,7 @@ static bool f10h_nb_mce(u16 ec, u8 xec)
>
> case 0x19:
> if (boot_cpu_data.x86 == 0x15)
> - pr_cont("Compute Unit Data Error.\n");
> + ras_printk(PR_CONT, "Compute Unit Data Error.\n");
> else
> ret = false;
>
> @@ -581,7 +589,7 @@ static bool f10h_nb_mce(u16 ec, u8 xec)
> break;
> }
>
> - pr_cont("%s.\n", f10h_nb_mce_desc[xec - offset]);
> + ras_printk(PR_CONT, "%s.\n", f10h_nb_mce_desc[xec - offset]);
>
> out:
> return ret;
> @@ -599,27 +607,27 @@ void amd_decode_nb_mce(struct mce *m)
> u16 ec = EC(m->status);
> u8 xec = XEC(m->status, 0x1f);
>
> - pr_emerg(HW_ERR "Northbridge Error (node %d): ", node_id);
> + ras_printk(PR_EMERG, "Northbridge Error (node %d): ", node_id);
>
> switch (xec) {
> case 0x2:
> - pr_cont("Sync error (sync packets on HT link detected).\n");
> + ras_printk(PR_CONT, "Sync error (sync packets on HT link detected).\n");
> return;
>
> case 0x3:
> - pr_cont("HT Master abort.\n");
> + ras_printk(PR_CONT, "HT Master abort.\n");
> return;
>
> case 0x4:
> - pr_cont("HT Target abort.\n");
> + ras_printk(PR_CONT, "HT Target abort.\n");
> return;
>
> case 0x7:
> - pr_cont("NB Watchdog timeout.\n");
> + ras_printk(PR_CONT, "NB Watchdog timeout.\n");
> return;
>
> case 0x9:
> - pr_cont("SVM DMA Exclusion Vector error.\n");
> + ras_printk(PR_CONT, "SVM DMA Exclusion Vector error.\n");
> return;
>
> default:
> @@ -636,7 +644,7 @@ void amd_decode_nb_mce(struct mce *m)
> return;
>
> wrong_nb_mce:
> - pr_emerg(HW_ERR "Corrupted NB MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted NB MCE info?\n");
> }
> EXPORT_SYMBOL_GPL(amd_decode_nb_mce);
>
> @@ -651,80 +659,80 @@ static void amd_decode_fr_mce(struct mce *m)
> if (c->x86 != 0x15 && xec != 0x0)
> goto wrong_fr_mce;
>
> - pr_emerg(HW_ERR "%s Error: ",
> + ras_printk(PR_EMERG, "%s Error: ",
> (c->x86 == 0x15 ? "Execution Unit" : "FIROB"));
>
> if (xec == 0x0 || xec == 0xc)
> - pr_cont("%s.\n", fr_ex_mce_desc[xec]);
> + ras_printk(PR_CONT, "%s.\n", fr_ex_mce_desc[xec]);
> else if (xec < 0xd)
> - pr_cont("%s parity error.\n", fr_ex_mce_desc[xec]);
> + ras_printk(PR_CONT, "%s parity error.\n", fr_ex_mce_desc[xec]);
> else
> goto wrong_fr_mce;
>
> return;
>
> wrong_fr_mce:
> - pr_emerg(HW_ERR "Corrupted FR MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted FR MCE info?\n");
> }
>
> static void amd_decode_fp_mce(struct mce *m)
> {
> u8 xec = XEC(m->status, xec_mask);
>
> - pr_emerg(HW_ERR "Floating Point Unit Error: ");
> + ras_printk(PR_EMERG, "Floating Point Unit Error: ");
>
> switch (xec) {
> case 0x1:
> - pr_cont("Free List");
> + ras_printk(PR_CONT, "Free List");
> break;
>
> case 0x2:
> - pr_cont("Physical Register File");
> + ras_printk(PR_CONT, "Physical Register File");
> break;
>
> case 0x3:
> - pr_cont("Retire Queue");
> + ras_printk(PR_CONT, "Retire Queue");
> break;
>
> case 0x4:
> - pr_cont("Scheduler table");
> + ras_printk(PR_CONT, "Scheduler table");
> break;
>
> case 0x5:
> - pr_cont("Status Register File");
> + ras_printk(PR_CONT, "Status Register File");
> break;
>
> default:
> goto wrong_fp_mce;
> break;
> }
> -
> - pr_cont(" parity error.\n");
> + ras_printk(PR_CONT, " parity error.\n");
>
> return;
>
> wrong_fp_mce:
> - pr_emerg(HW_ERR "Corrupted FP MCE info?\n");
> + ras_printk(PR_EMERG, "Corrupted FP MCE info?\n");
> }
>
> static inline void amd_decode_err_code(u16 ec)
> {
>
> - pr_emerg(HW_ERR "cache level: %s", LL_MSG(ec));
> + ras_printk(PR_EMERG, "cache level: %s", LL_MSG(ec));
>
> if (BUS_ERROR(ec))
> - pr_cont(", mem/io: %s", II_MSG(ec));
> + ras_printk(PR_CONT, ", mem/io: %s", II_MSG(ec));
> else
> - pr_cont(", tx: %s", TT_MSG(ec));
> + ras_printk(PR_CONT, ", tx: %s", TT_MSG(ec));
>
> if (MEM_ERROR(ec) || BUS_ERROR(ec)) {
> - pr_cont(", mem-tx: %s", R4_MSG(ec));
> + ras_printk(PR_CONT, ", mem-tx: %s", R4_MSG(ec));
>
> if (BUS_ERROR(ec))
> - pr_cont(", part-proc: %s (%s)", PP_MSG(ec), TO_MSG(ec));
> + ras_printk(PR_CONT, ", part-proc: %s (%s)",
> + PP_MSG(ec), TO_MSG(ec));
> }
>
> - pr_cont("\n");
> + ras_printk(PR_CONT, "\n");
> }
>
> /*
> @@ -752,7 +760,7 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
> if (amd_filter_mce(m))
> return NOTIFY_STOP;
>
> - pr_emerg(HW_ERR "CPU:%d\tMC%d_STATUS[%s|%s|%s|%s|%s",
> + ras_printk(PR_EMERG, "CPU:%d MC%d_STATUS[%s|%s|%s|%s|%s",
> m->extcpu, m->bank,
> ((m->status & MCI_STATUS_OVER) ? "Over" : "-"),
> ((m->status & MCI_STATUS_UC) ? "UE" : "CE"),
> @@ -761,19 +769,22 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
> ((m->status & MCI_STATUS_ADDRV) ? "AddrV" : "-"));
>
> if (c->x86 == 0x15)
> - pr_cont("|%s|%s",
> + ras_printk(PR_CONT, "|%s|%s",
> ((m->status & BIT_64(44)) ? "Deferred" : "-"),
> ((m->status & BIT_64(43)) ? "Poison" : "-"));
>
> /* do the two bits[14:13] together */
> ecc = (m->status >> 45) & 0x3;
> if (ecc)
> - pr_cont("|%sECC", ((ecc == 2) ? "C" : "U"));
> + ras_printk(PR_CONT, "|%sECC", ((ecc == 2) ? "C" : "U"));
>
> - pr_cont("]: 0x%016llx\n", m->status);
> + ras_printk(PR_CONT, "]: 0x%016llx", m->status);
>
> if (m->status & MCI_STATUS_ADDRV)
> - pr_emerg(HW_ERR "\tMC%d_ADDR: 0x%016llx\n", m->bank, m->addr);
> + ras_printk(PR_CONT, " MC%d_ADDR: 0x%016llx",
> + m->bank, m->addr);
> +
> + ras_printk(PR_CONT, "\n");
>
> switch (m->bank) {
> case 0:
> @@ -813,6 +824,8 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
>
> amd_decode_err_code(m->status & 0xffff);
>
> + trace_mce_record(ras_get_decoded_err(), m);
> +
> return NOTIFY_STOP;
> }
> EXPORT_SYMBOL_GPL(amd_decode_mce);
> @@ -882,10 +895,10 @@ static int __init mce_amd_init(void)
> return -EINVAL;
> }
>
> - pr_info("MCE: In-kernel MCE decoding enabled.\n");
> -
> mce_register_decode_chain(&amd_mce_dec_nb);
>
> + pr_info("MCE: In-kernel MCE decoding enabled.\n");
> +
> return 0;
> }
> early_initcall(mce_amd_init);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists