From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754235AbdFLQya (ORCPT ); Mon, 12 Jun 2017 12:54:30 -0400 Received: from mail-bl2nam02on0048.outbound.protection.outlook.com ([104.47.38.48]:17081 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753559AbdFLQy0 (ORCPT ); Mon, 12 Jun 2017 12:54:26 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Yazen Ghannam To: linux-edac@vger.kernel.org Cc: Borislav Petkov , Tony Luck , x86@kernel.org, linux-kernel@vger.kernel.org, Yazen Ghannam Subject: [PATCH] x86/mce: Always save severity in machine_check_poll Date: Mon, 12 Jun 2017 11:54:06 -0500 Message-Id: <1497286446-59533-1-git-send-email-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: MWHPR2201CA0056.namprd22.prod.outlook.com (10.172.59.30) To CY4PR1201MB0135.namprd12.prod.outlook.com (10.172.78.17) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PR1201MB0135: X-MS-Office365-Filtering-Correlation-Id: 241ada79-2441-480e-999d-08d4b1b3aa9f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(201703131423075)(201703031133081);SRVR:CY4PR1201MB0135; X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;3:y89XeXnPUEviom+jhOU6TGqYWGLd01zoA6VbCU7Fj/DOuZOA3mqT1yhpMQBU1tA3SMRi+W1PY4DG/pekEAtJN7Qj5SLDKMxn6ZsX+p414r/B3qXt9rXFMHqSMLCOfComdAC6+Q1EovZM6UR7QtFNBKM3PL9b8sqa84B9HySQW38YbTFy5Z2vMrhYRWldl50U9/0PmIrx92x9OUGVfywenE4N692GB5TMxZkvyJjB4l2/FWIio+f0kNCo9toco8wHBzJwWh3z8zl15glx9kOyVHfLXEj2XCDV6VCowyxpXbAQnhZ8lD7HzNFcgKbCqxFZXHLcFjjOGZuM+jBn/Lz54eBBbSBJijW9Thxh8Klt+Yw=;25:2InlZ+inxHcC+TCNubCCCLKYkH2vYJOPkiHsY+RfJq+zDAdocSyOV9JHk2WWBbM89kZmFqp1Q0pCJzkCVCUnG/qXoWgtpGJS6v2sWPfPvs78eZmjsg/Wnc8eFlkS5KcuMSCilP+yCnlFD/yunWQZRCgA24rluLr/yufqOUJj1BKMmcuk2SpC/6WCvZ+jWpW+hgWW+GhKnbaKU8dTYeqc2qpI96CKLUKbNh6HD8Gry5IW9sH+Z7ZgLv1sX8pGNYgpvj5IJylHW208P29hIHxwrKp6E/HJlD2rqegFvLRFAjUodrQwGlEMaMCr3KJ5qv6h62oOrRBGDcAkF8jhBLs3eZOKm4UU4wRHBizDX6yVZYZH1g2Qxgassz1QiTdgPewDDiqMCx3UGzrIwC5/tSuNqfBWnVoEQFH8kZgpnvbeYLI60QEwrysd4mVAQ001VmI+N5fhjyf4Vn16qkcwnsU9OOpdSMjdMVLPSx3XlCPi+nM= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;31:B8AJImtUguFSI+KC9FGMv4mPXHTUwMjHAiya4XLK8ZfJJFXxJsr/5o/6Qeq7vC0YGlF8l3kj4pWqpY9Y3KhGydQCagAPAeCNYjCZEAOj87AX6rtziHauP5L44uSys6lqGXD0QNgQTG6Ku+flujVdncWIdk//Bjn/IPWO3V3Sl40z0u83vlBFsKIaQ47PfivYL+stk/mtz9XpNbJgKGafA8bg4JGCOa98F0pU1sTFYp0=;20:cQx5dQcVwWl8PC0nOcNez/y4yq3omph1A1ZpvU8KGWNGzRttfSNZK0oUgo3rce96Fj3dnvLS17WFelprYX/QtTmaxMUdyXoWJ15KXZMhBL6kbW8QQCGRnAl4aSbO7qx8rJuKkiQ4K9T/fcETuNMacE9f6EuLYltuRRAey/wWwYZzuJ7cktWDiOXO/Vqz/fEQO58TwYriv53x/VTPDOFWHaZM/FKTgzfqtfiFGbvrnZWfKdiURBXwZpmCycrFfZ/Mn9fUuSZCsZ73OyKWIvEF7/2XAAJjh+fx31yE+UV6XOcqOf9saAi7SFtBv/uYGq1MDGcAmDh6zTOvSySY84EzRAAnqHuLzIbjp1Iku1/0wwKikb6cNgCznd+m39uG/yyAsGuFp+Uu+Sz4y7BUpGaxlteOrZaii7Bp6vZPV1Dj+zq2Hj6WqFgjwOsh6+cfWeSFLAKD84gN9+J8JjxRZdLtZzZWxsOnnjg4h3JHU4HceywoL7ollZQ+TP0nsLPundpU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR1201MB0135;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR1201MB0135; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR1201MB0135;4:IkTi82M80jSFCR+t1WcrSzE0VVGIpdAnYlGjHiJw?= =?us-ascii?Q?DCefn4DzpXmhQTKEKi/VpEdsQR2M99CvlP1OZZEUFlLA7EmqWVoqyW36suVW?= =?us-ascii?Q?63+lNcNiVhgbu0trJfNKpy/Oynk25xDNxsf+dKXzoa0ciw10Hr2YZ95NKUMe?= =?us-ascii?Q?TKVDzuBu+JNVM/Mly5xIJRyzCA5sYYK/qYSBOEjQMBR8N5vzAo7BT8z7O9j2?= =?us-ascii?Q?UQ8Hd9WaznHU/hmNIOJ4G70KOCSKCkJ5Zlum/bfLpqo5xP39fnDoHvxdcMOJ?= =?us-ascii?Q?nl7AIK0ZNCe9d+cRteg5RpSncYdiFmGpTniodmue/qOD2D8ES59If7EpxJp0?= =?us-ascii?Q?NXBvTFy6AkoHgxGjoyRdWxhEmmpqTv9zYPpRhI6iE0Z1XDAlKCPKnlR6oXCl?= =?us-ascii?Q?ckNagm4lMirmo2fYUi0y1FiAFEd01yQlacOe16oWrXaaArkIwW8WWVnY6ggZ?= =?us-ascii?Q?mreh5wwCFa+A6U8Wjv6VxX8KQpmk0GlOcs4tYAFC2gKZWRIug8Z7OUJD6i4N?= =?us-ascii?Q?g7Lse/ozispVOIHfIFSYqr4/I5V9MJK9z6ujS4okQ3dH07l+8p9L52DJIa5L?= =?us-ascii?Q?0U4KG/90e9kW4dwirQc31hR0zhsoNMyoW5xuMaNlDnNFv75PO/0aC9HirjVA?= =?us-ascii?Q?nt1nJw7OHx99Airm51BA27bx61Hk/0OPZipn5nJIhik+finnBn8tiKqPpAUQ?= =?us-ascii?Q?/LWY6fDLg9VOfAEVvEPVUide7UyVKs61GwEFkBCnoKI7AfZPg1hUv0uloZAQ?= =?us-ascii?Q?TxS+7OtZwJAxca133F8EwiC/UNyS4JSJQ28tAgJgcM3RQkerjxL5FwkLWfiZ?= =?us-ascii?Q?eucgIzT4C3Q9livqPYO5DB9GrMElZtItbACyuwcNHGJtj/vKg/akC77DWEXy?= =?us-ascii?Q?s8xyykCFOi+Pcs+6nqfcn5pK9gVDfczSpubgM3dOrqOs5bEpN4OgKswqS9HD?= =?us-ascii?Q?5lJ41kvlxtWVGdh52d/jpqPVk3Y64byCVcDQQxNz2AN1qHC8bsDm6N2q3NTl?= =?us-ascii?Q?8gz5GuQGKHUjAIfEV1cFYmkokyJMDQP9ZPax3YudvvLyJ8fLZcUwjZgp5G0N?= =?us-ascii?Q?TrTi+7QS7eQA3PNH4+zBvB48uEj4xiKMIhnT72o5SkM129K9f3m03BJPDoc/?= =?us-ascii?Q?hlkeiVOVv5xH+bNPofP4A2zHQqqR6G/6ADwgdk2PfqNpEuekhUjgYmy4cXO7?= =?us-ascii?Q?hZR4v/0ekQ9yhbhqc1cH0YF5RyfIq1kE9Cju?= X-Forefront-PRVS: 03361FCC43 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39840400002)(39410400002)(39860400002)(39400400002)(39450400003)(39850400002)(86362001)(6486002)(47776003)(5660300001)(50986999)(478600001)(38730400002)(66066001)(54906002)(72206003)(81166006)(50226002)(8676002)(6666003)(189998001)(2906002)(3846002)(48376002)(6916009)(4326008)(36756003)(53936002)(110136004)(2351001)(53416004)(2361001)(7736002)(42186005)(305945005)(25786009)(5003940100001);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR1201MB0135;H:yaz-diesel.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR1201MB0135;23:NpSRoHPAO1I4b7W8NYggIzq9NVqD+o6EsWgHb+q?= =?us-ascii?Q?1H8E/hP3ULulZ5GsPpAaW+q4pV9zQiWIIQFMUW+dYCVhMztUCzNQOIJeaD5u?= =?us-ascii?Q?Q2I4QjuhnpktBWb88TciMhtzAE9e76d9I1yXTINId2XkOlKG3zbAyiMd0cXy?= =?us-ascii?Q?kjNcgiLNVooAaIuP/D9ZYwd2mbmlmYXEVMlN0p8KYl6uERgI5SP/G3T1YTpF?= =?us-ascii?Q?tuQVeCKHRv1okMKD69BP7WSIo5raJcz1yGTqm4qfjkQaHmmOdz3NhwXEL9K8?= =?us-ascii?Q?po9zfvR1jejlxWURpQRcfV+g3tq47/ZMWkUBSvnr6wXOQ9Ccoe0Tub/L65U1?= =?us-ascii?Q?O5NeIxSQnjJRQBRhLiyGHP3kBwAwLG+WzRRXMH1XQOJtck9mg4mu20LYHeVd?= =?us-ascii?Q?siq+3VcrPQk2Nl60iSiZkh2CuWjQ1A2IKgCJ7pkRSS7V0ChNcWOZMbml+K/Q?= =?us-ascii?Q?EG2PY1Jz4pJMZ+8WuNoU76KfJp788NnfgOKo6k88jReDqRlrjiq/+/TP1LmS?= =?us-ascii?Q?7Om1Bzrt1GtDAlQ27ULSBmpakDIO8kBNNF9a2EtJIgwUBdBXZyMlftHBknyQ?= =?us-ascii?Q?FvJf1hbOwEINWtBpSr3KwyT8pfcnD8epQ3AZVPh4/d19bzOBqgWrdiwl/SqH?= =?us-ascii?Q?k2W6pIV/REqqeVjsvHfF6pBwySm6iDdUkIJz2sEmq9MfA2EjOlLZO/ldBHjA?= =?us-ascii?Q?IJQs/UgiQdV+zOCQxodyFK3H71gz23slVBzhIYfwWC6QOm09IAGrdeWeLWTU?= =?us-ascii?Q?FxRPXMm8huE282syHJimDrBt+os7OvNyII4DueMK6Oh41eAAfSYiJrPPMXnl?= =?us-ascii?Q?pzalexOD1WMAPN47/3+8Jq+LMzhV2IzLqcvqVekPQBQH7zCKDjRJd8YaTvmf?= =?us-ascii?Q?7BDafiH3jrY31AiFW2kaeIEjqJp+M7TERdaU3GofcrhJK500K3xvfNoT+YaH?= =?us-ascii?Q?PS1jN2YrJOL+Ituwv9dlyhReXjI7WoiRDn3miLUMF7NIR5K6wKgN4dt8LGGl?= =?us-ascii?Q?FwOB00KFnrZD5TQREgoqpJnDB?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;6:e8ZvN+GP28hTJONCdK64SSsdU8HR2w8d8nVhbqAqoq00YARlV+901eFedSa6ns/bhdR67hRMvyXRQQLTLGzHSXNrylXFxZsJbIWuwMENqtceZsDg2xF0IC3rTT6US8yAylucTjYmg/JlIU/x0zZlq0qKyC70OBQ1TGGCGzPXEOvby+rNhpH7/d7gKM5RF2AmDDyGB9dQ6YOEzk0PiCG9n5VTz2z0y1CcL0V1gbdmmmUiPnp+GJlY762IJsSvSNXQtSAD7muSAQcAOV/Lnilxp7gl7cr1oxpVtIMNiegzrRW/6Ui7tNzRxIbqIff9FB1GLSIOxtM6DKegmEAiKNAVeZnXKiSefE5owPfWpJUTlBPp6iq3okgmbFA4qHpAbe2YHaHpEiMeOSIDhrm5SkM0SM+RCuYKPhh5uo7cPduUfBxw02kqQe59ouI/25PTUI23vmk5kggap1K9wOR84vJ8K308GtraNyEi6MzIY7K8WkMUgtcc8xlUQua08qipIJZCVn8+WWtxq8Cl7FXNn6uK9+NFZmUeIXPS4MTLDE7KIrw= X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;5:S4Xl7npaGTBzaYBybdSPeYGQ8EypQ5kkt4MJRmGqGptAn/8+UglzWUUMPsFenofPlrwRQCqOQx298jpbu2RhnLrOxPkAOMd9RrLS4nVjrt+5Khuzy8WfbG3bZx6XHHMUrIsLf1Zbl5/xgZ5N3dkrHKlkmMX8mQp+dm9TdTX9R6C9cJlg2OCXsEZumguqNqlLT0jNPZXFLwc6aVbRePnbv0FmwOll0id0eFZ8akhEujtlrGFT6tC8VNRp0OtsVDrrxJO7ZVgq6CyPS+ZLIvtAZKj5bm/tQsV8810YybKiBp/YBt9qhtsPlF6K1Bd1xkekHLfPBPTMuxjbJ9Z5Ge+NhJ528z51xF4vqEw+sinf0ti8Tl1a3ipLdexxmqQpGlpqdcgb3wUB9cYVMMdZTmzhBsPSEPFMMBOxFCrh1q7C929muZPT2/lBuQlRyFmjdyhZ+ZR1j2D4Q8khwX+0xq1SztRT45d+YNoPZ+h0mBgF2wVJWn6zxBpR5ywfUTPa3tQ1;24:1h21k/7i8z73IwWAjDreLETx+yu9dzX7avzW5tMvpdDRPYIHJ/ivwHaQuMRwk9wi0NfWLiSxEGHysboiFTYV//76+KFUWN8XQK8FH7PPVgk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR1201MB0135;7:0Uwl/3O5l9RCLRANz8WKci9PSZ2xN9/vZxgNZyTbdBSdDweb+6NRtJgFFngOEKOqTpE/OFGuWdIoeKDT4/O+jQgoMOfe+hvvWYjQw7aYFIy/nTmniPH/JaE7/DZKbrxxfv1P3RFbP24ul9jxFbbSg5cXuTpH3X1YcSdmp0TExFxnIuhYRDSV968mmzASWhtSBSKOxWZ4LqVJIoEteiM9F5ctu/pxn55nJRqfjsb9gYtjh2zeCCuipyC0XVKllUaf0zNRVWvEWiWrv9MbOR3vd7j2ztp8gHu0eF5/uyBrryobvktCZoZE9UGcrx5D/KuwwCpujL8EBzE689l5MNNccw==;20:2w3Earw0OUHsMpto3xYUhNI4yCHF5BeWBXUH/xffsGqPrV8MnUKOAhi+xrpzjHJXSPUsVHCsp/fNP4/6fXn7aSxNwpCDQoZ6AjNtHRF7kibIU1g2ZpeIyKQJf/AHqIhOOdbSnFZx6uqd3NiuQEzK8hO1lqBusQrjZYxAEnw6hssDhjGhbhQsmUG5Xe5Dc5VI/jTVsWsPI+vWS7dZVVtvMWMELe206Z1eW4chUX/+qLiG7jWxmkMYaXnwOgDfPsRP X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2017 16:54:17.6533 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0135 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam Remove code that was used to decide whether to schedule work. The decision to schedule work is made later, so this code is now only deciding if we should save the error severity. Save the severity since we have it, and let the notifier blocks decide if they want to do anything. Signed-off-by: Yazen Ghannam --- arch/x86/kernel/cpu/mcheck/mce.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index b58b778..6dde049 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -673,7 +673,6 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) { bool error_seen = false; struct mce m; - int severity; int i; this_cpu_inc(mce_poll_count); @@ -710,11 +709,7 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) mce_read_aux(&m, i); - severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); - - if (severity == MCE_DEFERRED_SEVERITY && mce_is_memory_error(&m)) - if (m.status & MCI_STATUS_ADDRV) - m.severity = severity; + m.severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); /* * Don't get the IP here because it's unlikely to -- 2.7.4