From patchwork Wed Sep 15 23:27:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smita Koralahalli X-Patchwork-Id: 12497855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BE87C433EF for ; Wed, 15 Sep 2021 23:28:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 723EF610D1 for ; Wed, 15 Sep 2021 23:28:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232908AbhIOX3l (ORCPT ); Wed, 15 Sep 2021 19:29:41 -0400 Received: from mail-bn8nam11on2052.outbound.protection.outlook.com ([40.107.236.52]:25184 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232907AbhIOX3k (ORCPT ); Wed, 15 Sep 2021 19:29:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCYrOvCvIGYUKfEtI36SuCzUo0P1b3kphMDLtzYnygK2nSC05OCnAs5aghD7UnY4w7/ErTHqZcM+iZBsHuaWO5mV23cvo7ucwxSAbcnPxtsI9sjRuadyHOZW5xBirKjPAqauyh8SrUow7QjPuOdKKLJQYyNxDDY4raXmZPTDQax/fur5ab3QxZMt/Hp59Ut4MqFWbi/PJ4TX3ScGT7QQEdzPq+q1id8UNTRcWf7mV0FM0PeczM2d1zvtj1rQizPL6oXkC9VbvhEvtdNlMkudYnWwVGf6tcSZWb7UszFEcSzsZK27lo1ocbo/z5iqDFpUX/lcMeLaFpRpPAXDh/sVkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=gn+BIZo+3kEW8pu3p230VpLuWV6WOqfuW10ESJQ7pHM=; b=alYxazTodL04yHs9RZRIsvHuTc8zAmZcXp2SAD9ibS1oIiZ9ZwqqVqME2U3rCO+Crtd6EFxms1vtMa/876PFmLUM0jF7G8dJMpvxHc7Zm1To9OvG1vmDZVICcmjSHgZxixBKeJWZxren88u7cOe83q94CAPtPnE3xfs+sBx3KeeV5xihrnvK+6tog5qxUQeCfGOfafDU5vdyr82qkA506VYsdI9ZjMpt3wj+rP4RLpAXuxxaZwFJ8CSh9MVY7T0V1cyzFbzFz2lgNqpLsrQf7GR0DlVU36+P73FFxNWUjkH1WGQS/SnLhudNrp0KPK5PJHpEzE/GUy8QirSBJl5SnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gn+BIZo+3kEW8pu3p230VpLuWV6WOqfuW10ESJQ7pHM=; b=i8iLuT9+UqGcL7fVbucBD+iQMzpDF5GT01yOaHv2j6R4U0aYGzi4zfWrJFdYtMqb7gKb5Lx9oZ7Yjs3SZf0kTWa2E0DJMTmjfB8kP4cqRhiqwu6iW8wWIDz0T3pMQVt0wHyf/YjXB5CsZMLTWtc/xbxTuSSjL+t6VmRH94i5QnY= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 23:28:17 +0000 Received: from SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c]) by SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c%7]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 23:28:17 +0000 From: Smita Koralahalli To: x86@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , "H . Peter Anvin" , yazen.ghannam@amd.com, Smita.KoralahalliChannabasappa@amd.com Subject: [PATCH 1/5] x86/mce/inject: Check if a bank is unpopulated before error simulation Date: Wed, 15 Sep 2021 18:27:35 -0500 Message-Id: <20210915232739.6367-2-Smita.KoralahalliChannabasappa@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> References: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> X-ClientProxiedBy: BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) MIME-Version: 1.0 Received: from ethanolx50f7host.amd.com (165.204.184.1) by BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 23:28:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5611271a-6417-43ab-9b6e-08d978a07f46 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-LD-Processed: 3dd8961f-e488-4e60-8e11-a82d994e183d,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +afVXCbq4ULznatxIk/4JmQkv9y8MACQZa1CevxAXUhE7Q2AQmWg/P2T5YTObrmWq5FSFVxqAsA7XEguJ0uJADbl92R36e3F+XjCVp3JbfKeOUZwzDHsWT/NvTdZ863HXK4a05ORVkYr+dMQURZ2+xUDI1AYk+0lcXZqSHS9a27nxh+q0rtscBEhmGV4xWLiLsWOM0qwH+BhVXtukwH8K3q+j6U6+fbz1XuF2IDZM59lPIbmo5iqVoOVLgFezqHTsbEshWvXHhywbIM+dYb//gRpDY10jy71g2Hrh3KcdQPLVfw5ozLxEQW49gDSpa/4hdScQzjVuFK63cO39yJ2Y2sgxaeAy/YsE7huc3TA9DV4l3xo453PenKvunijgtfbRZVR8oAYzL3lQ03fe58tMv1AyPT4Y3MFyMbamjL2sXFnyhqOqTXzGjAnA3pO3OLP7MkP++7+kyOv8RTkZ3IQrzREraz47N/I67sdSyZb/nNwVPgCB0XuPPnTxJoWue9pjxDQjPdf4wX6a8ObfjXp+J/zKIzXk155tz+ndGjRjKktpNT+aUGUHCdyGGtUqMBtFXbKTVQvA3K6TuYS91Srt7x/G04EQPJAIP/y3UOoCJ7HM84yOWFscnp7SQvOI+er0XxfZ+S/Blg7DC0O5QHn/S+MOAV7A6uY8s+kT5r/wMj99KxFjhzox7Zl9rJMq5r6YsNxqeWEK+bFmDwypSpssg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2685.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(86362001)(956004)(2616005)(66946007)(4326008)(66476007)(83380400001)(26005)(478600001)(8676002)(2906002)(186003)(1076003)(7696005)(52116002)(36756003)(5660300002)(54906003)(38100700002)(316002)(15650500001)(8936002)(38350700002)(6666004)(6486002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RL6V4hveLoTkPn0tzjIJ47wCVxxLPd+BZmAA6Ub4RS22TUk+TF+3LpFKAgnAq9MFhwsGjHulxAYHXK5hsb2mLpIFnLv5j8B4hXyWy3hXuhrN7sZG65RWHfcg0p18PzLmd44O9xbNquuGwjF/1JmsSdMgbLnmoUCGnq7wzoVIXwVitrOxoxlJdspUDgMEMSCtkN0WmdnXlmgQNo25XN/9j+qD7CmLsm7qCFoxKQoSwfuDVLJz4BpEyXzK3hbI4UZHO6HZ3WoWEErr1v65cIeQpYoGoQ9zbDxNMav8Hl1MkWl7XGq33zkjRu1mgULldtngG6X0uJ5GopCel4zJ6o1L6GYGwkbdtGFHkHn7t7Bij8KNtyxxydGT9R76/8zFdM6lE1YYpkB2aAmQqemphyBETUbZqdnwSUa0XTE69pUTFZY5Q+/jJmbIcuAJbkGtmeqMKD47sDv0qnoIYJ8RiBn0OhxLWXjrA3oojpwrcAdwO7Xtl9s2rXIVje8DFknRCdSaXPwpJlXzbXFg/ZGEjkz5rmPGvIqh17L9KNqCGsLjBqlwGyCNwtOpFBAyaMGalOz9UFHX7STB7ai56fuyXjWrQrIrydRgQD/iy6afOtkWb6Pia8gKGenO1DxDvaP1eiszudM0RYka6s5BTbjgtp4Dn98j3dbAr433N1fDx9l1Cjr6GJNHEexlw/XUe6jGXo50H7auJcju+K24mQ0Ek4hcSmTgoLFYrQEKxJ08HDj5ueABEIO5qajebCwX3yLULmsRrwcOc9KYRJZiqX8Qd6pXgeQW4jCu8niq6DhTtYRbMVR/juTTDVLfJqSh5wKWhiWKvtjG9BGVRsfZt1Kwc0MLh9EX+0D26tkRXQ9VzftOVnr6sWAuFdohGfNERrU7eh33pLDmUEugBQXNOgvvNFCATHTOXflGyRX/0gJR2msHImdF7tFvoD4ronj28XtXKhHgWB8O+iJGtDe67crHXKe1VzpAiIu9E5WylAvfHsns16tr7fd5EnuTHnmFWA7YhOlS1mLZZM0eXToPAwZ9J/zOgHNXhktYsATBP6zjIY5sBfTkdZvM/UKWCWeOwgF0EicueQ1MCq8+tAqPhpGYc4oJVxCDxnNe4HUMab7bbTG26n/xoyhxqdKBwvkHXWEWVuYsF4MRmfF6+atjJwM6yfmKkbK2fobUtGxbkvI9MTI98MOBZbiCe4B/1QsWYXnLduwLZCOpmk0ArrIVhMFgVhA6SLf7YvGKh7sRHCjByU0znvLLnONCQSb6MjRnJdsp0xTlnHo744C1zi8F+ZO4G+rg+vKrQLezPIf4cymxOto+diIiQLyqdbIx8s1MZ5QSyk/G X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5611271a-6417-43ab-9b6e-08d978a07f46 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 23:28:17.6958 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BRKAVWvgBa/nI/FY6S43du3WcQBGUqnT9fEbEIRx5CehXnCHlFqSedAdNk9jF0343Y8atn0kTpzkQ38r1RbpTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org The MCA_IPID register uniquely identifies a bank's type on Scalable MCA (SMCA) systems. When an MCA bank is not populated, the MCA_IPID register will read as zero and writes to it will be ignored. Check the value of this register before trying to simulate the error. Signed-off-by: Smita Koralahalli --- arch/x86/kernel/cpu/mce/inject.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index 0bfc14041bbb..51ac575c4605 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -577,6 +577,24 @@ static int inj_bank_set(void *data, u64 val) } m->bank = val; + + /* Read IPID value to determine if a bank is unpopulated on the target + * CPU. + */ + if (boot_cpu_has(X86_FEATURE_SMCA)) { + + /* Check for user provided IPID value. */ + if (!m->ipid) { + rdmsrl_on_cpu(m->extcpu, MSR_AMD64_SMCA_MCx_IPID(val), + &m->ipid); + if (!m->ipid) { + pr_err("Error simulation not possible: Bank %llu unpopulated\n", + val); + return -ENODEV; + } + } + } + do_inject(); /* Reset injection struct */ From patchwork Wed Sep 15 23:27:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smita Koralahalli X-Patchwork-Id: 12497857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4145EC433FE for ; Wed, 15 Sep 2021 23:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 278F861130 for ; Wed, 15 Sep 2021 23:28:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232940AbhIOX3m (ORCPT ); Wed, 15 Sep 2021 19:29:42 -0400 Received: from mail-bn8nam11on2052.outbound.protection.outlook.com ([40.107.236.52]:25184 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232910AbhIOX3l (ORCPT ); Wed, 15 Sep 2021 19:29:41 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SeRinztX+iD/Gj9bGgEpasfaJkOVCiai0PkMF3QtjiXfy2CYOA9sA8MUVFrmXdk/zokFDfqLALfYvA8Pf0R2ZfS/njdHFlSr9hxkbi2I51RH22cRMeqEogvoPBndAXQuQqNnodzlVpNeE7Ty/N/criFPoq3F+G1tnCNyW0MhKnZUQubd8PQrQcV3K28UvoeZMJGQGCHTMCgxJRRWyE1LGEiiD3dnI8gCdLe0SUBfmBNebdERetQ5ZniO21DhK+rl9hmQ09QzUMbMQPT1r9eEP2+Rn2p1LKK1KpUcTtcMTccZaU/FHyLLHUnk1nE8HtDrp3EiADyfzMK3pSP+j4NX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kQ3W9/z+MRGSJTP+GR3VjXdHkZH+E5wIDnUaIslCNqI=; b=l0dhKTDBO6s5INLNw5O0W3VoGkg2QCg3qQTLQYH3luyjU8amfyQdTCdxW8FJ88K9AFPiHFE5vuLOf84UxcRElpwxAGeJt/IK8n6GfN0iIYRkiLdPvk4b2NgM2uc1/Y4I3jF7VULAmzrhWEoxDxbAQjVuYW7ln3YJZ8S0rlaLRtN7nxB16llawoQHotXIIPgF+1blJITPOnniXE3P90s0GTtI46+BH7yBus6QF9cPrX9fv7E4sfPE7UmzjzEbWm4kRYx7KC+8nV9ry+MEqO/BX645WsnCmnHLvkxI1wh4wcj16DdPVoNYgSEKmTQiuFrIinxJ4vjSzGY+bVz1gCCdJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kQ3W9/z+MRGSJTP+GR3VjXdHkZH+E5wIDnUaIslCNqI=; b=vfhfdtcdyBqGsjB83JZi+hDlYzuYfOMrxWpEwuJjo87eKw5L9E+ssC8sZkGCeszNfEvrRZJI3SOHznkFlasHYtTvhMFEyFr9SwKA+mIlgRcQkQZUyCBIPybBsxevEzsXJMpOQma+IfEXAe8HV6eJjPrQ/HSxnX6CiyS9kBf777Q= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 23:28:20 +0000 Received: from SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c]) by SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c%7]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 23:28:20 +0000 From: Smita Koralahalli To: x86@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , "H . Peter Anvin" , yazen.ghannam@amd.com, Smita.KoralahalliChannabasappa@amd.com Subject: [PATCH 2/5] x86/mce/inject: Set the valid bit in MCA_STATUS before error injection Date: Wed, 15 Sep 2021 18:27:36 -0500 Message-Id: <20210915232739.6367-3-Smita.KoralahalliChannabasappa@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> References: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> X-ClientProxiedBy: BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) MIME-Version: 1.0 Received: from ethanolx50f7host.amd.com (165.204.184.1) by BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 23:28:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fc128f2-ad97-4c63-9ea0-08d978a080c4 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-LD-Processed: 3dd8961f-e488-4e60-8e11-a82d994e183d,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QTBXOiXOLLyAra8D0X9wwjXE89ryvLFkh8eYg8mm4VxYcznhFseVRhp9ymsWEmseQ16vjfe7gPbjs5bw0dQ06fhWVCKIiVGxdr5phnmiLLUj6cdwlwSvrwJRaO0Gkp4Y2QtPdesFLspYKhPl6j/ZeWjoqzzK0UFYSBYvUjy+YEXb6abX5akBo42r9OMLyboe+42J9ytSbpK/DAK1u4iFvUbx0+hpR4VqqXRQL7cNnxuuVbXI9C0BR8iF3qXjxrci+0r806W4T1qnnaA9pEEdMh+FL71YnfNKI5ZGbhWcoG8xlgpMPKz78McUDwrWZlUc2yWMqUj3L26tPVQyvaAAPb4YYdvIyuyqvvFlHr6K2EmKnTi8c/035n8wB2cC67YFij5o7W5yMsUYBJcRWT+26fANqv/ysbGKZysBuSeqBaRie9yNyiTTtctb1ClBXB+bj5hrBQzBXkslJsjbRZbCPucQCEjsGd/cgaiIW4Y475tExhcEEMijjpC9F+FO52niJbxI8n/XGUKau0R3CoeL2i+r0oAxRoBXfziTUC/90ty2YdP70h2eKWvYGSjKiZku/8kYa7eH8RszKHNyzH84B5uFksUHx/myy+L14p+8G9d4tbnGlLx9+yPdfyaldpOWf1wCR41IXEc9U1LOtsnvoK1O2w7m4rhd7Juy6kxLnwYSemL5YpRtdoEr5h8LGAlMt3ezqr+je5QxQAd7XZ7iYA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2685.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(86362001)(956004)(2616005)(66946007)(4326008)(66476007)(83380400001)(26005)(478600001)(8676002)(2906002)(186003)(1076003)(7696005)(52116002)(4744005)(36756003)(5660300002)(54906003)(38100700002)(316002)(8936002)(38350700002)(6666004)(6486002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3F5FJZmur6uKf0nsfRyHf6Xnrqmzr6YLKZuN2MO4s5lRjfygordMon7X8CU0vEyBxgUU6+HohLOpxCh89CntG+5iuf6ppJsRRa+xWhuaJbBw9teVT2h2NZvz1Tcx2PM04sDWFIR/7PllE8c6Vpl2Jvz1dpCJ3dGACoir3J7zESIp+YLWCuk73nZNV9rqNyYPUUXnxCTArstOIwL/V352nIRFEx/+u25Ny7V+tWbvILoWMYh8DHqwONhPkCTOz5WL00H/9VWzmJphk3kW4syptbgsro18EcRkqjnHAIv1L1xzblFmIH+lKhRBEPrWp6h58bmYpk73QY6N8AFke+gU42Qsyb5L8ff1O9qH+7x+aw67ABitTW27TdRgcWh58R0pjtivGnQeGMfm1v/GW+gyLrLL57/pPIJvx++ZLP6Dqc0i0ktHgN4Oe2hAO7xAs/rPIK/yNvhwIWl1WnGM4lnFBo6vo/98hma8mfsTofLGbDt9o/+9jhGnphqdVT9I58fs72N7RO3Qk5P8YiYwL4J3BLTuZ5M2fWv96F+H8R4eRfSqo2vkJrNuhDRjBEEBxYmPtnKQvPnWipJrN1J5zObtsNxEz+ZHzjJBvkA+qEm58Lt7530y9c95CvQ5bKe4SBvzcm+I38vcHdL8EM+M0n1nRRdR/GcrmOiHxpcpkRddys3h69lpgguXyYgoBVohgDPM5qIdvjvGPXN5Iu558VLhJ8Iq1Ho0Vk6916d3eg168xm6gSrRUZ9gyw+H1l0+5BDeyNXo7BStSKdWGpv+Ltu439u/Ub8ix9v+raNUVrjUf2h9U3N+lRS9it6XbplDNuNq5gtbI6AlDAxRubxjQy3JlnbalUkhPxC0K5J4x3nUQhqjf0d8XvUk33ppXgJ/mNpRhJb6m4YjkxeIS9/4bnsCS2TnL/YvJ7jQqBgu+ZIZBzrT5nwDfYqo+8JJNdhptsOwIuiI8BS2LlcvhDSYMlmWBVSUmCZpWg8EU2o+oOZ+1WdKUSH8ZMH8oRe7xoR15pM9E3tfqPqBqJK14+0mf+loYAhkib8JdR+yuB9Lq+YDOLSfcDPGynnElpRKMAsN684NuI8Ez5lGcQ1RoVj+duCSn5Zw0pQRP+n3c/MmN4E+pCFUXpR1CLiagcztWlaRcIWh/LtBWSVnf8JumqgixwdSA003sXJIi3Ki1CQGAoNPUofT7JtmpZwcs0NPggtTkTK0dmi3v/AAgM1XVs1c4T0bosonPIG3xpQogqjaCWitdJpM+IMz7NgutlP6fX2Xa6H1r1SxxSpCJXLHupD5gojPaON95S4F4Vx/RGjzcCTrwkmHBlgwAlAR7uJCVWJL1tG7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fc128f2-ad97-4c63-9ea0-08d978a080c4 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 23:28:20.2154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1kTlXQSxW/XjqA/szkbw0PsVmF6Y0BJv+JickdNe71sHnpFcoB+m1VMFc4XzBqS1TxGLEAfHksuitWrl/w5NPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org MCA handlers check the valid bit in each status register (MCA_STATUS[Val]) and examine the remainder of the status register only if the valid bit is set. Set the valid bit in the corresponding MCA_STATUS register if the user forgets to set it while doing error simulation. Signed-off-by: Smita Koralahalli --- arch/x86/kernel/cpu/mce/inject.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index 51ac575c4605..8de709b049fc 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -490,6 +490,8 @@ static void do_inject(void) i_mce.tsc = rdtsc_ordered(); + i_mce.status |= MCI_STATUS_VAL; + if (i_mce.misc) i_mce.status |= MCI_STATUS_MISCV; From patchwork Wed Sep 15 23:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smita Koralahalli X-Patchwork-Id: 12497859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 473E8C433EF for ; Wed, 15 Sep 2021 23:28:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29EF861130 for ; Wed, 15 Sep 2021 23:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232975AbhIOX3q (ORCPT ); Wed, 15 Sep 2021 19:29:46 -0400 Received: from mail-dm6nam10on2056.outbound.protection.outlook.com ([40.107.93.56]:60466 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232910AbhIOX3p (ORCPT ); Wed, 15 Sep 2021 19:29:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QAroH0ReaTH+uUMb05q62b6Ez3L2ZXzIZR4vTWNDvr7RNmoOxUC4Ox5dLTwoPDyEVRdIIRZvmIaRrhgTJNokfJz5BDp1ihrTdFw6UAuP7TyofIBdmO/itlV+eJJfTmFWKaMaIZYlTwGZMmPZK834NzK4iXj9+DRzQ+bNBXtNrFW317IiSFaZiLbHfbOqtVeYfJDIzPy2sWqmlMjgd2TelNJSzxHi7dWcaT6AaroqZtHDSGi+X2O752Ge7k+PLAg7xH5yE2z3/cKhNRwe9oDf/1kpNKgnbLM0CREaaWkvi5HD7sijd7SQvW1OooP9VP51jBFRIg+c2Q2D5mE7cHgS/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7/pidV71yr/nXhcHwctfP4pNH/VvlsDf+YCfkJUVzX0=; b=KubdaDIf7SV4KqCKhyL1Skb0wRgW5/fWoQK6TeiV91b8fomAiFaz7vLXAxzQBqECwQ2xhUOfK3g3d/J6k+4R4M2zUFIPgxpNZZAKtP+hUJko7MMMQTtlF3IT4qHR4IUwczQa97L9JTUVY9TtoB2KgJOKTFuhCtLBttBvlyhxBj+1sqdiXQ8T04jmiTYlYO6P+6liqRsDMuKuKtRLz1Q3L68jT54DSAZWFS3bN/B1zDJC5CDlngOTEdbFCG+48q6l/dBCNZhw9EfA5oMRUGjrmOB/74zZU9dUIoeTqMCe6gV9isOLR+Vzg2tosEb6xOEf8Laj4d//ZCu1D0U2j6Kknw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7/pidV71yr/nXhcHwctfP4pNH/VvlsDf+YCfkJUVzX0=; b=F+TzJ4RZnJD+KnnayQ8SRLLQqobGiq5GiIleyc6Ez6R1dmafoB2oAv48cy5bx3dcT1GwWoeIoSlPlTz9u+dOgXqWF7Q65xAEuuspkhEJTdmsCIFTJCYIrcqet+VCMe8L363OXm5kz+99ivtzw6l55y1M8cgw/xh4e0eTBXpFncs= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 23:28:22 +0000 Received: from SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c]) by SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c%7]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 23:28:22 +0000 From: Smita Koralahalli To: x86@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , "H . Peter Anvin" , yazen.ghannam@amd.com, Smita.KoralahalliChannabasappa@amd.com Subject: [PATCH 3/5] x86/mce: Use msr_ops in prepare_msrs() Date: Wed, 15 Sep 2021 18:27:37 -0500 Message-Id: <20210915232739.6367-4-Smita.KoralahalliChannabasappa@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> References: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> X-ClientProxiedBy: BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) MIME-Version: 1.0 Received: from ethanolx50f7host.amd.com (165.204.184.1) by BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 23:28:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba6dce37-26c7-4b0c-b78a-08d978a08241 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-LD-Processed: 3dd8961f-e488-4e60-8e11-a82d994e183d,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FYp/atfsfOqfb3NvKUNvcFs33jc6Vor938LmXCy4wCGA0cTixBs6bFRFDmJf6MZbYZ0hHzud8kq4yhgS6b/sR8UCSB5EaoAMuAfJTfQEmE9p5TuBNDyTu7SgJhyF+aVJ1ODCePLLnVXXDase8kNmIwolr6rBsjf/8rNvSucunaAWSg4Y+/X2PdvulqWHT/UWMl4UEHjNsm2dbE+7sohOoJ2mbct1c06CX4ZfFYK1nJ8nwawheAsHd8wclkN3u+/lpwyQkPtWJAqkPPTAbMcYNT/ICibMjH6gXSf+iG6GJjpqrXw+k0C88acWfnBaGpunRtyhOW6NqjWVR/lwm7gF7sTiek5gR1ZyrAkQlCD/3zCi40n7KIOKSFww8A94Uv49EkMnukbJUN8O9CRHFF9cw3+mpkgI2JW8zxP8yvNfgLdENvVFaiaOzaVQe97RgCn4IHWV4ZQfcdHXqyMwYxYqvMIGGE1QX5UC0WF/eFt6440veOW/HclSdYSVbjLY59/VcuL12gXUbtyBgxWuzOl6ip4RA4M/rnKu72y15iNTDfsPE90KFPR+SvD6YAs5UOaijHXKFVZpbMH3deS1mKOnfqeL6n+uWZDWcMlgeF4H2di+/cI9ck5KEziKS9aURIA/p4pmywTwsSz7CFn8d0XU5pnIkZsqAEPn7jirMMoYCJNVaapFiPLVuVV4apaC/zmOpOgJvvjDGaKWqOEUHm2KNg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2685.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(86362001)(956004)(2616005)(66946007)(4326008)(66476007)(83380400001)(26005)(478600001)(8676002)(2906002)(186003)(1076003)(7696005)(52116002)(36756003)(5660300002)(54906003)(38100700002)(316002)(8936002)(38350700002)(6666004)(6486002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mxCnPdDMwZICjHGUBcrVMxLYHztvAAVgpql0j6RZj0fTjTC6WrrspV9mYcRBwRQdiwAAklE23BE/jWOS37oPN7RCJqzwfdzfg/v3VGE207mxqtz5j32N8HYE/6MxuR7I7g78DKAAuxIuPgW3e68misvze7Zt+CMEPp/D/8kKuBfExwgp+aZ/f5yyXe1Scd1DKTs9VJ6BSq0ipoww0Cx7datjunvALM7Q3zASBjRXmM2+WTQwxf75Z3/tQyRKCh6odFn6n+DZjksP5ZdfujoI1W89/CY7cyZMpUuFBvWpbQmhX40Rr/7PsIRC+zPYvLeghphSrVqZw0g4hafXtSAQXJnP7rOcuxCowFb6Hpi70xtfawA0dwoqUWYonk2OrRwXi8AgvkQlgwhb0VvufaTMxYAzsljKlftWUgl2KJVHU24j+bFaLZnka68En8XYZ3erf4cZChiVEV5Ohq/MuDbaUefWzXaYZvBNUzU/skD1XX7cyaBSMdCNYKhAv2qkC92UJl0yy5fgJlDZeUB2oT++Zi6aP/z3ku8tPwWy/2diBvYS4gLWDbLekR4+gh0wkkTxWWN0/2vJp+zXT3D7bj3gX87Iafhb3Qp798vBRWMIYDp+0qd2j7JlVS7FqabzS4ONdAiTKklhHLcn8szj17w4ROaFDqkhonS8H9G37iWNoqjpKkSQR1eK+RV5pDs3A2/V6Lw48W8eXTimdMptJWiYKOlPaiyHIAA0upiFsEgOlQpQJZpsFqtdFzKD5xosi95DqInavoU9TQsm827GdUUoy1Fy7q4LqVVHqYLaY+DjQtugJIeHpkhxSxnsS1IFdq3FXY1tU/OROOrmdBm8G7EVMgcqt+QoWgh+oJOhhfx4F0fjkQQ+jCjWItibO6rEjmlCXvVOkpFqjEaZJz9rzhNZs88tGz2dr1H0+61PMwLgjX/GIX0Ipfr08MBWp1r/wurw70UQwgFzGmLXyzO/qv8fbKxb1w2l4opAedBHUEQ8lzg0qJHgTHF1VOPeJcdfBZZy2pqNEueWfwAqsFlAN1H8ZqKooIJrilGDG4Fv6nEJZaoJnW8z7/183aZhHSwm9R63viASOH4zV46nckg9c3J55OrgzWQynqij3SivyqPmc26sy6zJTY13MoBbZ4SGtTXgyCedZv8iFdWJF30m19WJDs9w94xIgUqxaPTdLPxtE/PpdqMvvJP/ecZ9TVKtLZqs7iI8CD7PgrDhSl82CKBFOeYoKnatvFxjODFOrGN9eMROkAFoJrvwbpPIsmt2T92u+FGSnCyfLUbVePBlUseeWGkOk2NZDVMb++ppSB6sfqi5JnZeC2v+UgqGSulEPIhw X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba6dce37-26c7-4b0c-b78a-08d978a08241 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 23:28:22.6390 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zhMFDKTvo1Plpp7msYzYysIJvJW4/JrPZ1x/D+vYcyocqQjO0edZxraN0xXBHwVZZBW7Jm9C8K1ERzOZzwFdJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Replace MCx_{STATUS, ADDR, MISC} macros with msr_ops. Also, restructure the code to avoid multiple initializations for MCA registers. SMCA machines define a different set of MSRs for MCA registers and msr_ops initializes appropriate MSRs for SMCA and legacy processors. Initialize MCA_MISC and MCA_SYND registers at the end after initializing MCx_{STATUS, DESTAT} which is further explained in the next patch. Make msr_ops exportable in order to be accessible from mce-inject module. Signed-off-by: Smita Koralahalli --- arch/x86/kernel/cpu/mce/core.c | 1 + arch/x86/kernel/cpu/mce/inject.c | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 193204aee880..9af910acb930 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -222,6 +222,7 @@ struct mca_msr_regs msr_ops = { .addr = addr_reg, .misc = misc_reg }; +EXPORT_SYMBOL_GPL(msr_ops); static void __print_mce(struct mce *m) { diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index 8de709b049fc..8af4c9845f96 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -464,22 +464,21 @@ static void prepare_msrs(void *info) wrmsrl(MSR_IA32_MCG_STATUS, m.mcgstatus); - if (boot_cpu_has(X86_FEATURE_SMCA)) { - if (m.inject_flags == DFR_INT_INJ) { - wrmsrl(MSR_AMD64_SMCA_MCx_DESTAT(b), m.status); - wrmsrl(MSR_AMD64_SMCA_MCx_DEADDR(b), m.addr); - } else { - wrmsrl(MSR_AMD64_SMCA_MCx_STATUS(b), m.status); - wrmsrl(MSR_AMD64_SMCA_MCx_ADDR(b), m.addr); - } + if (boot_cpu_has(X86_FEATURE_SMCA) && + m.inject_flags == DFR_INT_INJ) { + wrmsrl(MSR_AMD64_SMCA_MCx_DESTAT(b), m.status); + wrmsrl(MSR_AMD64_SMCA_MCx_DEADDR(b), m.addr); + goto out; + } + + wrmsrl(msr_ops.status(b), m.status); + wrmsrl(msr_ops.addr(b), m.addr); - wrmsrl(MSR_AMD64_SMCA_MCx_MISC(b), m.misc); +out: + wrmsrl(msr_ops.misc(b), m.misc); + + if (boot_cpu_has(X86_FEATURE_SMCA)) wrmsrl(MSR_AMD64_SMCA_MCx_SYND(b), m.synd); - } else { - wrmsrl(MSR_IA32_MCx_STATUS(b), m.status); - wrmsrl(MSR_IA32_MCx_ADDR(b), m.addr); - wrmsrl(MSR_IA32_MCx_MISC(b), m.misc); - } } static void do_inject(void) From patchwork Wed Sep 15 23:27:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smita Koralahalli X-Patchwork-Id: 12497861 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76332C433F5 for ; Wed, 15 Sep 2021 23:28:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E06260E9B for ; Wed, 15 Sep 2021 23:28:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232934AbhIOX3t (ORCPT ); Wed, 15 Sep 2021 19:29:49 -0400 Received: from mail-dm6nam10on2056.outbound.protection.outlook.com ([40.107.93.56]:60466 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233034AbhIOX3r (ORCPT ); Wed, 15 Sep 2021 19:29:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FMk/jzAvRF75qEIxzKFKZDL1mAarmGqQ4YbEtG2ypP6lPIdOihF9caKyjjWN6+u+WU7P8oJ0lZuSN2/ngrJc8Ctdzsu3AbkAtJXGwdFCC5YfGgf6Wzj98eAOUWVQb6L3vFBPmRD3BMcM7ElTOX9m75Ynu51GbsrQnhEHKTSLOyyccI2W5eDvkwSi56IM1C2i5VXkvbAhNPH1b92H4G8qCktnYiEXgK1O74Ek/Dn51lgMGBrJPISgxQm0Xqc5eQ6Q1Pm7jSxWyLzJBZHzU0ngJxlw2WSFtq3hRqe7Lmww6EZuJzyD9w3zUt52cvtxbndEBKDHxfmts4l2Lv0bHy2mqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=XmQHWHKq7INKWatnFo5aw2hxeXO7ZzfpLq+0CTgZH2E=; b=S6hTX+JPMj+6g3bgz6jtEftzlLQFCxzJngSX5XqwKUgJeFj3O//u2WSkQzhD5milZ9jPvHs+EKGTH8FQXhyvXNs+kcZN3/QS0R6GM7KvMit26LQZSMTh/XV4L8PlZdiXHldhd3ZtGz+lM+EU4drqXDuJWIV7WdwqGPJS1o0sYGDNyLQcMLyTOIvv2V9cmVK8m8s+exvmxchVyJYjj6aQDLNNGJlSVJdw8h2pPFffDyQ9amZ30yITiTccI3zpLfPOuVvPS84evEDlNji0bDOvoEnrsfF6zI7Gf+qv5VHd3S8Xx3Q28+ct7nfgKuOzZG+F86mLXFUj3AKnQjLRmaNpCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XmQHWHKq7INKWatnFo5aw2hxeXO7ZzfpLq+0CTgZH2E=; b=OskQj8YRTcuErB8SGux9M3rTOi28C0uhJvIKL7SWhBtZanEw99e3CP2ZHoXDycCuAqhXJwwlpE7OlTpSZb0YyRhviNMTFTHpsDgaBMJPlNLs1z6spDGbMN7HPeWrv8OPpdHTuvYnx9WXpMVB082m59QLmNG5XCzxbXo10tc2Pto= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 23:28:25 +0000 Received: from SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c]) by SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c%7]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 23:28:25 +0000 From: Smita Koralahalli To: x86@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , "H . Peter Anvin" , yazen.ghannam@amd.com, Smita.KoralahalliChannabasappa@amd.com Subject: [PATCH 4/5] x86/mce/inject: Check for writes ignored in status registers Date: Wed, 15 Sep 2021 18:27:38 -0500 Message-Id: <20210915232739.6367-5-Smita.KoralahalliChannabasappa@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> References: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> X-ClientProxiedBy: BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) MIME-Version: 1.0 Received: from ethanolx50f7host.amd.com (165.204.184.1) by BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 23:28:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f6b7a18-bbfc-44da-444b-08d978a083d1 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-LD-Processed: 3dd8961f-e488-4e60-8e11-a82d994e183d,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N21liSHUgKeP27DphQ1UbAVx0mw5H9SK5IY1rTOsOmmk6/LFogolFtyWxkyx/MSf6ePLMU3bKALCeiHmOv9DAj9W+yvyXRhokka4j38zo2PXNaCTOrtlc8QBa2mnwG1CMhKKQa4CrS5DBcohW2N+ACBIYGiTQhP7DVSF7bDNnlU7rLpv+ceI3IhRt+SBUAN/FixZPjMbMXIKbeRfXcNmOMtQE7iRbhOTG8TTNhwe1TquwAJC9MHDem2vyYNdJrkOzE1LphvmK6pZB9E/c+WAazWFF3SUzOYAQ/VE/qy1Q85En+OQG94yk3MxAYAGOu5z1AvN23qUvwlmlDa/CsOAirSbDku9dNJLBl7iLFlDykT57pTksdXF77tCkA3jA2LVYJZY6Mn4L+uhCPt1BATEVTVCEoMFP5KVQSo8c6EFc276NqsV5t0nMsPi4R2BdD2MJ9vmPGg3IlM19uhhFQgsDGE5sfDi9fod2ZQsVJuA/9+Ti54ZYLgmJlPqV9kYqJ65aXNJLc750wC+zICs1VU1l8tk4tvgF2PiJQ051hhVom7jjqSjntO/1J2OlcWGZ0uzPkc9dY2rfaZu0Zr5xPlRTBpFTZmdmZpnW+bwUx3/5QRzWXx4DpEAHUnuZ78j3NG9o571Cqe7dhDO77y19fIGCbM0gCrsJw/xh+o/xiXqwefKF5Pvjz6TkYzM4CZKSKKZil2/U4hkK8XSW2rC9ABK7j/sBLTITOlaovLDP4LXQFaehxqM5gPyXtCxvVtV0RjSQu6UGTgYfkl/NAmTjGpG5rl1DOFxNjWnzaWG6RVM0cE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2685.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(86362001)(956004)(2616005)(66946007)(4326008)(66476007)(83380400001)(966005)(26005)(478600001)(8676002)(2906002)(186003)(1076003)(7696005)(52116002)(36756003)(5660300002)(54906003)(38100700002)(316002)(8936002)(38350700002)(6666004)(6486002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wOMJNyKqmLP5Mvq7R60RK+P3PpK7go/0ay5TI9XnAkTAgCjT9A4Fko/COb55ka4Fa7Q55+QLiP7YejaE9tO4IlLDsrMzLgMDzhxdYZRQtUXO3yv0JrYRRjSSUsMKTPIs845LLwTJAzNR0eLBK+GZvRaiOa7huuh6nfk7pprvrfYHGOV7CtVKAjaGydYiVlfdQT6aloVIoe66R4omMAy2/fsDLDSFl8Anfypj9azqoqU03J6vSv8CtaXu3SmNlIzgswsfrTXxzDfD8GoxAwx4CEONKRp1YUSm6qGe5CcprEYAyLzkbt3Fjep2d64W6jcFa/9DuBVAjTDO2YEOGOWrZeCyK1qy1Hx06mcQg3CiJGpRv4/8HtDq32a8LybTL2j/UUQGCmLMtTbEyJzzpm1ol4exxnWJHuWAQBJKxkkXN0TOGzC2xkAqi2L0XPqm12lK/u9KIfsCc2jJybfcRS0leAPHEbb75wwxsUcoZ9UPLnMQaT2UpH8hI3aulTHsqYk7nTdY5E8xVQ5Z0rif1YXqv79k+0mhywsGHOqHxssjClxRw8qTS1V4kaHKQBRSPE42viq8mBx2DUoBMO+ARcZwUesjGOShcmNSNgd1qpokmf5FH65arECjMzHK187GtGEM9wEEqmRuKGDTrkxqH6paIkovgPuRzGPmY8pg4ZrLrMsorRtcY+XO0ujOX63ZhtXjJL2/qiZL42iKKUCPUI3uVR56KGtjRqaytRgvL7pellFfte4SG8GkFgDR7XWZkXITWQbYgNimllLq/M2Rv2n26t4Xe7+dqZfy2ONPCMEvd7Xg7zrV/tkoo8xDjD0+K6A/8hw9f0ekthIJViX/I6AoY30BB5kRbG9DrDUDztQzY3bGj+bp40bqbppYg5d9UJ3fe6KfbtKrjufy4YEgnWgcO6tLa9FLM/JfRVFmiDSTu1e/Ln1xRk98g+3qh7w0RiTJvHWyp2CIrZGCzqoU6CU9o4W8XUPROSH7/puoSeswA9QerBZQ8E4CDDx/3r9PXwHvhYhcAHhXUJgdZnj0xis19R0LyL5wAJr6+EZPVUWH+HaRSzgJUXzZ47hOgO7GNb784QT2mTH2UunSa6Bdqe0E4vCRL/EkHC44hX8JP0UPUj6EmR+OvZQRfBRSYOoB8LW8ahk1l1cMZmomVxrslnSZfOM3vaja89lP4N9F7RcDUvMj78g6gw3BTfC4FE8ZWjT5vj0ix80lU51mFlZL2Kd1EHaTLFvphwQuRjiREXrjnYHanyPZhf9msQOlzskE6dZEzh0mU1XGSmAfq0/rFBQ6Tu2k5gCL4IU3JcmlrKrfnx94oWW3Esn4WcRvHNX+2kCe X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f6b7a18-bbfc-44da-444b-08d978a083d1 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 23:28:25.2525 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cE1LJqjXB1D32AfWXid7FxxP2i3ogxh3tZA0XRsDkvgGI6xT6yIFzDozJnu6UGK+HxN9U93bBS7IW5qo0z+H9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org According to Section 2.1.16.3 under HWCR[McStatusWrEn] in "PPR for AMD Family 19h, Model 01h, Revision B1 Processors - 55898 Rev 0.35 - Feb 5, 2021", the status register may sometimes enforce write ignored behavior independent of the value of HWCR[McStatusWrEn] depending on the platform settings. Hence, evaluate for writes ignored for MCA_STATUS and MCA_DESTAT separately, before doing error simulation. If true, return with an error code. Deferred errors on an SMCA platform use different MSR for MCA_DESTAT. Hence, evaluate MCA_DESTAT instead of MCA_STATUS on deferred errors, and do not modify the existing value in MCA_STATUS by writing and reading from it. Rearrange the calls and write to registers MCx_{ADDR, MISC, SYND} and MCG_STATUS only if error simulation is available. Link: https://bugzilla.kernel.org/show_bug.cgi?id=206537 Signed-off-by: Smita Koralahalli --- arch/x86/kernel/cpu/mce/inject.c | 39 ++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index 8af4c9845f96..c7d1564f244b 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -457,24 +457,39 @@ static void toggle_nb_mca_mst_cpu(u16 nid) __func__, PCI_FUNC(F3->devfn), NBCFG); } +struct mce_err_handler { + struct mce *mce; + int err; +}; + +static struct mce_err_handler mce_err; + static void prepare_msrs(void *info) { - struct mce m = *(struct mce *)info; + struct mce_err_handler *i_mce_err = ((struct mce_err_handler *)info); + struct mce m = *i_mce_err->mce; u8 b = m.bank; - wrmsrl(MSR_IA32_MCG_STATUS, m.mcgstatus); + u32 status_reg = msr_ops.status(b); + u32 addr_reg = msr_ops.addr(b); if (boot_cpu_has(X86_FEATURE_SMCA) && m.inject_flags == DFR_INT_INJ) { - wrmsrl(MSR_AMD64_SMCA_MCx_DESTAT(b), m.status); - wrmsrl(MSR_AMD64_SMCA_MCx_DEADDR(b), m.addr); - goto out; + status_reg = MSR_AMD64_SMCA_MCx_DESTAT(b); + addr_reg = MSR_AMD64_SMCA_MCx_DEADDR(b); } - wrmsrl(msr_ops.status(b), m.status); - wrmsrl(msr_ops.addr(b), m.addr); + wrmsrl(status_reg, m.status); + rdmsrl(status_reg, m.status); + + if (!m.status) { + pr_info("Error simulation is not available\n"); + i_mce_err->err = -EINVAL; + return; + } -out: + wrmsrl(MSR_IA32_MCG_STATUS, m.mcgstatus); + wrmsrl(addr_reg, m.addr); wrmsrl(msr_ops.misc(b), m.misc); if (boot_cpu_has(X86_FEATURE_SMCA)) @@ -487,6 +502,9 @@ static void do_inject(void) unsigned int cpu = i_mce.extcpu; u8 b = i_mce.bank; + mce_err.mce = &i_mce; + mce_err.err = 0; + i_mce.tsc = rdtsc_ordered(); i_mce.status |= MCI_STATUS_VAL; @@ -538,10 +556,13 @@ static void do_inject(void) i_mce.mcgstatus = mcg_status; i_mce.inject_flags = inj_type; - smp_call_function_single(cpu, prepare_msrs, &i_mce, 0); + smp_call_function_single(cpu, prepare_msrs, &mce_err, 0); toggle_hw_mce_inject(cpu, false); + if (mce_err.err) + goto err; + switch (inj_type) { case DFR_INT_INJ: smp_call_function_single(cpu, trigger_dfr_int, NULL, 0); From patchwork Wed Sep 15 23:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Smita Koralahalli X-Patchwork-Id: 12497863 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1228C433FE for ; Wed, 15 Sep 2021 23:28:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C39660E9B for ; Wed, 15 Sep 2021 23:28:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233094AbhIOX3y (ORCPT ); Wed, 15 Sep 2021 19:29:54 -0400 Received: from mail-bn8nam11on2045.outbound.protection.outlook.com ([40.107.236.45]:4704 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233065AbhIOX3v (ORCPT ); Wed, 15 Sep 2021 19:29:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EOsuRA8bbSrM5CB2+gICkyxXBYcB2fJI8i9ur0x/nEafeDs0nSBgWDxx1Yqh3AF587PhVhpK06Zdgr03mdTICh31TOQcrFm0FXfYMOQBotnTF3XvMXlv1UtbdFwxFPbFkk6KCxNUVzgCQI97s9LGwzz+44fdnSsKox84p60j5dUKpr7bVvyIrotC0UyHOcrxjD88hjf+W5e0HLV+Z9Vhkzf3zpexODP1ldDP2kqI9LUPOwHz6bIJbg2nSHzzBPVpkVMKDZTMBncDYdhbQzpa0H6W2PsuoCnHkOFyF/TUDPE3TnQft3v7MzgmrA3jrl1eqsXiLMnsLmz2G08MuBYSbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=UfD/GS0RCKIj4CPfUtQG0jMrco+XpppbQ7THZgimvaE=; b=DBMBAh4ngzL1054iD0TOVSqoIpAXpoifnlpIutGj/aywxxvqPFVDclaVU9QmdE3Y6y+bgsafFATXKBMa7aR3T5ro5IQrOr88PdLEWX1VZMPgZG+cZBmdBH5AMBObA0iSR86zycdhH1BzB1nxlyz+MnZfX3RFfm7DB9JjYlhLEkaZ96PqM54phwi2kl4fnzObmxPuHU10WK5zEb8+pd5JLMVvvOp07qJjU1SiA7uTp0W8OV28HqRY/OTaC1wj+fC6TiQFpuJKuuCvj6w/rum4ArDet8VjWEB2QPZ8tRT/Pn/EZcr0eRAR1KI0dtQ2MGckvx+I2t1Sibpg97vjYzV9nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UfD/GS0RCKIj4CPfUtQG0jMrco+XpppbQ7THZgimvaE=; b=ntOJMqF+yIXS2YTZfWlQEf1LF6j+xcNc1YPfTUppM0n0aIkqDJryI64f6AwK+QJKPfTet3qMM3VyMacjQFdyDk/1QlQ80vopb/TXuZdNe8PdYOENaFviCaZjhwOwspDJY6gC1U78CPDdNnjupmg9gRVcGJugaI4bbFBmOL7vLD4= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Wed, 15 Sep 2021 23:28:30 +0000 Received: from SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c]) by SN6PR12MB2685.namprd12.prod.outlook.com ([fe80::4913:ca1c:92c3:64c%7]) with mapi id 15.20.4500.019; Wed, 15 Sep 2021 23:28:30 +0000 From: Smita Koralahalli To: x86@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tony Luck , "H . Peter Anvin" , yazen.ghannam@amd.com, Smita.KoralahalliChannabasappa@amd.com Subject: [PATCH 5/5] x86/mce/mce-inject: Return error code to userspace from mce-inject module Date: Wed, 15 Sep 2021 18:27:39 -0500 Message-Id: <20210915232739.6367-6-Smita.KoralahalliChannabasappa@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> References: <20210915232739.6367-1-Smita.KoralahalliChannabasappa@amd.com> X-ClientProxiedBy: BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) MIME-Version: 1.0 Received: from ethanolx50f7host.amd.com (165.204.184.1) by BN0PR04CA0045.namprd04.prod.outlook.com (2603:10b6:408:e8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Wed, 15 Sep 2021 23:28:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84436643-b4a0-4cdc-9b4a-08d978a086e6 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-LD-Processed: 3dd8961f-e488-4e60-8e11-a82d994e183d,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jy+DdRQl1jScTYEjfIyEXhN1ls+kiWJ1kulEpbwdkn8D/a/2vv/SbfifnwJs3ld5aqX6+weTeqsrUEPJ8TA2Br+YHjU+c2Jb6dCyCopHaJ3qABUM8edQbFM+FaIQF7r/i7bZeE+fd+FyYFF3EllPCDLYMypurra9SIv/SE4lLhhdR/rWTfOHGjW2ytEn09jKUGGug+DvdnhStsBkyIZT6i6pdDOafxyR+wr4wtYphqOgaFxKwP/Pd8kn2NC9fGFkjPUMJ8BRdhsxgRbf9viFjjjc4SH6oQTiegMY9iSMuK8tGsY92UqhFfh3rVwl+/6j+bgi/oGHXtNObB/xqa+0/45y+M4ysqiyjM+wWXA79otpdErUutsNs9jnDodYLSPD4BnpCCibzS1P5dJxh4Vk0S3ki/EZ4uTd8j2Cw0E8/paOCABAP5IVmvdUqEw8T+ZoAXbYqe02Y7ymhk1xurg/+TQVALz4JpbFWHiICk/YHnkQESj8JBD4HjFF5eMsvmj98QGu1zLwlGM8cTWvuoFs9eHE5K8zRMIQ0AZDdimPPOkrTaBhmCtYsoEyhyyE7by1+LDvYPu2+LU2NegKZ00garjYfzfLvKY+aKM7nxJA6eE7neVevoWn+Hlx3WJWScR0KLmGnug2ksRzuDPdwqAy9NTVQnwN76dR/aQoqMEwyJVJ6Ym7ofbICV+Bbo9tzQMN2MaQ4ORx+2EGeldr4j9znA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2685.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(396003)(136003)(39860400002)(376002)(86362001)(956004)(2616005)(66946007)(4326008)(66476007)(83380400001)(26005)(478600001)(8676002)(2906002)(186003)(1076003)(7696005)(52116002)(4744005)(36756003)(5660300002)(54906003)(38100700002)(316002)(8936002)(38350700002)(6666004)(6486002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DdOsrQ/sPozEPdvCxoudWwLim6bzc3VSRSDo25mIo08rh7vxq9kaJ9f6BkVWmXe5OdrJAxRui2OCXCIxOd8P/72xtcQ4NxNDHZ9PmGEUD5/J3eyzjZjI0sL76ZnMUdygvBAPbEd+D3csPTh3kBCLfdh+IExL8+bQqE4mVvJImItcDTJbg06ChQCN1ZEIkDZf0EawTPETb9tYzgAl0Rc0IJ8oeiw3ghJu0kNTUKx3PT078hcj5xzyzezn4CmIDjlygSjMA5CjoFfyVkTi82OJTv4tjFVFEB+BWFPRb4utDz7gO6988LOB22PzLPVh/W1si21FKjLDlgeyRZyAES/oA/i1s1EcNrcJf+8elO50obcEvKfq4MxEmiAx1dtMiOpoT54m3oGjMocZjSLZY0KFD3xa3DUfq0UVONmKPwMjUUbKC7DPlpyGIh4Q+LP80kj4FMpnqq+LzzJ2Rxff0G8SWzvzHSfG3RuArLvC9Yo4GACmGPY/ZryKu4fyxNdYcDlWjnrFGC0WAFltHl+oeSXlgoi8RTaS6WoaQTIX6iGR4Curr4OLpzR03/8md6pfyENQAs19PUu5ZMwP/FzmdfJqsRI8SkkDgjF2wQnJcPUWa62wc2IGmdCV/cwQ6dDf/Pk6/MHOdZJs8OBYfdE4AOBxrSQEWhnTKKBhtP6g2EUM1mX7f5ZtO60HW7cwJeAWlETUTtLU4AEDOi2pYaMsO7oPFme04zl6guwuwJ9FJjvsE3NT97WQ919oobnuT1jfYLs5VShP33ohISiFKEQTi+YJbJYZprtzxqlnA+77lS6QqBCD4E9i0VtYQMFKRCseVhPIO8f2znpK2y4ArqaHjXfSarfeg/HT9XmgHN0HnSZzS2KPzyJy4njdovAhdDuaKn4ka+iFbHew1wuju3YbG22anBxrLfKJyu6LGrnf1040bO+Z/RK582hVgMF8ruefHWmueN2ue/STJyYpIJbmDifIPjc0WrKFu8DscOF8MHu9KTY8TaKieDP1Phba9ANjuH3zDsPjv0SczqA5NwrDccLpfPSQ1ZnlA46d1FBwjZ+9P44i3EqKA25WFrz/TBHAhESCX48SETTkwh7piFtNgytQod7d29KuiW+pJkJHC3tyl7TR9B8EO96bVCbAyE8Z1roExcXAO20dHqcAnMdNHKm2acVsx+PAl2wgSb74HjlryBSam8eGNKvz6iOLmZ7ESA9hLVspw12ULK2rtYjE2wyoHSS4HOwBp2MBGi0aQo6JxrZk04DfvclZS5iz5cDpiRVEDpcvmD9C5mRqvtarW5RrtPEJzTQwW8RUyqIfkwvdMB+MV1aqslwBKJnJkLqKbGbG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84436643-b4a0-4cdc-9b4a-08d978a086e6 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2021 23:28:30.4595 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Zd778/8LpXh7llUhiHKPCfOJZ9Fgo5FTCjSbHTe5ZMt2Ut7JSbIwV/QYinoTJ9LeK8TliitL1Ywx2ZOXbH5vmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Currently, the mce-inject module fails silently and user must look for kernel logs to determine if the injection has succeeded. Save time for the user and return error code from the module if error injection fails. Signed-off-by: Smita Koralahalli --- arch/x86/kernel/cpu/mce/inject.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index c7d1564f244b..0ef9ff921c6a 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -549,8 +549,10 @@ static void do_inject(void) } cpus_read_lock(); - if (!cpu_online(cpu)) + if (!cpu_online(cpu)) { + mce_err.err = -ENODEV; goto err; + } toggle_hw_mce_inject(cpu, true); @@ -622,7 +624,7 @@ static int inj_bank_set(void *data, u64 val) /* Reset injection struct */ setup_inj_struct(&i_mce); - return 0; + return mce_err.err; } MCE_INJECT_GET(bank);