From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932494AbdCTU3S (ORCPT ); Mon, 20 Mar 2017 16:29:18 -0400 Received: from mail-by2nam03on0053.outbound.protection.outlook.com ([104.47.42.53]:64784 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932249AbdCTU2Z (ORCPT ); Mon, 20 Mar 2017 16:28:25 -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: CC: Yazen Ghannam , Tony Luck , Borislav Petkov , , Subject: [PATCH v2 3/4] x86/mce/AMD: Mark Deferred errors as Action Optional on SMCA systems Date: Mon, 20 Mar 2017 15:26:53 -0500 Message-ID: <1490041614-90057-4-git-send-email-Yazen.Ghannam@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490041614-90057-1-git-send-email-Yazen.Ghannam@amd.com> References: <1490041614-90057-1-git-send-email-Yazen.Ghannam@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR12CA0029.namprd12.prod.outlook.com (10.175.82.143) To MWHPR1201MB0142.namprd12.prod.outlook.com (10.174.98.145) X-MS-Office365-Filtering-Correlation-Id: c2975b71-42b7-4039-7138-08d46fcf7a41 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:MWHPR1201MB0142; X-Microsoft-Exchange-Diagnostics: 1;MWHPR1201MB0142;3:QG/CvnDGhcRja4BQS4Fb+udz+Ycavn+EIZopfekZwfq5Ykw659hqopV2BwJxcPaQKt1QodOHqw51Ok7VpPYgH/X9JcD5YKnWvbgccQOb6nrkepxdY0SOCG4qWMs2ziTodWz6BX1X4TwhtL/kfoAtgcquQt0ySySo4HpP/1SkwbcQY2JRN0Ft2JzY422aVk7TpQrmwY7l7rcXXGxqj/I4hRiQ5HedjrxnZNm6TKfZBNVqi8CAkvCF80geY/+7pH09ik5JcMcWfiYkUfQwb9XdOWMDjKkBnKAf+0lDDNk9KVk=;25:0Q8VY080xYs2PG4nyOBXSXJ+7MjTeeAGU49nLGghtVtidijsUhl0abCtrCAH8nyz1w5JzQxcg2CC2cyJGosFHQwLwR70Q0Gv/pDJ/qO6puGJYs50aNzYKXsTua09Co0rR7QV5TJxSCgWSv+dMzPBlE9mT4yd3YI9+jZMcLDKEeyRaZgA3j+T2Pdvq30bwK+k+EMLrbH8I1YISkXqtB+ZdK1XkaJ1Qwek5f4X7eSgFebTzwx5DNjJp9YvT8ndltNFJ5XM5RxyaiU0aOWxbxOvXO0esWh7lwbpKfz0eIQTf1cxIoD4RExA0JT8DHq7ImJPmplIS9EcW4rzPCBD3sHI3I2qfLfGYa0nlcoT5KkEtIdQh24SSEnuhPpAspnoh2zMBsHx0LEYO79BS4s78CHWoJ2MD6cd3SIoZFlEvGMvmyZ3PcbK29Us5PPvP5NZ89HhPjiSSAhV+Bbevs3VVXNOIA== X-Microsoft-Exchange-Diagnostics: 1;MWHPR1201MB0142;31:yvusX9wdLJvmS60Mw3iS8QHyxhFglqgFG9L7k6Q6WBZAEXpLz2FxpFq9eR5WvFc6sqPINkM9vpQQbPJuf0qElj1Dq1KfQ0WevLx4TnXkgRvJNJTabmzDxCCWICvXBNLxUKz3xUC3Rk4GdYUJWsw99WLJlVtoPjXLSfizJCHBK8UfUA0+Pu8TRQjstIbI4CE4meAprl/7eYYwtNf/W4nVyhEzlD8mWB9akOT7ejWb1/I=;20:K6PNdiz7n0ugPnmHSYB1bapfxanw0KTkh3BK2Akd7UNiy1W1jOalRmgpdVZu0pHoKygMnWg7Lcl8Krui5IR26zh8O7kwYI72EOe2wQagbsWDvCRUZeTmCVZ9KR1+kWKRPKgNIbE+uBxnu78RsIThTDz+HmM8d+baERRuJw14iPL73As7AHu8KXiPuWLeWObGftfPeu6ejaPAJ5suRMQQF2JW6rNY4dUoiOBaBSDWKVfzPF12KWBuSQ8vJvDnGYMRRzFIog2CfxmGgVS0vgsMJQLGt51RnjDNq7d4f6GNQ8yh3g0IB4UD849anHRBH9yg5pbP5d6eg5LowrmleS+uVTRxMMexa3XZ3etlDkqs31jfhG0iydUkG0oO2xshwAu8TFDsSlwPqiclXDzitKDdTcA7ahfG0neju0If4H6Ia543qEVU0iNIF75oBj4W9I32Ko8APmjgkVCQQGGeTEZdDi6Bz+J1U07SMP4iuQTdnYnCVbaE0qC4c70TzhYvSleM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(42068640409301); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123558025)(20161123562025)(20161123555025)(20161123564025)(6072148);SRVR:MWHPR1201MB0142;BCL:0;PCL:0;RULEID:;SRVR:MWHPR1201MB0142; X-Microsoft-Exchange-Diagnostics: 1;MWHPR1201MB0142;4:nrs6KkKppNwQQwlR3pcVCPsJtuiSTnITKeZb7LUBG/IW9hPGIFiazBrZeTq0ZROgdf1jlfOftua12LNNnZVggYEUnQ7pqAOXizSrULcws6Z6PV0nGG1db6hqwE5wFUV70+1NjMSA6mfE7bn6zaDq869cb9zzP6RZyzcL9I1YDC5edF2HloWGr5o1up4Td+1Hdt+HcpA2Kyc/zpV+MuhT03xhINfcpVScfmMt45gxtysGRK1PQufjIjYUUCjbmVy+xTDyunWReELMT/7wMQ/ETOR7F7owwog4efA3HpZ0RzSg7L+i9qZf5yTeiDUPphqXxZiydNCHzJopHGZdwLLeW2kBSUrCO3nBCds9NGzpkxLJWLpVYZmpykIH5BZf30A4MUp9tsFVmDvdGeepn1iokO9u8jLs36zyZEPSqAA8MA4jQCp2Paa17cShBNMtmrLDqBUeqj1EXcL6rNQtPfBDSakYNGHOpj7g0PKnxUmuVdohUi4UEuBDX4+IW8k8fZYBs9m5RFZwU+KFmeOMtk8ntzVV53ISdmIR1bqNfU0JfoYIdPAJJ1cepQmjbU6F0NbgS8sreO4QjP0XUv4pi9vkHVD7syucfY/y1cDaTymyjvuC1djXqvXcSeGwJUeiYETwK2O57bASklDKdiYFhJ8oGHuQnJGFMDdELD5AJ0E5KfGrg629iK/8Gr/c9FyxDGYT4lC4d4dcHslRbjVws2p4Dg== X-Forefront-PRVS: 02524402D6 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39850400002)(39410400002)(39860400002)(39840400002)(39450400003)(189998001)(53936002)(36756003)(81166006)(6306002)(54906002)(86362001)(38730400002)(5003940100001)(66066001)(7736002)(6916009)(25786008)(76176999)(2351001)(2906002)(50986999)(2950100002)(48376002)(4326008)(8676002)(966004)(305945005)(6486002)(47776003)(53416004)(5660300001)(6666003)(50226002)(3846002)(6116002)(50466002)(42186005)(110136004);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR1201MB0142;H:yaz-diesel.amd.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR1201MB0142;23:ktylKBmRB8+G2wQyWukc8YmX7PEHw3guYk597p+?= =?us-ascii?Q?Q6G9rswSZDQzUTHlNzykqmPZwTkOEPo6ioRg2bVrWTF7jlNxTK9pUzgeGY59?= =?us-ascii?Q?CwVVE7PHo9gJiTA/aXRgSlir4Pp1UMOhHmyY/k7kGhqZCxcj8kNbV2uswv1q?= =?us-ascii?Q?5pe37yBQgjzY23NYwgDsUjPoXuydyOZ3fz4oMcT9wdWAkr4FFrAH2jA8nfdt?= =?us-ascii?Q?ZvOw+17oNtWVqqj9iHYljnNOb4wiEVEp/+HvTxAUNOPwtMDmoNHKilxW5v+D?= =?us-ascii?Q?ip9pqz+wWH4Dr8U5sFizouhiwht+yDfdk1n9ZnGquEDzQGw0hoVgXcM3FGxi?= =?us-ascii?Q?puNMsjbvwujjtYBbn2v2XO7i/OVzt2BZ4Cmmxlyirc5dqv1qpH8aU/cc/eno?= =?us-ascii?Q?FD0KACObBypomELF69q5NkX7KZYQ+nGnPNzOmAw9794WzdnM8XqYwrlEcuCP?= =?us-ascii?Q?bxJSD3Ii1vWUrxJKRZx5/4f3i+phKOeJYiHxfWzRD0ITOKJYLoMUORi6MxUH?= =?us-ascii?Q?tpW6KHp42WyYMVED9SaU2H05lrsIF9tEn+rie07DST8EHaEut8QMtNpVjggE?= =?us-ascii?Q?16/fUoImxZWbibea563S7GuJeH3jcRpyxu0Vq6Kw5TVhdByUC9vtV67P5Ter?= =?us-ascii?Q?D6bEZtTSqmcmHAROLUzgD7+rpCHKP4SoUOwSf7DucIKPBsesAz6ynL6zofPr?= =?us-ascii?Q?qWwFlSBYrkdo9X3qpOqxp6xV37qsM2jwiehuidH0B+4VgiZiSOmZhGU4msZp?= =?us-ascii?Q?KIl/vpR7wz5xsFnMf9m0oju0SzUowqY3kKtd5wAIPFLdI4yGdunIvtS3y25H?= =?us-ascii?Q?XQPuIfCWkXJKfVN5H0RyH8zmyXk4gR8AgMb7K8YFH6i1ZsgoIKH+by8jFRXs?= =?us-ascii?Q?uvCb6pRF0SptYVAt9INU5Tb+g2m8msns4X8VJjtCZaIVDww7DRtqGS7zqBt1?= =?us-ascii?Q?IkV4z1aLdye5tpteGcV6kFkEk5MAg6Z/NqPVchd4iiXhwmXTmkpitYwKSOPb?= =?us-ascii?Q?87If+l0yJYJr0nuOF4LgofiuLiN5OfopBaSOx7ypN5wJ++g=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR1201MB0142;6:9edz14pUZzsNUSssQVPTIfFgmfZz8Ap4lew0ByMMyoiaaP9LS0Rs+GudBdBHTMK0h8y35d+dX1vjW+O1gQPqM2g7Yi//lQ/6ANMbKeQ3qeIZJ23E01oGK4e9K/hP77pjss3lABSM3gglJpWLb7zQiJ83wdgjWbw7DjXJ5UFh7QGR4K235yO9XEDDl414RGQ05+RiP5Yd6DC/rX3v4koMIF9UOtOI8abau+0U1YCL1W5vb0qJjjkvhlo4Ukql/blU+WMbOiSKAPNY+mA4NDaUy4ybtDPe5hWkXmP9tTfNYGj7ZrG1PEH6qJhAAiL9kPj0A5AUyQK0o3dJLWMvWpcTcoGaTxeGK0ugr1nylN3yG93fyPvn6dBpb+3rXVJzjzqRGrnQ2vit7x58KdPKrLF7dvoNy3W9ck9P4UqSKFt6aRg=;5:pgRfJK9++bUlm8UbkqwG+pIiSD23vrFlGgDVaaM/OtJAL/kVjdQBJkYH4aZlPky4FMNOXvaI5Ru/uQ9o1MReLyZC64ZPdZx/hVLaZ0fzzcTiL93QlGlSN7FbM+6t8Ys5joYagy+lV5afjDucoND9yw==;24:dBGHXEV7t8TmoqiEZq5jpl6jY4pQfPwT3F9yg0RCIet+U4a4HFHk3M61trVkDO175tgO6webj72C1ku1BBbFoNPwzP1XLsVL8uhFwaNCA+g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR1201MB0142;7:9fhdnok5ogYbO3e3vVThE3MnohdsAm2jL8C6OmmlWg3+/3dlzQY2iJ2zMrBqT3/pRn3uNPxCHBz6LYTHiU7toHyIn4accK4LmkjtqbYB/rK8UlM61+uLrlxke+BFJw6aa9kEc+i6nS27krpxcc5xkGnQSsWb28gTAHa6KO7ujPjbwVThGxWu86mSUc+Usf1EQ7k89Z1SHSyulQTcpQ1ErGCrJ8PuhbEumsqDD+6VJCtJx6WgtFvEzLOe1MsyY8yCcfecSL60NXqY/k0hMkFWESfM9oTy39gXg/O6c3oS0COq+j8yLn4+MtMly6VjCpDZ+FdCJuaVOaj7bTCyU1DEug==;20:M81ZXcZADzTa8ihTZBU0NvZNyd39zOu4THtfXDwpCVJG5IgfvnPi1UMASs/+cjZiPuL9g4Lt+/8HO4gq33EfuNzqbDZ6OUFDc+BdIUngkVVn7wiucaIJBncFk0UqSlUKfFwX9mk95U8NkpqKYA+s5sdfFiTkeVKLObXCBzwRB7FQGJ1T5ZpAPpnMTHs3sCCEY74wxUZJhjR9JBIZ6P0rgKgKcuVqE9P2l6/fdkDeoJpo5gSLeCU8/lgqBoHjjkrZ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2017 20:27:06.1451 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0142 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yazen Ghannam Give Deferred errors an Action Optional severity on SMCA systems so that the SRAO notifier block can potentially handle them. Signed-off-by: Yazen Ghannam --- Link: http://lkml.kernel.org/r/1486760120-60944-3-git-send-email-Yazen.Ghannam@amd.com v1->v2: - New in v2. Based on v1 patch 3. - Use mce_severity() in AMD interrupt handlers. - Set proper severity so we can use notifier chain instead of calling memory_failure() directly. arch/x86/kernel/cpu/mcheck/mce-severity.c | 6 +++++- arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c index 87cc9ab..2773c85 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -278,8 +278,12 @@ static int mce_severity_amd(struct mce *m, int tolerant, char **msg, bool is_exc * deferred error: poll handler catches these and adds to mce_ring so * memory-failure can take recovery actions. */ - if (m->status & MCI_STATUS_DEFERRED) + if (m->status & MCI_STATUS_DEFERRED) { + if (mce_flags.smca) + return MCE_AO_SEVERITY; + return MCE_DEFERRED_SEVERITY; + } /* * corrected error: poll handler catches these and passes responsibility diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 10fddcc..743ae31 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -28,6 +28,8 @@ #include #include +#include "mce-internal.h" + #define NR_BLOCKS 5 #define THRESHOLD_MAX 0xFFF #define INT_TYPE_APIC 0x00020000 @@ -802,6 +804,8 @@ __log_error(unsigned int bank, bool deferred_err, bool threshold_err, u64 misc) m.bank = bank; m.tsc = rdtsc(); + m.severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); + if (threshold_err) m.misc = misc; -- 2.7.4