lkml.org 
[lkml]   [2020]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 092/214] EDAC/{i7core,sb,pnd2,skx}: Fix error event severity
    Date
    From: Tony Luck <tony.luck@intel.com>

    [ Upstream commit 45bc6098a3e279d8e391d22428396687562797e2 ]

    IA32_MCG_STATUS.RIPV indicates whether the return RIP value pushed onto
    the stack as part of machine check delivery is valid or not.

    Various drivers copied a code fragment that uses the RIPV bit to
    determine the severity of the error as either HW_EVENT_ERR_UNCORRECTED
    or HW_EVENT_ERR_FATAL, but this check is reversed (marking errors where
    RIPV is set as "FATAL").

    Reverse the tests so that the error is marked fatal when RIPV is not set.

    Reported-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: <stable@vger.kernel.org>
    Link: https://lkml.kernel.org/r/20200707194324.14884-1-tony.luck@intel.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/edac/i7core_edac.c | 4 ++--
    drivers/edac/pnd2_edac.c | 2 +-
    drivers/edac/sb_edac.c | 4 ++--
    drivers/edac/skx_common.c | 4 ++--
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
    index a71cca6eeb333..6be7e65f7389d 100644
    --- a/drivers/edac/i7core_edac.c
    +++ b/drivers/edac/i7core_edac.c
    @@ -1711,9 +1711,9 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
    if (uncorrected_error) {
    core_err_cnt = 1;
    if (ripv)
    - tp_event = HW_EVENT_ERR_FATAL;
    - else
    tp_event = HW_EVENT_ERR_UNCORRECTED;
    + else
    + tp_event = HW_EVENT_ERR_FATAL;
    } else {
    tp_event = HW_EVENT_ERR_CORRECTED;
    }
    diff --git a/drivers/edac/pnd2_edac.c b/drivers/edac/pnd2_edac.c
    index b1193be1ef1d8..dac45e2071b3f 100644
    --- a/drivers/edac/pnd2_edac.c
    +++ b/drivers/edac/pnd2_edac.c
    @@ -1155,7 +1155,7 @@ static void pnd2_mce_output_error(struct mem_ctl_info *mci, const struct mce *m,
    u32 optypenum = GET_BITFIELD(m->status, 4, 6);
    int rc;

    - tp_event = uc_err ? (ripv ? HW_EVENT_ERR_FATAL : HW_EVENT_ERR_UNCORRECTED) :
    + tp_event = uc_err ? (ripv ? HW_EVENT_ERR_UNCORRECTED : HW_EVENT_ERR_FATAL) :
    HW_EVENT_ERR_CORRECTED;

    /*
    diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
    index a2fd39d330d67..b557a53c75c46 100644
    --- a/drivers/edac/sb_edac.c
    +++ b/drivers/edac/sb_edac.c
    @@ -2982,9 +2982,9 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,
    if (uncorrected_error) {
    core_err_cnt = 1;
    if (ripv) {
    - tp_event = HW_EVENT_ERR_FATAL;
    - } else {
    tp_event = HW_EVENT_ERR_UNCORRECTED;
    + } else {
    + tp_event = HW_EVENT_ERR_FATAL;
    }
    } else {
    tp_event = HW_EVENT_ERR_CORRECTED;
    diff --git a/drivers/edac/skx_common.c b/drivers/edac/skx_common.c
    index 4ca87723dcdcd..99dea4f66b5e9 100644
    --- a/drivers/edac/skx_common.c
    +++ b/drivers/edac/skx_common.c
    @@ -490,9 +490,9 @@ static void skx_mce_output_error(struct mem_ctl_info *mci,
    if (uncorrected_error) {
    core_err_cnt = 1;
    if (ripv) {
    - tp_event = HW_EVENT_ERR_FATAL;
    - } else {
    tp_event = HW_EVENT_ERR_UNCORRECTED;
    + } else {
    + tp_event = HW_EVENT_ERR_FATAL;
    }
    } else {
    tp_event = HW_EVENT_ERR_CORRECTED;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-01 18:27    [W:4.118 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site