From: Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>
To: Borislav Petkov <bp@alien8.de>
Cc: <dougthompson@xmission.com>, <linux-edac@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] EDAC, MCE, AMD: Fix code to prevent NULL dereference
Date: Thu, 20 Feb 2014 10:07:33 -0600 [thread overview]
Message-ID: <53062845.8010203@amd.com> (raw)
In-Reply-To: <20140220093207.GB8876@pd.tnic>
On 2/20/2014 3:32 AM, Borislav Petkov wrote:
> Is that better (I also dropped the "Error Status: " prefix because it is
> not needed):
>
> - [ 46.822828] [Hardware Error]: Error Status: Uncorrected, software containable error.
> + [ 46.822828] [Hardware Error]: Uncorrected, software containable error.
Okay.
> --
> diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
> index 30f7309446a6..528b0c4998d9 100644
> --- a/drivers/edac/mce_amd.c
> +++ b/drivers/edac/mce_amd.c
> @@ -741,6 +741,36 @@ 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 "%s\n", decode_error_status(m));
> +
> + pr_emerg(HW_ERR "CPU:%d (%x:%x:%x) MC%d_STATUS[%s|%s|%s|%s|%s",
> + m->extcpu,
> + c->x86, c->x86_model, c->x86_mask,
> + m->bank,
> + ((m->status & MCI_STATUS_OVER) ? "Over" : "-"),
> + ((m->status & MCI_STATUS_UC) ? "UE" : "CE"),
> + ((m->status & MCI_STATUS_MISCV) ? "MiscV" : "-"),
> + ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"),
> + ((m->status & MCI_STATUS_ADDRV) ? "AddrV" : "-"));
> +
> + if (c->x86 == 0x15 || c->x86 == 0x16)
> + pr_cont("|%s|%s",
> + ((m->status & MCI_STATUS_DEFERRED) ? "Deferred" : "-"),
> + ((m->status & MCI_STATUS_POISON) ? "Poison" : "-"));
> +
> + /* do the two bits[14:13] together */
> + ecc = (m->status >> 45) & 0x3;
> + if (ecc)
> + pr_cont("|%sECC", ((ecc == 2) ? "C" : "U"));
> +
> + pr_cont("]: 0x%016llx\n", m->status);
> +
> + if (m->status & MCI_STATUS_ADDRV)
> + pr_emerg(HW_ERR "MC%d_ADDR: 0x%016llx\n", m->bank, m->addr);
> +
> + if (!fam_ops)
> + goto err_code;
> +
> switch (m->bank) {
> case 0:
> decode_mc0_mce(m);
> @@ -774,33 +804,7 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
> break;
> }
>
> - pr_emerg(HW_ERR "Error Status: %s\n", decode_error_status(m));
> -
> - pr_emerg(HW_ERR "CPU:%d (%x:%x:%x) MC%d_STATUS[%s|%s|%s|%s|%s",
> - m->extcpu,
> - c->x86, c->x86_model, c->x86_mask,
> - m->bank,
> - ((m->status & MCI_STATUS_OVER) ? "Over" : "-"),
> - ((m->status & MCI_STATUS_UC) ? "UE" : "CE"),
> - ((m->status & MCI_STATUS_MISCV) ? "MiscV" : "-"),
> - ((m->status & MCI_STATUS_PCC) ? "PCC" : "-"),
> - ((m->status & MCI_STATUS_ADDRV) ? "AddrV" : "-"));
> -
> - if (c->x86 == 0x15 || c->x86 == 0x16)
> - pr_cont("|%s|%s",
> - ((m->status & MCI_STATUS_DEFERRED) ? "Deferred" : "-"),
> - ((m->status & MCI_STATUS_POISON) ? "Poison" : "-"));
> -
> - /* do the two bits[14:13] together */
> - ecc = (m->status >> 45) & 0x3;
> - if (ecc)
> - pr_cont("|%sECC", ((ecc == 2) ? "C" : "U"));
> -
> - pr_cont("]: 0x%016llx\n", m->status);
> -
> - if (m->status & MCI_STATUS_ADDRV)
> - pr_emerg(HW_ERR "MC%d_ADDR: 0x%016llx\n", m->bank, m->addr);
> -
> + err_code:
> amd_decode_err_code(m->status & 0xffff);
>
> return NOTIFY_STOP;
> @@ -816,10 +820,10 @@ static int __init mce_amd_init(void)
> struct cpuinfo_x86 *c = &boot_cpu_data;
>
> if (c->x86_vendor != X86_VENDOR_AMD)
> - return 0;
> + return -ENODEV;
>
> if (c->x86 < 0xf || c->x86 > 0x16)
> - return 0;
> + return -ENODEV;
>
> fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);
> if (!fam_ops)
> @@ -874,6 +878,7 @@ static int __init mce_amd_init(void)
> default:
> printk(KERN_WARNING "Huh? What family is it: 0x%x?!\n", c->x86);
> kfree(fam_ops);
> + fam_ops = NULL;
> return -EINVAL;
> }
> --
>
Tested the above a final time on local machine and it works fine..
Thanks,
-Aravind.
next prev parent reply other threads:[~2014-02-20 16:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-17 17:49 [PATCH] EDAC, MCE, AMD: Fix code to prevent NULL dereference Aravind Gopalakrishnan
2014-02-17 18:27 ` Borislav Petkov
2014-02-17 19:26 ` Aravind Gopalakrishnan
2014-02-17 19:41 ` Borislav Petkov
2014-02-17 22:36 ` Aravind Gopalakrishnan
2014-02-18 0:36 ` Borislav Petkov
2014-02-18 8:46 ` Borislav Petkov
2014-02-18 18:27 ` Aravind Gopalakrishnan
2014-02-20 9:32 ` Borislav Petkov
2014-02-20 16:07 ` Aravind Gopalakrishnan [this message]
2014-02-20 16:13 ` Borislav Petkov
2014-02-21 14:23 ` Borislav Petkov
2014-02-21 16:46 ` Aravind Gopalakrishnan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53062845.8010203@amd.com \
--to=aravind.gopalakrishnan@amd.com \
--cc=bp@alien8.de \
--cc=dougthompson@xmission.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.