From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2083.outbound.protection.outlook.com [40.107.93.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB5D3301000; Mon, 25 Aug 2025 17:33:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143224; cv=fail; b=TJkH3yz6kOThshmgHN8J9lr8u3vayRi88iO0By94Ce3OmN2E1draoXQD22fIgXDcf0EbT9AKoVGpx6+OOosvnoSEHUaSMN92RN7p2aPIFkpIEohy2Z7MaxkjbYIP2tbX43BT5xNS1oudZTCKfe2AQjNMvLdyNIuG+9VZuRuRdF8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143224; c=relaxed/simple; bh=7elYmStGNwo1HDz1adX15xorVs4paCKLXt/7ybG8n7I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=D1tuLIosItJ3mVoS0fo6QxDha3Z/SMjxUWYwCVBsigj91m/NHAej/jYiVgzgUgvVtluVhbiwvo8Rci8AihwOo1rYYj+6tDe7/jkkncizsOrQujm7UWHyYZIQ48iTzIPyeGnGGg0n4SAqbnUaEX1Kw5C3V7/0NCzQJ+UmSBI9kjU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=emQF2m6R; arc=fail smtp.client-ip=40.107.93.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="emQF2m6R" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gj4wl1UR1JKQCBwedyGLauIkcaFJfQrwHkJlWlzIZx6S9DWtOaGabyWTPwR36b84VXiM3rq40dwsjKi6HmdaRkmcNWeLYrd0ffCXTFb4WjXPUtA4L+gUAfVXAaPL+E2DuMetBGAoMzeTA6UdXI7/Fb9tSh2+VwrePWvLBFuE9mbrdfqJpqKdXjUcE9eBOgXX7MdS1A/a2XxAooPXqavAVFu43sHliVbcwPVQjjSOFLL3a/trtnMIIx/dfsXljaIFQvnT/Gcs51BwI7R3difBAlJfCEvRpJTaWSl4k4enp/k1T5aSL4H77TbE8CMJFirB0LnFoxa8qH31E9w+C73dtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TIBZKlOiQA0u0GnYKWXhEHnKNDX9Wn1eh8O3hYc3tAE=; b=p82w6ptyS4GS4sFfGO1ECfqQzPEu/9Pi6UfatCalb00MqptSNW/3kNRM9RD8qoE0OWuejOHgUbr8mWwKif9VurryU3zr3q2fcnVwl4TI9JTkty3rQUyTsWfJcPdWcakm0Jd2q4pr1k7ZfQKXIe1V2+wz5H+FMsB4orkeqf9KTCHSKf33riHCv4LYkH93zBdnAP4ZbDIaHGoMrjW2IMUsW+NebKSmxi6+gLzvdq8iTD6JFx2Y2bppG72un1cJBaWtb1/ws8r3F1NRdqgbvnMYFXuGcmOIgZ5aDZ/+floWPZsLKifU7ZrtqrGs1Q4ePgE/aXXbnP/c3hmn2h+CzymWPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=TIBZKlOiQA0u0GnYKWXhEHnKNDX9Wn1eh8O3hYc3tAE=; b=emQF2m6R8DTT4S8jSRzGXDKe5av6vUQ4xYZvqnoA5u0zyqA2sUSo7/0U+PBSej/5eJwU4x+tsT4z8Qc163JcdWq7eKiw6ZuBwlkxP+78gH8/MAJXFFDuvuOoLJrJUV66y3zi4WdOrZjQybOk4+8Tomj1/3oAEjDdZLCdZlpRBi0= Received: from SN7PR04CA0039.namprd04.prod.outlook.com (2603:10b6:806:120::14) by MN2PR12MB4112.namprd12.prod.outlook.com (2603:10b6:208:19a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.15; Mon, 25 Aug 2025 17:33:38 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::5f) by SN7PR04CA0039.outlook.office365.com (2603:10b6:806:120::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:38 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:35 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:32:58 +0000 Subject: [PATCH v5 01/20] x86/mce/amd: Rename threshold restart function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-1-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|MN2PR12MB4112:EE_ X-MS-Office365-Filtering-Correlation-Id: ca70ab46-635a-4d2c-622a-08dde3fd8696 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Qkt3RFFrUzlCZ1JoT3ExMHh5OFZPZzZybGhPeWcrYVBFMlFINFlJY0pJdDJ1?= =?utf-8?B?R1ZUWUtZV2VzQTl3UUlsTzkyc2NTWHgraFk4Q0VrYmdpUkZDUG1oTjR5c000?= =?utf-8?B?UHowK3J5cXdONVBOQXNJZGE2ZUtiYm14S3NvQ0NLVEJaWHNQdzh1MHI4RElv?= =?utf-8?B?UVZieElVUW9Gd1lKL1RlNEZxNUk3TjR2aHhaWXpjY1hyOFU4M2JUM1YxMWZm?= =?utf-8?B?U0hqNlpURGh6ZGUzeTN6R2pNa3FhQnlrQi9JNDBYMk5NaVBGbmxoRWRvSzdZ?= =?utf-8?B?dVp6YTRVVGNmamFTOXlsNlpOUWJYelZVUjZ4NVd1bFV2ckJmbHVOMis4WkZR?= =?utf-8?B?YklPZXZOTXYzeEg3NTFqSkVHaVhxb3cxaUowN0xqTjJHMXB2dWoxYVIxVm5M?= =?utf-8?B?cVpFUGh2cFhnMllLQWdZa3pkUXlIclJZa2J6blEvZG00NHVQTnR1Z0RneEF5?= =?utf-8?B?SUl5b250dmV1anhTRnlXVE9zLzlWVEhpUFdiYXc2ZW5BbFV4NkZUZXlSOXFx?= =?utf-8?B?dmV3NFFNVWthOTZTbGw4ay8vN3JqZUFWNUE5Tmc1cXZDclkxSzdZTWprSklv?= =?utf-8?B?bmFVRm15Q0puMG9FczEvUDV3OWwyQ1N0SHl5VHFPVDFLL0gwVzBaL0Yydjgw?= =?utf-8?B?VDVGcVV1YjZKNmo3NHFuRGVhVXNzZ1ZZa2Ryd2ZNZUNMZXNKSDJJNFVsZU5Y?= =?utf-8?B?dk1yVWZVc2ZMNnhyUGJEL0tlU2ozYUFMcnVmMlVEOGF6UlFoZE96S0NPVVBU?= =?utf-8?B?c21TRGRrVjlOSjFDOE5uU2wrUm5qcWJvTm1ja0hyalNJK2dqUTJ5VTJhc3FV?= =?utf-8?B?L1k1aytiTmNDbEU4Z0RsMGNzaWtRK2VVVVJIWjBVTGNoVThIVUN3bTBVZlFM?= =?utf-8?B?OG5uVDN5aURSYVgvTWQvOWRBOXZNTWVYUDZXd3dsR2ErbWhQaFl0dWhFckVS?= =?utf-8?B?RWtBc1p5Sy9TYmJKdGJtNGk0R2V5WlF6OEcyUDNnRDIrVitzS3ZmaUsvbkVE?= =?utf-8?B?dUx4Y1ZqTkhrc1d0bzFqNkFmOG5Yd1hFajluY3BvdldhMkNIclBUZlpGM0l2?= =?utf-8?B?SFVscm5aNGhEaDFUbGVEcDRVQkNETGhCckhEdE1lam5IZmRDcHM4QlVzWm9z?= =?utf-8?B?QkpXbFY0ZnV3WUVNTzluMzZGYlZZZ0JXaTR0WWJ0a09DSUlscG54anFQOVdv?= =?utf-8?B?Y25ZK0dybU5JdXNWM2l6SGpjUnlUdWNTZW03Z1ZHOEpBanJwMzdBSXlmMzJL?= =?utf-8?B?NWtQN2djdk9pb3dpVk05ZTRLWlpZRnlFRUhQczl6SWc0NHJLYmdHazQ5WUl4?= =?utf-8?B?R0MvSThYc0hYemdyb1FiVXJMQVZPN2tUWWtSQVhMZ3dOcWpkTklxaW9sQzVM?= =?utf-8?B?T21DcWlmWGVUMWN6WjlLRmlvSTVkYW5sYU94T202K1RPSFNUY1BBNXd3ekZs?= =?utf-8?B?WEc1NmpBNXNwMThDYjlQSkd5bHNpUEtVcDgvaTZvQm1JZllvUUdveFhzYVpM?= =?utf-8?B?TGhULzRWMThETDNOZ25UaG8yWUVxUVVkZnNDWDFZU05iV1lXUFJORlNnek4y?= =?utf-8?B?Lzh5RmlUMUtLdHJCeTFiYWFrYzRwaEZQZldDR0JTN3VZTVBSdFZkbkt6V2Qz?= =?utf-8?B?dTBRUmhQWHBoMkZHSk5wc0ZlcE1VWnRmUkQ2bDJCelE1WDFkYktLeWw0NGhQ?= =?utf-8?B?Rko5SHlHSTdZTU5WcVlnS3dKVHFsZlo1UnpRM3EwcUYwcUpPYjlmMElPRWJh?= =?utf-8?B?Sll1NXZFdkhiRUJKY2hCU2YwTitGeVAxVHFTUS91U1N1Y042VjFvZVAvb3gr?= =?utf-8?B?V1NyUFFqeGdWUWhRSnYyWk5hcGgwWDVRbFZsdEtWSWNPNUdQQVBZSVZnY0xD?= =?utf-8?B?aXl5cU93T0NmUWxFOUp3NElja3cxcTcycU5RUWF2cWVNSWFNRm1HTnJuRjVu?= =?utf-8?B?WStKQXhpV0kwNkZlWXMxS2Q3QzhUQzNXSWVQQWx3d0praVd3eTB2Ui8vdnJJ?= =?utf-8?B?TkkxSXZ1UWc1RGlQS3JCU1hWVlRtOGtjMUZEYktLQWExUThvdVZuQVBtYi9U?= =?utf-8?B?NW1WU3R5dzlySjR5Ly8rR3RmTkladmM1TE1tZz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:38.0057 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca70ab46-635a-4d2c-622a-08dde3fd8696 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4112 It operates per block rather than per bank. So rename it for clarity. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-5-236dd74f645f@am= d.com =20 v4->v5: * No change. =20 v3->v4: * New in v4. arch/x86/kernel/cpu/mce/amd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 5c4eb28c3ac9..9b980aecb6b3 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -419,8 +419,8 @@ static bool lvt_off_valid(struct threshold_block *b, in= t apic, u32 lo, u32 hi) return true; }; =20 -/* Reprogram MCx_MISC MSR behind this threshold bank. */ -static void threshold_restart_bank(void *_tr) +/* Reprogram MCx_MISC MSR behind this threshold block. */ +static void threshold_restart_block(void *_tr) { struct thresh_restart *tr =3D _tr; u32 hi, lo; @@ -478,7 +478,7 @@ static void mce_threshold_block_init(struct threshold_b= lock *b, int offset) }; =20 b->threshold_limit =3D THRESHOLD_MAX; - threshold_restart_bank(&tr); + threshold_restart_block(&tr); }; =20 static int setup_APIC_mce_threshold(int reserved, int new) @@ -921,7 +921,7 @@ static void log_and_reset_block(struct threshold_block = *block) /* Reset threshold block after logging error. */ memset(&tr, 0, sizeof(tr)); tr.b =3D block; - threshold_restart_bank(&tr); + threshold_restart_block(&tr); } =20 /* @@ -995,7 +995,7 @@ store_interrupt_enable(struct threshold_block *b, const= char *buf, size_t size) memset(&tr, 0, sizeof(tr)); tr.b =3D b; =20 - if (smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1)) + if (smp_call_function_single(b->cpu, threshold_restart_block, &tr, 1)) return -ENODEV; =20 return size; @@ -1020,7 +1020,7 @@ store_threshold_limit(struct threshold_block *b, cons= t char *buf, size_t size) b->threshold_limit =3D new; tr.b =3D b; =20 - if (smp_call_function_single(b->cpu, threshold_restart_bank, &tr, 1)) + if (smp_call_function_single(b->cpu, threshold_restart_block, &tr, 1)) return -ENODEV; =20 return size; --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2051.outbound.protection.outlook.com [40.107.243.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85EC3306D58; Mon, 25 Aug 2025 17:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; cv=fail; b=LTdDMnt1QNRRtbHnqMRo84t0El+DOnbDK509aHcvpEqwKAza6Ny/7WdX250caHRTcfgZK4oW2WDt2SXY4soFBRN+9ReJA4qDDB6RY+fZ57aLDfYcoZiwbez/e14N0YcwDOafzFQbn7pL6sAYeGPnzngDicYcb6qm+0+/jCnfHNU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; c=relaxed/simple; bh=N1eB1V0YFwpm6KPXb03rMLy+iifXtMxZkUIFNfUv9Zs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=az7pa+RkNX0620qrFt+0EHezwMNVmTGvSwbZAsrZrVduUBuDFgthuQucGgCrk9+v9Y+z57tEFWUElckncIpn9eg4fL2PBJrz3TvOZkUTbdP9DtUwhq/0c0mbx2DMd+AdHhKYNSprO87tu/b+GQqO+Dpf/laD3l1/pHDZxYPOTvA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=DAQ2JOWw; arc=fail smtp.client-ip=40.107.243.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="DAQ2JOWw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VmHZ0CzlVLq6MPTJDItJynCzFxiWs0xUsfK2gMm7E1Avbcedtv5/TBHqLlpvEmGRM86XcLG2n7wcs5SFpio0B0mJNrC6bO0GXu5u/eZDC/re5AtWkofdMo91WisD4JatwJSwLgb6voRC4coUNyiqSuGo3rEldelY63XxFLr7f5uyEAhS1FIcaqar0l6HBgYQF5//eGzuqE2xKCQ3ZhRX5Ba7oAM+NiuffPcWwOge1gzv37gfwB6a5mWsMvlEH9kOs3eGIomqyenFwF74OFmrqP29nvlQsmFEiaNqq/H5cfQjXf7GcT9rttco/Ldp7MdhkeZiH9GcNo6vZ5NID1vIiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K4ojCnshDA3cCl000uqNFDIfXR9mNosoCVmtF4loXbM=; b=P3y6Yf8kqLw9dZF+UnGXjCz17JeUdnu6k9cxDuvDgB6P5jME9djxnEWDbl6hP06Fp+s6ExH6uNlW7gJnAm+PNYiN00UysVq3ywnac4OV3djVffG3tnoT1BkAjvtZJrM034GIgyvY0d42dkQwSIPnSXDN46P/3sX69BrRdfZw0XUIWxOSXuQpb2WQcpr6kWWxJJe9fSTwaGxzQ6QKtb+CRmIJFULJ33WK5hCQzAQDIUPGwT0PmIhngAf2725byE4kS4D8oYesqMoRgfFvrEMHjToGPxc350v+pX9FOzZ1X6nua864IbgtcJTplqaLYQPicRH8vjDgmcC3uQA7D1Zitg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=K4ojCnshDA3cCl000uqNFDIfXR9mNosoCVmtF4loXbM=; b=DAQ2JOWwOpWtl1rmM3sUJz4tsH1OTmUFjpLmyMu67lTmxlV5m9wPUptGrOS8MIOyU99bhokoaeZnTaKjgNzNXNvAmtq93yYc3Cn65/qVulFAxF400Ux/ANWrr8kOU79N+Q9Q7MQkml0zEP5y8V03HrvO+rQkH0KtsB3iWtjnFYE= Received: from SN7PR04CA0046.namprd04.prod.outlook.com (2603:10b6:806:120::21) by CYYPR12MB8890.namprd12.prod.outlook.com (2603:10b6:930:c7::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:41 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::7c) by SN7PR04CA0046.outlook.office365.com (2603:10b6:806:120::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:38 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:36 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:32:59 +0000 Subject: [PATCH v5 02/20] x86/mce/amd: Remove return value for mce_threshold_{create,remove}_device() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-2-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|CYYPR12MB8890:EE_ X-MS-Office365-Filtering-Correlation-Id: b0913c1e-360b-4d75-fc04-08dde3fd86ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZVFTcjJWOVArbGFhb01HSXpnbytzaSs0Uk1aOEhmNEFxVXJuS1gxUHFLSnpU?= =?utf-8?B?NHpvb0RvVzc5dU5SWGEzZ0VYYSs3SmZzcEVSOGpoWEF5UENIMWxaNmxQUUJS?= =?utf-8?B?c21lYXMwd3ZlckVWRmJIWXZBTzVHM2dYaTRTTlJ1Z25OSy9zUTFZUzcrYWlK?= =?utf-8?B?MERZYWJ5MW1EaVFoTDRYSFZpNENWS0pLdk5ZdzI5dWpCb2xNNTNCd3p2TWFC?= =?utf-8?B?WlN6Q3VZbkN3QmozenptVmcrdVVkUHI3NmxWanppOHNEVzhReUFPeWxzYnVz?= =?utf-8?B?amU2bFp3dkg0ay9naEZFQWdqWDdRenlqUHFoaHNRZmYxSmZSdk54L1ZUeVRZ?= =?utf-8?B?QXBsa01ENTBzMkRXUHJ5UFNlVlB0NGpzbUZydzNEdzBYMGx3Y2Mva3JKTDZ6?= =?utf-8?B?WnZ1UHRtR1U5WExxM2FoZjVqb2huK0NpL2g1QWdNWUhFTThQY0lUUVVtZGNJ?= =?utf-8?B?ZGpmN283Ry9GUWR4eit1Rk5ZbUxiS0k2U3NldC9mWkljemJYazdWNVBCV1Jn?= =?utf-8?B?Z1ZTZVFaTE9HVWdoY0s5RDg5bGIxTGN0OGVDbWg4YzU3MFFuM0NaL3hZejUr?= =?utf-8?B?U0ZkS0hHd01ldFlvMkdWNWFqcXBNOEhXR2M3djRMRTdBd2JJdmZkUUc1V2or?= =?utf-8?B?MnhtYnRGcnhHVEErT1pHT0Q1TmREVG8rYXg2RlJLMHdKOUdLWTI2T0pBcHMz?= =?utf-8?B?dEhHVk1tRm9aY1Y3YVA4SVFBZWphbjVuQW93TVN6M01pOTNsckRHQ2IvREYv?= =?utf-8?B?ZklLM294Vks5dFM0WWtGYjY1UkFUeUV4UUFlZlRKSC9CanFKdFNBYTlFbVd2?= =?utf-8?B?YnFvcGl1dG1uMnlHZm5PaEhkVEREWTRsZFg5aTRIVnNwWHhYL3ZpZHlrUElh?= =?utf-8?B?Wm9Nc21EelpqUG1JRTJxaE9tTEh5QkhYN05CSTIxQjlBR0xCeC83cFF1eVZ1?= =?utf-8?B?Ykh0aDAvSG5qWGoyMkNJM2pBdVBrZllvK0xDKzZvdFlrQnJVYlJ3SExQTW0x?= =?utf-8?B?VGhnOWtlVHRqNEdhRUxvdjN4NDdwbnIyeVZXd3hFTlZrTVVBc0Q1bDBLcVds?= =?utf-8?B?TWcrdnlQYVRsbDdxOXBWNTZYOGtyenRtU0RZcU4xUVh5QWYrcURoM0FWK3hU?= =?utf-8?B?YXZxRWZodHc0SXVYWCtTMTlLbE5wMXlwSWdyN1MrSDJHREZDZGh5eHJCY2xs?= =?utf-8?B?TkFTbnN0Ky9KOFpsTTFCU3ZqNnJjM281cVV5cnl4WWFKSnRDRkdFVXNhRWtv?= =?utf-8?B?NUdCY1g2Z01JR0VPVkM0a1AwT1NlaTJHOGpsVVR6aUhWUTVOeEN5QlBZMlE1?= =?utf-8?B?RnNnTDRUNmFYSE5vbllNcG90Z2RHbkxyelRnU2NNZnhvK0sxMkRMSVFkQjJD?= =?utf-8?B?NFZ3aDhTTjB0N1QwNUlhQ3ppeUc4bkpYS3k3VkRSbFJzUENIQStVL1FVWWpO?= =?utf-8?B?bHFtOTZqZFBpQXU5ZUF3aGpDY1JpZklmWmc3WUFxUUtuSzgvWUg0dXFwekV3?= =?utf-8?B?ZDdXaU0wa0NPVEhaMVRDcG81RjRLZ2FlUmFyTGRkUlZlR1QyV1owNnA3OEFi?= =?utf-8?B?MTcxZ2pkMW5FUU5UN3VJMzU2Z2praXp0WEtlSXA1TWhHeXcrQnRTSlpEKzF4?= =?utf-8?B?alBoSlJPamVHS2NxaHRoRFcrV0wwZ1REVUREeitqbzNyR0pmeStKcTVHZWw4?= =?utf-8?B?elhPZTZLR2VYSXcwUm9PTVhMM2tGNjNqUWZaeHorWjVpTVd0T3A4RnA2SkJk?= =?utf-8?B?U0FDTE96cDJ6WTkxSysyMTV1aC9CaFJQWFloTURDbG5xNHA5bkpMUXFPck5i?= =?utf-8?B?Q1I0OEFDOGpUbEI1RUozYWswUjBpbmJSMTZJd1JPT25QOGxHNVNkSmZsdC9O?= =?utf-8?B?Ui9PbWQ3ZjllZnhGQ1BBeHRKRURVeEZLdGFHUjh6RWxFRUNqcG5xQTd6WGh1?= =?utf-8?B?MENqTUFrSlk4QnBtaHhyb0pmL0MwL0RmOWc1a2U5V3JSdTdLNTVNRi81STBU?= =?utf-8?B?Qi9IUUhiK0lVSmVJY3BpNXZ2L0lFVHQvM1hZQkF2bWE5VjNVUnlnNnQ1MWNU?= =?utf-8?Q?cC306w?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:38.5743 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0913c1e-360b-4d75-fc04-08dde3fd86ec X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8890 The return values are not checked, so set return type to 'void'. Also, move function declarations to internal.h, since these functions are only used within the MCE subsystem. Reviewed-by: Nikolay Borisov Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-6-236dd74f645f@am= d.com =20 v4->v5: * Added tag from Nikolay. =20 v3->v4: * No change. =20 v2->v3: * Include mce_threshold_remove_device(). =20 v1->v2: * New in v2. arch/x86/include/asm/mce.h | 6 ------ arch/x86/kernel/cpu/mce/amd.c | 22 ++++++++++------------ arch/x86/kernel/cpu/mce/internal.h | 4 ++++ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 6c77c03139f7..752802bf966b 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -371,15 +371,9 @@ enum smca_bank_types { =20 extern bool amd_mce_is_memory_error(struct mce *m); =20 -extern int mce_threshold_create_device(unsigned int cpu); -extern int mce_threshold_remove_device(unsigned int cpu); - void mce_amd_feature_init(struct cpuinfo_x86 *c); enum smca_bank_types smca_get_bank_type(unsigned int cpu, unsigned int ban= k); #else - -static inline int mce_threshold_create_device(unsigned int cpu) { return = 0; }; -static inline int mce_threshold_remove_device(unsigned int cpu) { return = 0; }; static inline bool amd_mce_is_memory_error(struct mce *m) { return false;= }; static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { } #endif diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 9b980aecb6b3..f429451cafc8 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -1296,12 +1296,12 @@ static void __threshold_remove_device(struct thresh= old_bank **bp) kfree(bp); } =20 -int mce_threshold_remove_device(unsigned int cpu) +void mce_threshold_remove_device(unsigned int cpu) { struct threshold_bank **bp =3D this_cpu_read(threshold_banks); =20 if (!bp) - return 0; + return; =20 /* * Clear the pointer before cleaning up, so that the interrupt won't @@ -1310,7 +1310,7 @@ int mce_threshold_remove_device(unsigned int cpu) this_cpu_write(threshold_banks, NULL); =20 __threshold_remove_device(bp); - return 0; + return; } =20 /** @@ -1324,36 +1324,34 @@ int mce_threshold_remove_device(unsigned int cpu) * thread running on @cpu. The callback is invoked on all CPUs which are * online when the callback is installed or during a real hotplug event. */ -int mce_threshold_create_device(unsigned int cpu) +void mce_threshold_create_device(unsigned int cpu) { unsigned int numbanks, bank; struct threshold_bank **bp; - int err; =20 if (!mce_flags.amd_threshold) - return 0; + return; =20 bp =3D this_cpu_read(threshold_banks); if (bp) - return 0; + return; =20 numbanks =3D this_cpu_read(mce_num_banks); bp =3D kcalloc(numbanks, sizeof(*bp), GFP_KERNEL); if (!bp) - return -ENOMEM; + return; =20 for (bank =3D 0; bank < numbanks; ++bank) { if (!(this_cpu_read(bank_map) & BIT_ULL(bank))) continue; - err =3D threshold_create_bank(bp, cpu, bank); - if (err) { + if (threshold_create_bank(bp, cpu, bank)) { __threshold_remove_device(bp); - return err; + return; } } this_cpu_write(threshold_banks, bp); =20 if (thresholding_irq_en) mce_threshold_vector =3D amd_threshold_interrupt; - return 0; + return; } diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/i= nternal.h index b5ba598e54cb..64ac25b95360 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -265,6 +265,8 @@ void mce_prep_record_common(struct mce *m); void mce_prep_record_per_cpu(unsigned int cpu, struct mce *m); =20 #ifdef CONFIG_X86_MCE_AMD +void mce_threshold_create_device(unsigned int cpu); +void mce_threshold_remove_device(unsigned int cpu); extern bool amd_filter_mce(struct mce *m); bool amd_mce_usable_address(struct mce *m); =20 @@ -293,6 +295,8 @@ static __always_inline void smca_extract_err_addr(struc= t mce *m) } =20 #else +static inline void mce_threshold_create_device(unsigned int cpu) { } +static inline void mce_threshold_remove_device(unsigned int cpu) { } static inline bool amd_filter_mce(struct mce *m) { return false; } static inline bool amd_mce_usable_address(struct mce *m) { return false; } static inline void smca_extract_err_addr(struct mce *m) { } --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2053.outbound.protection.outlook.com [40.107.212.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2350D306D50; Mon, 25 Aug 2025 17:33:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143228; cv=fail; b=eaORNtTD3kKuuZqREtH+cBateYJxCSYw+Tb+sH0SouYSMH/gRtbMSxpbyh1KWZrLBnXUUeAtCsVixmU8907FvG5KHdd5lYqfMuLVs0EqnRhFZkiV8tG2Hm6nDOLUJ9cxzpBX0ZdO5+fubjkF7QL6ngiQNH+pqCd/0+8CcGXjdOw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143228; c=relaxed/simple; bh=mgRsywZ13X30ULyuIfl4WGmRSC8KQPPlLkyMXF0A7S8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=HNq8bpxZVVw74nFcfa/CyHR7DgIeO0CwfW8HNABs8u/jX0hQYtblg+YI7JZIDLcFecjfxfaGvOTLM1c/mj5hi2ECJwG4oaBIPx5NRaw7pcWVZzXDYkBQ9GZbNsyUFrjlSZfUL7fnizq5viWI+8v8eSbhliv5yKKHn93zOpX/bUk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=DxQCQr24; arc=fail smtp.client-ip=40.107.212.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="DxQCQr24" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d5XN6j8xm/OvrzE/YI/fuQ90A8fu8AE56yvXYM7e1NBuiNfsFTgpRAvhrPIdU0GqyiygI7cV+e4knRaefh2ZmtcnASV+s/5w/hejrZtLjKuDGEqlNJHREl2tzeWwCVTStcV0SM3Zh+0Q8bFY8BPRTc9ipEx0EpGTZOzfQyVFB6T4JQHS5CANwJUHKf+RDj0f+E4QyJqfHPWxSRmTLw6L8i80NVp6Fl+QDVWFeL/1QLEZOmT1yVKSkgQnKp1BJIVfE2bnQ7DtMTFlgMFBgolGnyY1PArixsiiBOrSA//DbEaQ7GkY6XSIg3eZ1z2pBHL9lj30R4pl9cgeeEcx1W1aHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iR5wgOI4L+8eRgSSiW65P78x9wDRLYOVuOnD0qbo+Is=; b=W4FhY+gOKbef2uwybr7p5Av5RxIGGnAurjxih0V1SzFXQ5L9esCMj5Y9XiE73J1x5zTmjGUeLWJ1OLnhF+55KqvFqJuu4kOOzgKu/MKuPix5Ti7ilH71UzhVCEUKxGR7nud4n9mSo2NfJd6+0rkgeHWU0uGxNhYWpBZ0yrj6wMO5QLHu5KZe80HbfTJlAiEw3vWinOI8nlqpyBBOwqZFqQryBoC2cVNfhoS5RLclhEjp4GIs12aoy1g5LM9RfWb0RNw799e0O7C5WCKiPXQky6F8Lg/DQia5Chy31I97lnFN+sDgK3NnP4opLc4o8yXLSJ/ct2sOeiiXwLQxKnIOtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=iR5wgOI4L+8eRgSSiW65P78x9wDRLYOVuOnD0qbo+Is=; b=DxQCQr24AwHbE/PxKDCSr0aVAw1j5hzEebi0Xu2a57W65E4JOMQcQDhinKPiPVVBqXwk1hTihdBWtXCVBWlDYTsevLhaTjRPNruKn4wSOS0OWAghpYANu4wggjoyDJqQMavloEtfbXYn1eZ3AVgTZ4Gqn/G1muiDSunTplaQ8f8= Received: from SN7PR04CA0056.namprd04.prod.outlook.com (2603:10b6:806:120::31) by SJ2PR12MB8978.namprd12.prod.outlook.com (2603:10b6:a03:545::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:41 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::34) by SN7PR04CA0056.outlook.office365.com (2603:10b6:806:120::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:41 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:36 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:00 +0000 Subject: [PATCH v5 03/20] x86/mce/amd: Remove smca_banks_map Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-3-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|SJ2PR12MB8978:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e817fd5-b99d-4192-837c-08dde3fd8897 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?clBWeWNpUG5EV3RPc0kwR0NQb2grNGEvTFhZK3Uxb1F6Z2V5RGtqTkdiQ1kr?= =?utf-8?B?bWdMZUdiRURkRU5VZkoxY2ltRlpXUHhWYlNEQkJlZk4wWmpJQzlhNjE0NEYw?= =?utf-8?B?UFRRSHJ0SHR3aktPS3R3NVZ5cnBFblN3OURQUU53dmcvdDBlTFZiUlg2bzFh?= =?utf-8?B?eVBSK04rOWlaZGsrdlFHOGJlV093Uy9QazEzSDZ4NkppN2dCdnRGU095em5a?= =?utf-8?B?NUMzV1YvM09YUjBuWlh2dzVzaTZZczJiK0hUUm0rOWdVQlIyc3Y4WTB6SzRU?= =?utf-8?B?UEg3aitIUVNuVW1Ibi9DMFJ0bzMwODArVTVJSTJZZEhNRmRUc3FuOHRUTUI5?= =?utf-8?B?aVJxUzR1WmdHOCt0Wnd1eWdtODIyYU1KSnRQVm9SZDBzcUhhTWFzbmZJZkph?= =?utf-8?B?T0VCdHR6V2lzWDhlNDh2bzlnMk1lZEd4Y0czUlp0VWhMRXY3cGl4VytVb0JD?= =?utf-8?B?dU8rOW5CaFNxSE9sRjJHUlFXWmNzZ0lFRU01QXN4WWRhOXcwN2VKNHBpL0JD?= =?utf-8?B?dlVHS0daZm1leWxsYUxQYXRIcEdkSFBXdGE5RDB2bkFNUXRXeXVNdnE4MEd3?= =?utf-8?B?OE5WTEp0TXA3blBxOHl0cjhLSmZHdkIxNEQrQjB1aytPN01IUjhuSDRlaU9K?= =?utf-8?B?MHJ1b0xDOWtnWGMvK3NYU1IwTWpxMlU0U0ZSQkdkMHE2MjdnR29BcjkvODUw?= =?utf-8?B?c0d4akc1eUg1UVc3UGwzUUNlT3F2YTR6U2JVMktaS0VlelhXc01OVE9EN3dI?= =?utf-8?B?Nm5qSGxWdGZUOGlKZXVYUHZYQ3ExeUc0eWxkVUFLS25lWEg3Q3hSaWF3bWFY?= =?utf-8?B?R2VnZGZnSE13T0xhYkNySVdvMDFJYzloYzhMSHVTcytNSFdBT1FFalF4MzVX?= =?utf-8?B?alhuMDNqTUJlTTBkWUFnQXBWU3hQck9YNm53cFhhUUQvUHUydzhEZytWSmtw?= =?utf-8?B?VWcvUHM3TEdXWVJ1d3NFUW1Ob0dMM216MlhoU3A3SCtXR25XN0R5MHU2Z3Y3?= =?utf-8?B?WFRvWTlMQUdZUWZwdVpQczJLNHdtNXZrNC8rUlprMDBadXFyNnNuS1NLTGxX?= =?utf-8?B?dUY4Vngzc1dPRmJMQ1FxdXJaZFZpdXVJZ3lEQnlSSVdJeGZXeGZ3UXlRTFUx?= =?utf-8?B?bXBTYlAyaVllb1ROczFMOU5lOE5RMG04ald6bmwveEswYndLbHFkOEU1TVpU?= =?utf-8?B?YkRaaE4vTEZySlR4MC9uenhORG9WNU5jQmNaMEM5S1RhcFErWHM3MzBFdVRn?= =?utf-8?B?d1NsMFQ0Z2g0cFNmVzc2MXNwekhwU2d0dVVMa1FSNU5wZEZ5SERHMGRmVE1V?= =?utf-8?B?a0ZGNXl6enpEN0Y4Z3JHVDR4SDlTOWlpSGkyWExDNjAvd2d0TUliV285RFpJ?= =?utf-8?B?MWVFOEZlZVBFaDFXUWV3amp2Um43NC9MMVR5Y3hhTU5lZGNHYzB0WTE1Y2ph?= =?utf-8?B?dzd1ZGp0c2Z1bFM1US9kYjJXTXZrR25JZEpicjhPZmsyaU9xNTh4aTBWdXRz?= =?utf-8?B?YnMzTGVaYlBxbUtUQlM5MmtHWkhmSks3Y3JUNzhmVWMwZFZQYVNuUTdORkxj?= =?utf-8?B?RW1yR3FEaFVLdVc4ZjNGSDE1MmhCL3RacVhNZ2NPS09FcFNGbGZjUm1vWXIv?= =?utf-8?B?V3NmcDVpdXQ1cGxxNmdENjk5Z2pvZlFkNTNWV1E4dVBSNWk3SVRGZWJ5dnVK?= =?utf-8?B?S1ozanBrNENzY0laRS9Wb2U4MHN2Y0xxM3RBN09LNmNrTnYwbzlpMjZjRU1T?= =?utf-8?B?Tnh2TittUWU0cWJmK1RLZmROZjBTRDJzcGYyODJ5M0QrOHZiTXdSN3c4M1E1?= =?utf-8?B?dnlqUEQ1TXZhL3Z6c2ZSZm5PUjkwbDNqS2dDSW1KbUdvaUpNNncvT3VORGl1?= =?utf-8?B?WmlGN0xjY1dCRGdwdG1kVVQ5c3JVTURiNHZyVHlyWGc4UTNUQjRDUU5HZlda?= =?utf-8?B?VW9vM2pxSWNQU005dnIxVXMra3BsZHcweUFUVUMweDNmZ2dJK0ZFZWJmdnlN?= =?utf-8?B?ZVVTWlRYbU1NSTdGQXh0dEIxT25YcDlGaG43bmVneWtFTEJjL0hmSWhsTEFO?= =?utf-8?B?Y2VTME1TM1FhLzhwdVJ4WU1WT2U0VFB4eTZwdz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013)(13003099007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:41.3687 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e817fd5-b99d-4192-837c-08dde3fd8897 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8978 The MCx_MISC0[BlkPtr] field was used on legacy systems to hold a register offset for the next MCx_MISC* register. In this way, an implementation-specific number of registers can be discovered at runtime. The MCAX/SMCA register space simplifies this by always including the MCx_MISC[1-4] registers. The MCx_MISC0[BlkPtr] field is used to indicate (true/false) whether any MCx_MISC[1-4] registers are present. Currently, MCx_MISC0[BlkPtr] is checked early and cached to be used during sysfs init later. This is unnecessary as the MCx_MISC0 register is read again later anyway. Remove the smca_banks_map variable as it is effectively redundant, and use a direct register/bit check instead. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-7-236dd74f645f@am= d.com =20 v4->v5: * Keep MCx_MISC0[BlkPtr] check to be compliant with uarch. =20 v3->v4: * No change. =20 v2->v3: * Minor edit in commit message. * Added tags from Qiuxu and Tony. =20 v1->v2: * New in v2. arch/x86/kernel/cpu/mce/amd.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index f429451cafc8..580682af432d 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -252,9 +252,6 @@ static DEFINE_PER_CPU(struct threshold_bank **, thresho= ld_banks); */ static DEFINE_PER_CPU(u64, bank_map); =20 -/* Map of banks that have more than MCA_MISC0 available. */ -static DEFINE_PER_CPU(u64, smca_misc_banks_map); - static void amd_threshold_interrupt(void); static void amd_deferred_error_interrupt(void); =20 @@ -264,28 +261,6 @@ static void default_deferred_error_interrupt(void) } void (*deferred_error_int_vector)(void) =3D default_deferred_error_interru= pt; =20 -static void smca_set_misc_banks_map(unsigned int bank, unsigned int cpu) -{ - u32 low, high; - - /* - * For SMCA enabled processors, BLKPTR field of the first MISC register - * (MCx_MISC0) indicates presence of additional MISC regs set (MISC1-4). - */ - if (rdmsr_safe(MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) - return; - - if (!(low & MCI_CONFIG_MCAX)) - return; - - if (rdmsr_safe(MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high)) - return; - - if (low & MASK_BLKPTR_LO) - per_cpu(smca_misc_banks_map, cpu) |=3D BIT_ULL(bank); - -} - static void smca_configure(unsigned int bank, unsigned int cpu) { u8 *bank_counts =3D this_cpu_ptr(smca_bank_counts); @@ -326,8 +301,6 @@ static void smca_configure(unsigned int bank, unsigned = int cpu) wrmsr(smca_config, low, high); } =20 - smca_set_misc_banks_map(bank, cpu); - if (rdmsr_safe(MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) { pr_warn("Failed to read MCA_IPID for bank %d\n", bank); return; @@ -525,13 +498,12 @@ static void deferred_error_interrupt_enable(struct cp= uinfo_x86 *c) wrmsr(MSR_CU_DEF_ERR, low, high); } =20 -static u32 smca_get_block_address(unsigned int bank, unsigned int block, - unsigned int cpu) +static u32 smca_get_block_address(unsigned int bank, unsigned int block, u= 32 low) { if (!block) return MSR_AMD64_SMCA_MCx_MISC(bank); =20 - if (!(per_cpu(smca_misc_banks_map, cpu) & BIT_ULL(bank))) + if (!(low & MASK_BLKPTR_LO)) return 0; =20 return MSR_AMD64_SMCA_MCx_MISCy(bank, block - 1); @@ -547,7 +519,7 @@ static u32 get_block_address(u32 current_addr, u32 low,= u32 high, return addr; =20 if (mce_flags.smca) - return smca_get_block_address(bank, block, cpu); + return smca_get_block_address(bank, block, low); =20 /* Fall back to method we used for older processors: */ switch (block) { --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6C123002A2; Mon, 25 Aug 2025 17:33:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; cv=fail; b=s1R9ezcscHe8jovBMi0UuptBEP7DFfYHw9D7+i9GVrEXw9d7jtFXQTuAozMAC2u6jod7bIU/DUdA/P1bBDks9RzfK4T/3FKbDJDCnX1VwdxVzkvi84oD9ur+rWmLnZRwqqWRThSqrMsyOh4a2xuxr62hHjqmKejFl+T8Ui/w5IE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; c=relaxed/simple; bh=DfP5K+6RX+JQF1o165IRVuwIS5FiaycyGhyvXgXi5AI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Rq8oyaoJpw50CWURv1uZGms/XsVLeM8iks8mEQOC9LKsYBdF6IF1YMKg43ulSrkO4xcM09zGP7qwCQAzsYRD+WHz4/yWk9Ppgxclaq2HC9W7dGLWiGoxDLci9guFmfYbBdrbropVHW5Q9P4FCM0Il1TDwMMD+SZkDtfc9MAU90M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=cI+CggbY; arc=fail smtp.client-ip=40.107.94.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="cI+CggbY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YU8/JTEtGnLyraaFu/B2anhAZZRTk4wt19d4dMiZjmHGMej2aTPNdBtUHZqmfqGagFnDDTd7JiyVOY/fzBdaeita9mfwC7PUhHJD5SRzXOvU4LURWxUqGwxGSY28RKCYre+klxkNffRIV0oRtmlmHqMrx0qAa2wduLKwLQmqq+ps7x+XHnk9AYIQrC0dumqdMatbJ+RTeBnGDnblq6A2vZ+uCXD+tUAG5HDpq/MMG7ED4DG7vxrkEE1gKtYPllqlSDldcm9dov3ynOYerfqpvSVvYSG2AUuuQGTp07AUOuEsir52tD3+lHcMCGDpbuMhNdT2KMETiC/ZTHTByr+5bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NizmtGAK7zyYnTw+XyGDzjPs3XeTnttCY9qlce4ojz4=; b=sLJ+UUP2ri4e6rVwwUsmlfsvcyJU3G8xloo4oBuHppWH20uqzc1m/BGqNlI0yGgK3uhxXMRys/1ffbWmhdfO8iy1PD5lbMinbPUrTGS9/2Zt6/KiGI6iKIAsA80cxPH6ZBw5iAs79XeZgFvd6W6EI+pKOuK1qf3QRqHnkcnODuU/0H+4oYVcoDq/24cmPc948xB6lDovHJoZVi5rQJvG+gbuJThaWKIjB0fgzMqo5o0vrJ1VzBDHwXjKLKbadibfOMHbQiMwIjnkl8fAYtEvpUag1NT0hm/y4W59Fg0373J6ar1nBdp+tcLZw5mwLq7ckeViBwuWs8Hjdle0iPJBew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=NizmtGAK7zyYnTw+XyGDzjPs3XeTnttCY9qlce4ojz4=; b=cI+CggbYCPR2qFHkUzo/R75yK300qq9IFDQNHU3grGu1ngod1UZ6TamoVOwl09WGKrPB8Y3YaAb2D/gTfC96lKH0VJsdIzbdYFUsJhJxImSPaPsBx2hr9YQQ1CVzTcfE9ZOt9g5paNmqXCNCVgBMUaRyUtnLCI7uo6FUALiDCzU= Received: from SN7PR04CA0058.namprd04.prod.outlook.com (2603:10b6:806:120::33) by IA1PR12MB6555.namprd12.prod.outlook.com (2603:10b6:208:3a1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.20; Mon, 25 Aug 2025 17:33:44 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::a) by SN7PR04CA0058.outlook.office365.com (2603:10b6:806:120::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Mon, 25 Aug 2025 17:33:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:42 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:37 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:01 +0000 Subject: [PATCH v5 04/20] x86/mce/amd: Put list_head in threshold_bank Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-4-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|IA1PR12MB6555:EE_ X-MS-Office365-Filtering-Correlation-Id: 01adc928-8df6-444d-12a8-08dde3fd8987 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?L24xc1dQRDQwNTVoN2xBeWxmN05oeDJnRXFaazB2cFR6K01lVkNBMjdYNlds?= =?utf-8?B?bUxCWEJuYXEzL01SVllhVEJPZkVRUm00VGlNWHF0Q0hBbGVadWRtdUJCbEMy?= =?utf-8?B?bnE2T3c2WXZEUTFMTUxNcWc5cXFSZUV4dURiaHhnZVE2WUJuMEdYRDFBSFBE?= =?utf-8?B?OTBtRCtQcVY1ZThYbGVhSHJHZ0hRTU93TzRHTWJRSG5rMFE1bGF3dDlDN0lP?= =?utf-8?B?dkIxczdEVy85NGxhSEVTNHZsR2ZURmpRNVVaTHhRQWtBUFBONHhkeUZjRU5o?= =?utf-8?B?ekc4TTB2MjEyNnprRkpjcEl3enZ2Mmt2SG1FWUh2UGd2ZDJrakkxOGFzamlt?= =?utf-8?B?ejlTZTE1V2ZGSXdrMWdkWnVwYnM4ZVByUzlqS2prN3NnMHA2RzZmZElwTmlz?= =?utf-8?B?MUt3SkRDa1RPNWo2SXVVbStnYXcyZ2l1OVNzdEx4SERXQXlKZis2QjVBOGd6?= =?utf-8?B?ZDJ1ZjY2M0RtcmxFTmJTNGs0eXB6ZDhsZUJsSE5xY2xZQ1h2UkhjMk85WTNk?= =?utf-8?B?amRXSHI2dEYyZ2cxWVBWaXZDenRISUl1bDhRS2FXWXNib1ZjN3RXOFgxcU5z?= =?utf-8?B?Y3MzWmhWdHRnRVcwdVB1SVByRUtSMHBHbGhDZlQydnZmMHh2UVJvZnB5Ti9s?= =?utf-8?B?R01Tb0o2d29XS0lLcnh2Q214K1VlK0gxSndrQjFrZWZ5TG5sMXJ4QS82NWVC?= =?utf-8?B?eHl6ZXgzTDRrc0tMOTZpdXp4THZtN3dMTXZiNnBVYXN0eXJLSThlaEVjbkpy?= =?utf-8?B?cmNnNWJtMlJuL2QxWmlBMkxGdm9TOTVpZnQvS09aN1FGZklnV2draHZDUWha?= =?utf-8?B?YXdBcU9mUy9iSnpBbE5nY3pXK2VXNDdQbklQZXhzdWZ5NnVGQ1h0SGM5cW43?= =?utf-8?B?Yi9TalFyZm51MHZCYTljREMzYTVEZmpqWVJzTVhSOXlDT3NyenFubWhLOUJp?= =?utf-8?B?S0g1cm5valpiUlQxNWRBNWdORXYvdWg1NG93S3BXUE0wUjdieHBidDZoTFpI?= =?utf-8?B?VGdjRmxBL3RVSlEyTmxxYTFxSlhrNHErRkZyczJPYXZ6S1dzNkVMUVlpL09n?= =?utf-8?B?MzdqYnNHT3gxWDNjTVRzOXRUNHpSWHJSSXAwYWxmOXAyRmRkcHJHbkZVMnBw?= =?utf-8?B?clJJcXJVMFlhQ1N4VmFrdWgxTHBEYWp2T3lnUzlNWHY4aUdLNGxXWXhia1hW?= =?utf-8?B?Q0dsVEpZZUxIczJNMW0xQlNjZ0hISlRVSFVDZ2RFck5OamozbkJsNUNqeFh1?= =?utf-8?B?RnhFZFNQRFd5UHdteEo1dXVqVzR3My9rVHh6LzNTVmQ5ZUF1d3M0V1cvdWR1?= =?utf-8?B?NXhxMWI2eFBoeGs3RGZlS1hESmt1NnFmS0JxdmdXNStMczd2Wm0wREVEV2VH?= =?utf-8?B?UUUzQXkwMDZHbjRQSU82dEJLalFXYmh4Yjdod3R1a3JzaElscXdiMlBWU3FM?= =?utf-8?B?RnlUVjQxY21Nb1h2dmlXTWs0YVp2QU5XN3NMRVhucFBmVHV6KzVmenREbzlk?= =?utf-8?B?SlBVNUR4RzBtdUkyN2R3ZEVzNDUxU0l1MWNyL2JVTFYwQjUvcXVCeVMvb3Bt?= =?utf-8?B?b2FnV0wzYXR4c1FoSDc0MkdHZWhpV1o3UXNDaVBGL0EvblJoZWlDbXVXU3dB?= =?utf-8?B?enQydFozUmxHMm5seVJsQzdjUFRrQXlVUTJ2ZHA1dVUwNVJ0RE9DWERWcDYr?= =?utf-8?B?d1NnQ1g0Tm1pRm1FelV1M1I3Wkh4MDhsQS9kK2Z5RGYvMHVjVzN2UnRkQk1l?= =?utf-8?B?Uk1NTS83M09tSHVGcWV1aG5BbEgyVjczMWFJOVZrbGZraUVoQkNZS05CTXJo?= =?utf-8?B?UFBYK0F6R3BwUitESU9OOUNrTW84VkUvY1AwSjN6TUV2OEpaS2FjbGVZNmtn?= =?utf-8?B?anprOGtCNElsSlV6WENWb1ozZm9XTnZPc3VMVEhOc0R6N2VhL0g1anA1N1ZB?= =?utf-8?B?bG03eFUvTkloM1lsVEZNK09UTmkyckNCNmJvM25LZUR6RGtpTm5NOGJ0azk1?= =?utf-8?B?UGZ3THVuTjh6VHRXL0trdGVsa3RweS9KSGFyV1NVNEt6SkdOR0ZJS0VpQy9k?= =?utf-8?Q?GJXgH+?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:42.9386 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01adc928-8df6-444d-12a8-08dde3fd8987 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6555 The threshold_bank structure is a container for one or more threshold_block structures. Currently, the container has a single pointer to the 'first' threshold_block structure which then has a linked list of the remaining threshold_block structures. This results in an extra level of indirection where the 'first' block is checked before iterating over the remaining blocks. Remove the indirection by including the head of the block list in the threshold_bank structure which already acts as a container for all the bank's thresholding blocks. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-8-236dd74f645f@am= d.com =20 v4->v5: * No change. =20 v3->v4: * No change. =20 v2->v3: * Added tags from Qiuxu and Tony. =20 v1->v2: * New in v2. arch/x86/kernel/cpu/mce/amd.c | 43 ++++++++++++---------------------------= ---- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 580682af432d..54f02bda75aa 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -241,7 +241,8 @@ struct threshold_block { =20 struct threshold_bank { struct kobject *kobj; - struct threshold_block *blocks; + /* List of threshold blocks within this MCA bank. */ + struct list_head miscj; }; =20 static DEFINE_PER_CPU(struct threshold_bank **, threshold_banks); @@ -902,9 +903,9 @@ static void log_and_reset_block(struct threshold_block = *block) */ static void amd_threshold_interrupt(void) { - struct threshold_block *first_block =3D NULL, *block =3D NULL, *tmp =3D N= ULL; - struct threshold_bank **bp =3D this_cpu_read(threshold_banks); + struct threshold_bank **bp =3D this_cpu_read(threshold_banks), *thr_bank; unsigned int bank, cpu =3D smp_processor_id(); + struct threshold_block *block, *tmp; =20 /* * Validate that the threshold bank has been initialized already. The @@ -918,16 +919,11 @@ static void amd_threshold_interrupt(void) if (!(per_cpu(bank_map, cpu) & BIT_ULL(bank))) continue; =20 - first_block =3D bp[bank]->blocks; - if (!first_block) + thr_bank =3D bp[bank]; + if (!thr_bank) continue; =20 - /* - * The first block is also the head of the list. Check it first - * before iterating over the rest. - */ - log_and_reset_block(first_block); - list_for_each_entry_safe(block, tmp, &first_block->miscj, miscj) + list_for_each_entry_safe(block, tmp, &thr_bank->miscj, miscj) log_and_reset_block(block); } } @@ -1153,13 +1149,7 @@ static int allocate_threshold_blocks(unsigned int cp= u, struct threshold_bank *tb default_attrs[2] =3D NULL; } =20 - INIT_LIST_HEAD(&b->miscj); - - /* This is safe as @tb is not visible yet */ - if (tb->blocks) - list_add(&b->miscj, &tb->blocks->miscj); - else - tb->blocks =3D b; + list_add(&b->miscj, &tb->miscj); =20 err =3D kobject_init_and_add(&b->kobj, &threshold_ktype, tb->kobj, get_na= me(cpu, bank, b)); if (err) @@ -1210,6 +1200,8 @@ static int threshold_create_bank(struct threshold_ban= k **bp, unsigned int cpu, goto out_free; } =20 + INIT_LIST_HEAD(&b->miscj); + err =3D allocate_threshold_blocks(cpu, b, bank, 0, mca_msr_reg(bank, MCA_= MISC)); if (err) goto out_kobj; @@ -1230,26 +1222,15 @@ static void threshold_block_release(struct kobject = *kobj) kfree(to_block(kobj)); } =20 -static void deallocate_threshold_blocks(struct threshold_bank *bank) +static void threshold_remove_bank(struct threshold_bank *bank) { struct threshold_block *pos, *tmp; =20 - list_for_each_entry_safe(pos, tmp, &bank->blocks->miscj, miscj) { + list_for_each_entry_safe(pos, tmp, &bank->miscj, miscj) { list_del(&pos->miscj); kobject_put(&pos->kobj); } =20 - kobject_put(&bank->blocks->kobj); -} - -static void threshold_remove_bank(struct threshold_bank *bank) -{ - if (!bank->blocks) - goto out_free; - - deallocate_threshold_blocks(bank); - -out_free: kobject_put(bank->kobj); kfree(bank); } --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2053.outbound.protection.outlook.com [40.107.93.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B454B30748E; Mon, 25 Aug 2025 17:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; cv=fail; b=Tbg3PiIJh+lSciEaR8XABXJQNBIPKGGRo47EN85zAM/qyZ/Q0PFmoyOVt5WH//vqka7hImyQFSKss9LeRqCFaLCkzH3YNSnGj/QjMZb8TDZPhhZMXfdV2lAwr1Vpy/4ocRri6VggbV96PhqIts27hJgQNFaQl40g74ZFx63Swk8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; c=relaxed/simple; bh=LUo3e5vIFTUc7ojHrrgDLZzQ69UoOy2bZvGjlUISq58=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=C4s8lDAIDbMP0TYJ7P8q2LlF3H/dEjz1xfBCQyBU7+De8AoB/84KacpcRUy/F9lICYk8peFaAgqAvUI81zS0ZNUbVwheNf1TtQdvlUCZwS6lcJhR6jxg4ad1q+P0/f3nc52j9JqtqH3i61+1e0TmH1y+56SMCm/CGiu4d5B7sI0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ykqOL5Bi; arc=fail smtp.client-ip=40.107.93.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ykqOL5Bi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aeeg/NBrYIW5jkwOImPcgaLlGbX2xs3aWKNQRgsaucDwh0PtINa8qsoQMrqXVe5IseteRJHv6C4XrbTg2/686CyFqARfbb0oIgobQLHumRXmQB3UV8rGJTCjuTazahSmIshIlqdm87HYFoEXLwE3xZN39dK1T2nYOYcxHjnd69I2BZZIWJeyGCwMBnIaZl2z99PDMpGqkFs+YzpRKBfYR8GkmPbrw5tfvUAOqMcKkH1OxiL5tzSmlabiT5zJLS9AvSBM5Y47pwOK8ieZO9elRSWTCWQEgrXYVy0kBT9TiOVzYSoaLZ111h1uQteGmXPiTr81PSqpQzgB38ptKCQB1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l5FPuPnSpExTj3Z886hf3Or8YI589t6WXUl8WXYufro=; b=Qql2YtC7wq7ea/FmJZ8oiGzTjRjEW8iAZP6muMrDl86GQtkFLYA4CEy/oh/awsrO3YqcXXR7lXGnPkv+uIYR1NVC5y2grSa9eXEU/9T2mWiotMRBwHtnjojZr3r9t57VFQAMzmT9LmFOpgNnRFw4SsAOd9FMzYCVn0IywHIyEpmNkWwQ0QtnFdj+R9f4nt3xaGrdgNqKtlrnRfp1hrnrTLxysFFzt5dVv3EqTec5ZILKT+FyQqXVMKHjEVg8g/tEXcVtbUh9i5/eTmI4AT3rdTcErB5YxEGfPKCWSNw6fTOzn5zEcpD0+kD3ZeNjhcX6OJCUT/zZtjbd+FEOoDen6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=l5FPuPnSpExTj3Z886hf3Or8YI589t6WXUl8WXYufro=; b=ykqOL5BiOoh4ppGcbCZ5ed8eRQQP/5QfLWQH8HUm8VEZ4doza2CFQ79/sC+iBtPglgS5sCfEktcrcCpkXkh66MQMW4OSkvieRsgNCY7uZxYz8P85GZgC/rCXU+MJFa0lAT5xHu5w0Gw18QNMqPXKxH3Izo66uBsopFNNKTuITug= Received: from SN7PR04CA0045.namprd04.prod.outlook.com (2603:10b6:806:120::20) by CH1PPFF5B95D789.namprd12.prod.outlook.com (2603:10b6:61f:fc00::62a) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.24; Mon, 25 Aug 2025 17:33:45 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::dd) by SN7PR04CA0045.outlook.office365.com (2603:10b6:806:120::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:44 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:38 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:02 +0000 Subject: [PATCH v5 05/20] x86/mce: Cleanup bank processing on init Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-5-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|CH1PPFF5B95D789:EE_ X-MS-Office365-Filtering-Correlation-Id: f8c8f79d-7eb0-4702-a729-08dde3fd8a48 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?YVYxVzREbE9aZWF2NzJNWTJ4eFVoQ2svQ21veTdjdGg4VEhTUUMrSDk0a2tn?= =?utf-8?B?Tm9yczZ2TDlCK1BhYWJLWE5vTXFFa01naXhiMllCdENET2o5YmxHTVAxdXlK?= =?utf-8?B?R1VuL0l4WHh1dWZiV3pDSlJBZHU2bHRqOWpLZHYxbHdSVU5FRHJDTXhLOGRV?= =?utf-8?B?Yjlxckppd1Z0MzRHNTBMWjlVV2s0aXQxaVZESDZEcEsxQjNQUUkvOG9VSWU4?= =?utf-8?B?c0FLTzErUkNpU1RGL3p0bXhaRC9FdkZ6d3UwOGxkOWFqc1hZRHFwYnBZTjln?= =?utf-8?B?eGpFcitqY0ZBenhpVmJZRFpCM2JjYlF0bFdCei8zWGluNlRTcW95WWp6UDgv?= =?utf-8?B?dWlZMEg5REptV0I1OG1YcmdyUGR6WFBteDJVUHRoTHZ2S2RMOHZqUjZEMUN5?= =?utf-8?B?cWRGY0t5M0U5Zm1WQzFhSjd2YXY0V1VPSGV4eEVNR3ZqTGVIaU4zM3YvNTV4?= =?utf-8?B?TFYrV24yRld5NCtZZkZKN3EwTlhvSzFuY2c2WFppNk5qU2tSUmZCVENnN0lW?= =?utf-8?B?RUpzQXRETGgxaGJiWmQ0WDY3b000QWlsamZ0ZUF3ZWxJbnMyM1RPaElkKys5?= =?utf-8?B?M25uWUFKUWFhc2xrSXpKbU84Z1pkWEw5TU9XdGFVOG5pdjBTSVZJbmg0OGdt?= =?utf-8?B?b3drdmpUL0w3N3hHQlVsWUFnVGVoeGZDU3RmNFRqKytnZlJCUjNZelZrMFFj?= =?utf-8?B?VHMvNEM1R3BvUnB2WnRZTjVVQUhHQW5RMm90eEhpc0tNVE9HWllqRk1YeEk3?= =?utf-8?B?YTRVeU5keGVERUl2RjlGM3gzRXgzRG1raWt0UUVSVHpMbXhxNUExL29rL3NF?= =?utf-8?B?K3hjZDdOamNMNVZRZmsrRjNXbnJZZGNPZnhGVnE0RzlscjBicnRXWERPRjhF?= =?utf-8?B?L1NUcFlwV1BJZzV0enlPUkRuRTgvNFppa0ltSXFob0pTSHZFMGlSdFByZkVu?= =?utf-8?B?Wlc1a0dKZGFvV1dHUHRIc1lJWFpNb2VnZGpnWmJIcFdIc2hTTUxPdW82SHVG?= =?utf-8?B?NXdCeE85Y2NjQ2d1aFRGUUkyOEtsbDZCdXhJUzdYMG1USVgwdVVoSW5udmdJ?= =?utf-8?B?eHA2N1hpUWRXNThZUzBUMEgxc041dkNwNzBtMGNYOUNOY1JZbjhKVEoydVRh?= =?utf-8?B?UXhEdE5ibkM2bmF5LzMvNzBmMmVGTWtIRHhBTjV0MWk3Q3VMVW5jajdBVDFF?= =?utf-8?B?ZzNSV1I3UlJsaXlHQW1GMGV6cVJpRmp3NkZlRzJnVW9ZZFpsQnhNOTNCNWdy?= =?utf-8?B?VzBIdjdVOTV4QlZ6NVNQdTlHcHdPQmF3QkJYMG5IZzY2LzEzMzRmVkxlNXZw?= =?utf-8?B?U0ZsWkNpdTJuUGJxYW5UaEc4SU05U0RabUtlMldzZkxCWTlWMXY1UitmVk5Q?= =?utf-8?B?UWpGNDNLZU5oNXV3RE1ETFVXd3pIWDJTU3ZYdHk3YnpRVzNZcDltZkpvUExu?= =?utf-8?B?djZVZFVPTnlGa2lMWGZqVnd2TCtxRXBYWldOVzhpTGR6WmRVWnkxN3UxVmZ2?= =?utf-8?B?aFBjQWFqelg2NG01K0tmTVlMaTd2cW5MQmVlanE4MlFtMkIvdVlMZXdRenhI?= =?utf-8?B?YS8vUzRMVU5oNUVOQU1EbjRoQmV5NUNnaERzVEFiVlgzRmd3cFNWckk4TXdq?= =?utf-8?B?QjJCdFFUODhJY3NHRTR6NzZvMHVkNDdidFFMcndTcUNTTktNRnpPNktaTmE1?= =?utf-8?B?ellJbk1EYklSa1RtQVQ0MjNqQmYyVXRuRHV0TEJWR2lZcXpBTW5oM25TNVE4?= =?utf-8?B?ZUJpQlZsb0lwMmY2d1Y5SEQ1VUZpdnJzQnF5c1JQNnNEOXVLaWxMbFRNL1NL?= =?utf-8?B?TUh3VW8vYTMwYzUzd3czSEJ0R0hGUm04azdjSW5DaVlpM210dDJTRHVQMVNq?= =?utf-8?B?dzZodGZ3UGFJMUNHeDlYWVU2VlZMaElZT0piN0dCSm9WSFltSitIRGUxUUpp?= =?utf-8?B?L09CaVJxUFlvT0x3aGhWKzJ2WG81akZJRUdlWU9PbnVWN1BGek9teUpKTm43?= =?utf-8?B?S3J1eFJEUm1pOFRpUXY1VnV4aTFyTzNCN3hxR1BURjJ6bHJhdGVDaGM0ZGxH?= =?utf-8?Q?doGDj/?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:44.2068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f8c8f79d-7eb0-4702-a729-08dde3fd8a48 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH1PPFF5B95D789 From: Borislav Petkov Unify the bank preparation into __mcheck_cpu_init_clear_banks(), rename that function to what it does now - prepares banks. Do this so that generic and vendor banks init goes first so that settings done during that init can take effect before the first bank polling takes place. Move __mcheck_cpu_check_banks() into __mcheck_cpu_init_prepare_banks() as it already loops over the banks. The MCP_DONTLOG flag is no longer needed, since the MCA polling function is now called only if boot-time logging should be done. Signed-off-by: Borislav Petkov Reviewed-by: Yazen Ghannam Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-9-236dd74f645f@am= d.com =20 v4->v5: * No change. =20 v3->v4: * No change. =20 v2->v3: * Update commit message. * Add tags from Qiuxu and Tony. =20 v1->v2: * New in v2, but based on old patch (see link). * Kept old tags for reference. arch/x86/include/asm/mce.h | 3 +- arch/x86/kernel/cpu/mce/core.c | 63 ++++++++++++--------------------------= ---- 2 files changed, 19 insertions(+), 47 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 752802bf966b..3224f3862dc8 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -290,8 +290,7 @@ DECLARE_PER_CPU(mce_banks_t, mce_poll_banks); enum mcp_flags { MCP_TIMESTAMP =3D BIT(0), /* log time stamp */ MCP_UC =3D BIT(1), /* log uncorrected errors */ - MCP_DONTLOG =3D BIT(2), /* only clear, don't log */ - MCP_QUEUE_LOG =3D BIT(3), /* only queue to genpool */ + MCP_QUEUE_LOG =3D BIT(2), /* only queue to genpool */ }; =20 void machine_check_poll(enum mcp_flags flags, mce_banks_t *b); diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 4da4eab56c81..311876e3f3f4 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -807,9 +807,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks= _t *b) continue; =20 log_it: - if (flags & MCP_DONTLOG) - goto clear_it; - mce_read_aux(&err, i); m->severity =3D mce_severity(m, NULL, NULL, false); /* @@ -1812,7 +1809,7 @@ static void __mcheck_cpu_mce_banks_init(void) /* * Init them all, __mcheck_cpu_apply_quirks() is going to apply * the required vendor quirks before - * __mcheck_cpu_init_clear_banks() does the final bank setup. + * __mcheck_cpu_init_prepare_banks() does the final bank setup. */ b->ctl =3D -1ULL; b->init =3D true; @@ -1851,21 +1848,8 @@ static void __mcheck_cpu_cap_init(void) =20 static void __mcheck_cpu_init_generic(void) { - enum mcp_flags m_fl =3D 0; - mce_banks_t all_banks; u64 cap; =20 - if (!mca_cfg.bootlog) - m_fl =3D MCP_DONTLOG; - - /* - * Log the machine checks left over from the previous reset. Log them - * only, do not start processing them. That will happen in mcheck_late_in= it() - * when all consumers have been registered on the notifier chain. - */ - bitmap_fill(all_banks, MAX_NR_BANKS); - machine_check_poll(MCP_UC | MCP_QUEUE_LOG | m_fl, &all_banks); - cr4_set_bits(X86_CR4_MCE); =20 rdmsrq(MSR_IA32_MCG_CAP, cap); @@ -1873,36 +1857,23 @@ static void __mcheck_cpu_init_generic(void) wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); } =20 -static void __mcheck_cpu_init_clear_banks(void) +static void __mcheck_cpu_init_prepare_banks(void) { struct mce_bank *mce_banks =3D this_cpu_ptr(mce_banks_array); + u64 msrval; int i; =20 - for (i =3D 0; i < this_cpu_read(mce_num_banks); i++) { - struct mce_bank *b =3D &mce_banks[i]; + /* + * Log the machine checks left over from the previous reset. Log them + * only, do not start processing them. That will happen in mcheck_late_in= it() + * when all consumers have been registered on the notifier chain. + */ + if (mca_cfg.bootlog) { + mce_banks_t all_banks; =20 - if (!b->init) - continue; - wrmsrq(mca_msr_reg(i, MCA_CTL), b->ctl); - wrmsrq(mca_msr_reg(i, MCA_STATUS), 0); + bitmap_fill(all_banks, MAX_NR_BANKS); + machine_check_poll(MCP_UC | MCP_QUEUE_LOG, &all_banks); } -} - -/* - * Do a final check to see if there are any unused/RAZ banks. - * - * This must be done after the banks have been initialized and any quirks = have - * been applied. - * - * Do not call this from any user-initiated flows, e.g. CPU hotplug or sys= fs. - * Otherwise, a user who disables a bank will not be able to re-enable it - * without a system reboot. - */ -static void __mcheck_cpu_check_banks(void) -{ - struct mce_bank *mce_banks =3D this_cpu_ptr(mce_banks_array); - u64 msrval; - int i; =20 for (i =3D 0; i < this_cpu_read(mce_num_banks); i++) { struct mce_bank *b =3D &mce_banks[i]; @@ -1910,6 +1881,9 @@ static void __mcheck_cpu_check_banks(void) if (!b->init) continue; =20 + wrmsrq(mca_msr_reg(i, MCA_CTL), b->ctl); + wrmsrq(mca_msr_reg(i, MCA_STATUS), 0); + rdmsrq(mca_msr_reg(i, MCA_CTL), msrval); b->init =3D !!msrval; } @@ -2314,8 +2288,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) __mcheck_cpu_init_early(c); __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(c); - __mcheck_cpu_init_clear_banks(); - __mcheck_cpu_check_banks(); + __mcheck_cpu_init_prepare_banks(); __mcheck_cpu_setup_timer(); } =20 @@ -2483,7 +2456,7 @@ static void mce_syscore_resume(void) { __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(raw_cpu_ptr(&cpu_info)); - __mcheck_cpu_init_clear_banks(); + __mcheck_cpu_init_prepare_banks(); } =20 static struct syscore_ops mce_syscore_ops =3D { @@ -2501,7 +2474,7 @@ static void mce_cpu_restart(void *data) if (!mce_available(raw_cpu_ptr(&cpu_info))) return; __mcheck_cpu_init_generic(); - __mcheck_cpu_init_clear_banks(); + __mcheck_cpu_init_prepare_banks(); __mcheck_cpu_init_timer(); } =20 --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2080.outbound.protection.outlook.com [40.107.212.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06D4D30748F; Mon, 25 Aug 2025 17:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; cv=fail; b=a7aKLjbfjb+7KjYMEvwAmI/nc88VDVRXByqOpFDPOnjaPoihKkEyYmmxc76QZxBYvWMjJBuQ+Xi9qJXlK7+QqINHybqtS/QJZJfUvn12xKim/+a7okLXZw6M1w2HG1bXNiVbj3IKvX4pf9VwBOlClY4xzDC0oFATtBVgm5if1gw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; c=relaxed/simple; bh=KhT/kD2OTCfeVclVPHmo2IgHZ8Os7VjuUBMuTZhH+3Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=da5Zvkbc1FqxoN+A/ADnb1S6D0GgdJ7vmVeJYr3YW0xrgZYAT7VO7TCOxacl5OVKh5HcfdieWkvP+fUXC2BPqicszRvR6QV2Qc3olrYq/ROQ8ANZrd6NCp2ZLg4G5QHxGfcjrhY0zaEZ/4Tw2ZGeaJ5siYGaqGwaDYrE6YZQZBc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=uGNn1oXX; arc=fail smtp.client-ip=40.107.212.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="uGNn1oXX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GPHmAhwmBUJO+DOFN7MWYuMT9uQOvIBQJhInvcWhcjTJF1aDmARz1rWyKzQGISA0A0ytCYqv0mOu6S6PkkMsWAnK7jdn/uYUeB75gN7T3ubn3rvI+0aLn3RmdFocuHkRYE4IGify5hE9ewENeqWgYZIEQHKlJumIoho+RqlbvedqcyuISrNg0IKNxI8BQouXhoDUGVZH4LeSMpllJDVhN5sgWUU20xWLPVY4OMjtyf7E0xdAi+TMFXWo+PmZwrJrpNFJMiLV9cYaUdbbgcnc2S5iDi/ka25WnBj5x/x6JFkf9cJQ3aXE6++FEJ9y/ae3I62q4P4GiaUs67eshxHq7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iVN59JTS2flafklL/byRQ4/zbBQ9zlvhjHsBpiroudM=; b=qQYmJdaeumMqGJCe5pnUZrZ2Epn/JpJ1gbCbMXJa4WGU2FJeH9Dbhg59M5XG8jWA31/Mq6Myqkdi0REaBfk3X7CECNTbryqYigcw5IE6kNMTNq6cKG2TJnJJ6D05PICMnGKRdzyeKbnjriYIxCaLzecz4cFEkZSGZCQTBedzZgMYQ2F9W/ezgkQP6LBy6PcD6EaTO4GwJMmWgoPPQCNwqu7AjQ/ZU+y3TCB5BnexwGHm/EtDQlbn5g5bhvErOIisaGT73YO269TJpInE4guEIg9rTMH6XSRChgZM9I3HIEMhYlhD1cA66AW0NFhaMbJp8mmNk5Yxw84lHWnpf6g69w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=iVN59JTS2flafklL/byRQ4/zbBQ9zlvhjHsBpiroudM=; b=uGNn1oXXIxPgxzGBqpFmoigL616b2dGE40+utAdHwQyap1hcxkSugbQmu4Snh7L7hWdqWxLw8qteYlxDrFVLFIZl5j939xS2BLiU1twPti3Ss314BqHJXArXKwslvwokUOHZZLNgM6T6jQ9a0WlLaGJX15X1zs3ZWzwu8bJ1LU8= Received: from SN7PR04CA0043.namprd04.prod.outlook.com (2603:10b6:806:120::18) by SJ5PPFABE38415D.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::99e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.24; Mon, 25 Aug 2025 17:33:44 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::1c) by SN7PR04CA0043.outlook.office365.com (2603:10b6:806:120::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:44 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:38 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:03 +0000 Subject: [PATCH v5 06/20] x86/mce: Remove __mcheck_cpu_init_early() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-6-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|SJ5PPFABE38415D:EE_ X-MS-Office365-Filtering-Correlation-Id: cd3f8565-9d2c-4cba-b9ac-08dde3fd8a9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VnFxSC9mNFhpSXkvVk5KTWpZUGxIU000QTRwSEtkWFhXYWZvRHNaVkhTVmxo?= =?utf-8?B?Z3JVV1BIZkp6cWNtZXF0dk5ZZXFmOXJwTFZ3SjJVdEJySjlGK0E4cDFIaURj?= =?utf-8?B?ZXBPNGFxM0grR1JlemtTQkdZdlNxMC9wVTQyZEVTOFZLKzdBNFBiNHdzYlla?= =?utf-8?B?ajdINWEyZ0c3WUtDK05WazBZSjNObEh3ZG1vdTB2LzBGT1huOU5qdDF0SGt4?= =?utf-8?B?WmxDT0lTWk5LdTVkVnRQcXVaQnB0ZEp2M09qOUJNTVU1UWFOZjFQZ24xOWlI?= =?utf-8?B?WjltUnFRZFgvQk9rRS8wbEg5NTVsM2VUTkRmY0Q4dERXc1hKVzZKL3VybUhq?= =?utf-8?B?b2VpUFN0aWsxVGFxUWo3Z2FlQmQ0NzZ1U3RIdGI1YWVSSkFjYkRaTWliT1pp?= =?utf-8?B?RWw1aWd5a3hVeVBvMFZGWjU2dFJlTCt2dmR1aWFUaUZsMWdOZUhuV2ovejZ5?= =?utf-8?B?NzQwbEhDbGhJZ2h2WDZqNUFub3BBTVNrZkJKQ0pCdmR0cm1mRnZSUVNNUGtn?= =?utf-8?B?NTJsRE1peENmeDFtcUlTcjY1bmRqQk9jMUFDZFlmdHRHYUI0Y2ozMnJlSTV2?= =?utf-8?B?VWxJb25EQ0Z1ZDNuMEtqdTFSVy9uREpSZlJvYkhFU1BHNmdRbC9GNCtpMGty?= =?utf-8?B?bzdEZTNSSWFFQ25oM0s1L01sYnhLNkNIY2JYYkxmam42d1JkV2xqeEZjUkJC?= =?utf-8?B?OXYzenQzRGpRT0JtZGJnUE5KWVkyZlFHbUlKWTdUUDZPencxSHJvamNzazBt?= =?utf-8?B?L3FjQlRnb2t0V3V6Q2xLbXZyZDBObTJGRkluRCs1dnRTdGcvY09UZDVKRitI?= =?utf-8?B?RmtvUE1VSEVoemQvQVVQRDBlMmpaU1RvK0dtSENrNWt4QTNPejhCVnFoUVVl?= =?utf-8?B?WHRjdlkvNnc4N3I5VmhkOTlTZEhldFRMY0NGMkhROUQ5cTVDRS9aVEdTcXBV?= =?utf-8?B?L2VmSGE2T204QzRXVmZEZ3QwMFRvV3hhREtLcFhtMFJrRUFBU1kwTjVrUDZT?= =?utf-8?B?TURrSHFuQUNRTXVTNk8zNEV4QXl4aG9rTXJnMXBDbnlrR3ZKWWliMVRGdWNP?= =?utf-8?B?bC92UGlMRzJMWGEyOWF0cVRXYjNvVmFQY0ZRRFdDWjJySTBFN0FCd0hWM280?= =?utf-8?B?RFB4Ym82SGxUcmdCd212ZGtsV2ptaTI2dXVDbE1nUS9TNHp4YmVlZU5zczJt?= =?utf-8?B?a0NYZVQ5THJiOUxkbC94SHJoYm5SR3pjK1FlTW1WaS8xTGp1V3JGZTZIMjk3?= =?utf-8?B?SFJ6UG5UUHNmUEpjQWJqODFTeDJIbHJLUDVkazJ1NDd4WkVVenJSUEN4S1pr?= =?utf-8?B?eThja2gwWWlOTm5vNmhCalBiTGFyWXQzVUllb2FRN3JPb3dhVFVLY0phUDVJ?= =?utf-8?B?RHlZT0V5cnpKVVlXY08rWXB2RUd0MEFaQnQ4RjhyRm1adHB6VWNEcmplR1VM?= =?utf-8?B?SG0zK1lhUU9XK3p5TXpWL1lpdU5ReFlSTUpscHJxMjZnMjM1bUdNOEd3U3pE?= =?utf-8?B?ZUt4VG1sZERMVGJObE1mVjc0b3RuMHJoazdBV0ovaDhEdkJhcWdPbnI3VlZM?= =?utf-8?B?THE1WkVZWERsSHlubEgvVis1eHBMenVHOVMyYWlveGNURUV5RG1jQUNMVEFv?= =?utf-8?B?VTlWOWNEbEZqYzlianZwMkU4M25jTWdmQ2hsNTlVYWZLT2dGQ1VPTGJQdkxt?= =?utf-8?B?OThGZGY0NXJscUJxTDJOTWZMTjJ2SkFZUjk1SXFaU2pac0ZYYTd4TVVEa2RR?= =?utf-8?B?dytzR05zZlRkaXZqWGw1YUh6RFlyTmtzamRJM3h0eUZxSlBrRy8zYUZVWlcr?= =?utf-8?B?bklYNXk5ZktPWTVETDlJUzZjM1R0VHpLZnliS0tpV2FLYXhkZzllL091eEJk?= =?utf-8?B?RGs1M1g5ZmNIVVY5enFvY3lBTzVSaFRMeC9kTFBELzF5MnFPdHpuRXowSlUw?= =?utf-8?B?NGZZRlR1Yk44THV4UjJRRVpzSFZ4OXpvSlVYL0IxOTZUVFE4dXN0SHZYMmM2?= =?utf-8?B?bTIxSG9WOU81U2h1WnN5Ym43NWgwN0N6NnNMeTBmTWpWTTREYktvZkV3YVdQ?= =?utf-8?B?Ymt0WmNYb01GUVlscjZoWjhnSnEwNmVmRWtBUT09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:44.7524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd3f8565-9d2c-4cba-b9ac-08dde3fd8a9b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPFABE38415D The __mcheck_cpu_init_early() function was introduced so that some vendor-specific features are detected before the first MCA polling event done in __mcheck_cpu_init_generic(). Currently, __mcheck_cpu_init_early() is only used on AMD-based systems and additional code will be needed to support various system configurations. However, the current and future vendor-specific code should be done during vendor init. This keeps all the vendor code in a common location and simplifies the generic init flow. Move all the __mcheck_cpu_init_early() code into mce_amd_feature_init(). Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Reviewed-by: Nikolay Borisov Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-10-236dd74f645f@a= md.com =20 v4->v5: * Add tag from Nikolay. * Move __mcheck_cpu_init_generic() change to new patch. =20 v3->v4: * No change. =20 v2->v3: * Update commit message. * Add tags from Qiuxu and Tony. =20 v1->v2: * New in v2, but based on old patch (see link). * Changed cpu_has() to cpu_feature_enabled(). arch/x86/kernel/cpu/mce/amd.c | 4 ++++ arch/x86/kernel/cpu/mce/core.c | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 54f02bda75aa..c7632da8b460 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -657,6 +657,10 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) u32 low =3D 0, high =3D 0, address =3D 0; int offset =3D -1; =20 + mce_flags.overflow_recov =3D cpu_feature_enabled(X86_FEATURE_OVERFLOW_REC= OV); + mce_flags.succor =3D cpu_feature_enabled(X86_FEATURE_SUCCOR); + mce_flags.smca =3D cpu_feature_enabled(X86_FEATURE_SMCA); + mce_flags.amd_threshold =3D 1; =20 for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) { if (mce_flags.smca) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 311876e3f3f4..0326fbb83adc 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2034,19 +2034,6 @@ static bool __mcheck_cpu_ancient_init(struct cpuinfo= _x86 *c) return false; } =20 -/* - * Init basic CPU features needed for early decoding of MCEs. - */ -static void __mcheck_cpu_init_early(struct cpuinfo_x86 *c) -{ - if (c->x86_vendor =3D=3D X86_VENDOR_AMD || c->x86_vendor =3D=3D X86_VENDO= R_HYGON) { - mce_flags.overflow_recov =3D !!cpu_has(c, X86_FEATURE_OVERFLOW_RECOV); - mce_flags.succor =3D !!cpu_has(c, X86_FEATURE_SUCCOR); - mce_flags.smca =3D !!cpu_has(c, X86_FEATURE_SMCA); - mce_flags.amd_threshold =3D 1; - } -} - static void mce_centaur_feature_init(struct cpuinfo_x86 *c) { struct mca_config *cfg =3D &mca_cfg; @@ -2285,7 +2272,6 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) =20 mca_cfg.initialized =3D 1; =20 - __mcheck_cpu_init_early(c); __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(c); __mcheck_cpu_init_prepare_banks(); --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2040.outbound.protection.outlook.com [40.107.244.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BB68307492; Mon, 25 Aug 2025 17:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; cv=fail; b=bWnEbDkOsC16QXxFRc9IfNpOFn0UGSpqQxjNG2c/ch9znoGutkNpzlJ3itz6q4AYWqMLw/zBa9AmbfrGuSIldtxeZY2Ghe2MCgJpgHzsHY8qsOLu+6c9B6Lv9oXGygPCRR5MlsB03oY6xPcFKN0hwReSRJFQpQA2/w8kUMnF5cs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143229; c=relaxed/simple; bh=sOz88nuukd51rSa6gv5tUcVKvb82N0uW7Bi84SEagJs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Dw8tmtMMCcf2xqku9JHMjRC63ZcdauZwaOeeY98zqveReWn/owZ2vr+eeL8LkGqwe/G6jMW+HTZukHGAtRVsgYixx1AhWxQGZYurctcTsjqdMq+v+DnkOTHl8x84dwLuWTDBIepBaWPPIXrWbGKnjh+TI2wECEEfVy1VaCjT1Mo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=nEclwysg; arc=fail smtp.client-ip=40.107.244.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="nEclwysg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Bi/NJsGuQJDmtPcwtKZIEVAFilo5VEa6X4aolc/ayLIvtjyfUny/iqoMGaB46AVWceuIIQWbSYmWc5bUQ7HS2F9yon3/wZJj8zbNOTUgkDT/F5WqiSfqPM6CoTP+RfrDCwP21oHdWAjAqcN8cbu9cIjpz8R3OMWsYUn8xyUB2sZ586URBLILIts7Nvyl5slRp6/I8bT18HMp58RxccRedcVsNs/2KogiwoRv/LHwf1+4OKPLCFvhyxvQ41XKDFZY8MGWZ2+gCFGtidJcX+TiXqcsk5x8aB0bgPpaGK2qjz6zfFqW3wRe+/iiUkETiGzUYAN5cJ2UbeUmVVmquv88SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NuUwg3tVR57Y+8anZEHHXBkyJpgg5qvAjKzJwnQMomk=; b=chlvX85mvGFJ7FVRCsVIiH1CH1zlWGS41OjPdhMDjLa8VEXjTsBgP7c4FU6Y8jLjUoOdklV93MKw0Q2OGAGG0nn29fXZumSWbGA4RooY2PIre7Pae67DPbcmvMUigwAwYShwz5/JH/EnQljyTvi8RnO/JdagwRA1SNmiu41E3Cz4MjRqiNy8+Wtf/ctccrA32ChCJAHkH/xCNNggZ5Z2N3nxlgcmvPPeWSihD0ACAB0eZ4HxXKP8kcxjRYV/1y/H5hAUlAO7eM20tRl0aihN7fgJyySyZdabH8ZQtHxzwnjO3U4Jijy0pHwhOZ84FuJnYqjCkQPSGGWpqdhsG0n3JA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=NuUwg3tVR57Y+8anZEHHXBkyJpgg5qvAjKzJwnQMomk=; b=nEclwysgHhlt0wSiJqsJrxCDcBCxzMWUchNlEPJbRnk75Dk2jCTIlbCH92TsRI5lSYgY5kFnREUgkfzqLd6WJh/Sn8jNLbwR6iHIhWeF1THP4zXeukLGAPumXiaNRcndiPaKWrreS2TteODs6q0Ky59TLAjVlKyN2H/x5f2XxdU= Received: from SN7PR04CA0038.namprd04.prod.outlook.com (2603:10b6:806:120::13) by BN7PPF915F74166.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6d9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.17; Mon, 25 Aug 2025 17:33:45 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::3c) by SN7PR04CA0038.outlook.office365.com (2603:10b6:806:120::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Mon, 25 Aug 2025 17:33:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:45 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:39 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:04 +0000 Subject: [PATCH v5 07/20] x86/mce: Reorder __mcheck_cpu_init_generic() call Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-7-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|BN7PPF915F74166:EE_ X-MS-Office365-Filtering-Correlation-Id: 897cb91d-bda6-4fe1-e713-08dde3fd8aec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WDMwdXU4YzFrekRtaVRzU0pYQzYrWjZaVHU2aENsbGxMYlN3ekg0SkYwdWQ5?= =?utf-8?B?KzBaejdUQk1mZDlIdDNYb3Yydng0WlZrc1AvSWY0aXQ5aHluRWpBTmNSS3pT?= =?utf-8?B?TXNZbW8yNkxyNy93MzRvT1BKZzR2M2RCZkVId0VKQTJzVXlJbXhaVUt3bjRV?= =?utf-8?B?bWZPNTk3R1oyVXVEVU0zZWRZYXJUMkRLTm1VQkxVeldzNUFsVjQveE0vN2k1?= =?utf-8?B?S2FkWVU4Z0RlYVhXYmhEdFZCcnBid3h4NUZna2RSY0dxcnMweW8zOFo1cjNu?= =?utf-8?B?b1VuU25SQlIxQ25Jb3ZESU9Ld3lKQTZEMmdhSmNvUmtOTnMycnA0KzZhUlZM?= =?utf-8?B?c3Zmc3IyTlV1eUpJV2FWc1Y2QzY5RjhkbTdESnE1Uy9IbWVNdC80T0FDN1Vl?= =?utf-8?B?ZUUvdFMzWXgzTi8wQW9pVHVSd2d6TGJCTVZtQzZYWElIOHV6VjRZRWVKSXFD?= =?utf-8?B?UW5jMkJGSmc2VEhBSGVEay8wU0NSNnRIdjhiTXBiNzRtWDEvUksyVEFGMFQ0?= =?utf-8?B?bFh6NVh2ZllMbU1LbG0yRHhxOFVnQjRkcHVoN0thOXdpWGFZMVovMUF1RHdo?= =?utf-8?B?WXp0aCtyVkIyTkhRUnFxaDNyc244TUpoa0dCL0cxcTM3QVpaK0NXMGdaVjBK?= =?utf-8?B?V3hTZEpKWGpvbTloeWUybTRDbmRZcnNZbEpKSjk3a3ExdVlXcmxpVEJocEd3?= =?utf-8?B?Z3pmOXNMZFp2b2NDNGxveW9Pbk13YXhaQ0JEd3IyOWZ1SUNoZzBhVElOQ095?= =?utf-8?B?bkJ6VzYraDFLUmVyTjI0SkRvZXpPU3F0V2RoZkVzS1RGTkk3NFdCRGhUODkw?= =?utf-8?B?R1pwbXM4cEJCN09OZlE1VEhWUTlFek44Y2FuSFVDOUdvcVlPSXIvYzQvQ25a?= =?utf-8?B?K2o3WHZYL3VTemM0dSt3U0liWlhzQXM3Q3NsamhPZWdYY2Vhc3NLVDJjb2dO?= =?utf-8?B?UVFDQjRzZE9TcHRyd1JDZGtzRDZVdjQvTldQMnVNNDV4aHNGOTNzdTdHekp1?= =?utf-8?B?QnZaNmhLdWdHL3o4eUM2bEdMTXY1UnVmZ1lqU1hCSlh1UTR6dFpUSUUxam1P?= =?utf-8?B?SnBFSEZaY3FUUEIwYWpLdFRNdllwV3V4Yjcvb0dDTFFDRW1YTWJXUGFkYmls?= =?utf-8?B?NTh3cWFiZkkwZ0tINnIwVnd5Sjc5SzF1S3lwYUI0RWY3SXl5aXltYXlIT2ZY?= =?utf-8?B?elRzdncraTJEN1lrOGZEa3NoUXhGa2o3Wi9FZFB1WFkzR2hscTZzdGRpS0lZ?= =?utf-8?B?YWpkVTM2blhYSUs4L1pFNkF4bzJWZWVsWHM5V3BuZmRJRGxHU0N0aGU5emZD?= =?utf-8?B?L3pUY1VCVEtUQW5qOU9kaTMxZzNCaGZ4KzRVUER1Y25ZeDkyM2UzVERHVFdC?= =?utf-8?B?c0hhSHNvZ3QyV3NRR1VhcENLbzNUckhNSkVPaHdZSFl0R1orN3JncVBuczdz?= =?utf-8?B?NUo4YW5EOGx5a2xDQVpYMkNhd2FoTmRlWXRlQjNOMlNpUVdWZUJhWG5Ua3hN?= =?utf-8?B?Q0dFNlB6cXZVZUxXTms3dm8zQTh1aDV5cjdDVnFpR0VWemZDdkc2UkdGa2ZZ?= =?utf-8?B?MHRiVGhrQjN6bFFuaWV2NUdNcHlvei9XeDRHZXJjM1RPeDg4dEFqUlFJMk14?= =?utf-8?B?dmR2OU5Pa2hRWWo1dFI1WldYM2hON3VvUm1iOTh4U3dmRk5idmxpbWdhZWd6?= =?utf-8?B?aDEwWi8vU3ViTklIR0J6NzRlUTJ0UEFnaWd3dmRWckFBTlZsTnBwSFFoTUhD?= =?utf-8?B?cjNGYmNwdzlFVlY3K1dWT2x1b2ZuemFidjdIUVkwZUVTaExTQ1VvelUwZnVw?= =?utf-8?B?cEp0bm1BcUdPQXpOd3c1SCs0cml1dmp5Z2lJMTBPcWhGWGlSd3kyTGtTRENR?= =?utf-8?B?RVIzYURocWp6QnFDZnppVTQxb1ozekxoSFR5M3FhTjNUczgvU0MzOStVWXBs?= =?utf-8?B?T0hNcnRlL0lzeTRlcjRNWXY2UnRKVkU5dEVQMFVJYk0yendoam81ZzNJdWkx?= =?utf-8?B?NmF4RzQ5UUNtSE5HV2xEODRoS2RXU2sxazVXRmFtVVJxQUs5cDQwL2tkb2My?= =?utf-8?Q?vnLuVO?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:45.2842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 897cb91d-bda6-4fe1-e713-08dde3fd8aec X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPF915F74166 Move __mcheck_cpu_init_generic() after __mcheck_cpu_init_prepare_banks() so that MCA is enabled after the first MCA polling event. This brings the MCA init flow closer to what is described in the x86 docs. The AMD PPRs say "The operating system must initialize the MCA_CONFIG registers prior to initialization of the MCA_CTL registers. The MCA_CTL registers must be initialized prior to enabling the error reporting banks in MCG_CTL". However, the Intel SDM "Machine-Check Initialization Pseudocode" says MCG_CTL first then MCi_CTL. But both agree that CR4.MCE should be set last. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/52a37afe-c41b-4f20-bbdc-bddc3ae26260@suse.com =20 v4->v5: * New in v5. arch/x86/kernel/cpu/mce/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 0326fbb83adc..9cbf9e8c8060 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2272,9 +2272,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) =20 mca_cfg.initialized =3D 1; =20 - __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(c); __mcheck_cpu_init_prepare_banks(); + __mcheck_cpu_init_generic(); __mcheck_cpu_setup_timer(); } =20 @@ -2440,9 +2440,9 @@ static void mce_syscore_shutdown(void) */ static void mce_syscore_resume(void) { - __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(raw_cpu_ptr(&cpu_info)); __mcheck_cpu_init_prepare_banks(); + __mcheck_cpu_init_generic(); } =20 static struct syscore_ops mce_syscore_ops =3D { @@ -2459,8 +2459,8 @@ static void mce_cpu_restart(void *data) { if (!mce_available(raw_cpu_ptr(&cpu_info))) return; - __mcheck_cpu_init_generic(); __mcheck_cpu_init_prepare_banks(); + __mcheck_cpu_init_generic(); __mcheck_cpu_init_timer(); } =20 --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CBA5307494; Mon, 25 Aug 2025 17:33:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143230; cv=fail; b=rwabQ9hZI5mXYVBZGRvKq8ZQxeKJDUl7JIapAtzQSIlKT/DMDsXGswt0dL7+4NIFdfbuhNnQjJXZypbwOvjgaMgBOWke7tEx8btIsomS9mCtAR9j4L5UVp/vvusKKUdL2m71/CXqs2tYIB6HMQZW2x+40Lv/MRkXrV/Afb/+0Xs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143230; c=relaxed/simple; bh=SURWk1bhbby8/ZpR3DmIi0Bkmq4sSs0DtH+6f2yK/zs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Yih3CRm3vYFXjFfrmOqa/4oJecpyih4xU34dVfrsgl6kiaBwSgjIF5CROtfhyC4EEH0Tu5aF1sh/tW88TTxzViaXqDuIvZHFwuRqlUmWdyFSzinOR0U251OiYuQdHzkYvkbFUTw6bse4g/oTBu7UsO+tSwQlM3ppLLEEGTruoUA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=YlmW+aE9; arc=fail smtp.client-ip=40.107.94.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="YlmW+aE9" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DM5SlL3hHHZajLWOGLI2rWsv2r5PzHa8/NnuwCKRzdji2lOZfJ1vUeOCNaO0ocog24wrwrrLlb95kQjF6Ih1Wi4SlGMhuJUoR/mtKp3GEZ10vYKNwCTlrrmCWlYPFO4qI4zwC1T0w9OEzCB13/Ts/7pufqovyPP/uSkb+hUcb8p8pnMQ5yIg/2rdR5iScM+OsuomcchXIBLZLHsYJOTyQLJqueG/wHSeiXu/3pLlCzG68LP2qUnxcIrDzrOUzmrvyz/GHJb4cjwddSijIC4bH2DqwAsOmFObixhCxjGkhbTMS+uM5A3vmHgXTPkBo18Sk5Qv8sEZOLLGJn1iKkMTIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PfK29MTsKIOfjzYlO43uU4MY8pUFjDtRwEkawNqXOIQ=; b=r9nyI6zDCR1Fr+L4lMH4EiqlX8IOJojmnWJa2RvXw5iWcAKe+k1cPEFvvYzUjlquF/PSr7nAjHVi6LfvoxtWWnjc2l8x6G/a6/OqULtrfeiFV9SkIPjLL0HAT8G39i2jvsxWSUZERZlnfcMGegKd/MhmPivPqJ3lmUltW6EYz9/i8kDTrxq/o+9ixZSFnl5NLRVkonTrQGwEr96KyDZbDM7+NYv4y8yvtXjpJQfm0uoMz6MBGNGWj3ZTjrVzE8NIOMhGmEso4w+TgH8STGHJoJwr2cKVerfj57s7MPbMPPfWecC4BoNB+HRY0GBg6P6JGoSua2XNOtfyAts/R1+mKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=PfK29MTsKIOfjzYlO43uU4MY8pUFjDtRwEkawNqXOIQ=; b=YlmW+aE9eDQjk1t9YHBOuspvCEyprn3AozakW0IzooEQCNvGXAyQbS2MShc8SQCgB6NWz8ujGvQVISVwHHzLuQEJsPVBOFlDWSlgHl9uEcqIvIhUfrxobwCw39iUJRfhDAD+uFPuI3T7OXr+Bix9m5N4/0wzG4bvTonhrIZn4Vg= Received: from SN7PR04CA0060.namprd04.prod.outlook.com (2603:10b6:806:120::35) by MN2PR12MB4424.namprd12.prod.outlook.com (2603:10b6:208:26a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.22; Mon, 25 Aug 2025 17:33:45 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::12) by SN7PR04CA0060.outlook.office365.com (2603:10b6:806:120::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:45 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:40 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:05 +0000 Subject: [PATCH v5 08/20] x86/mce: Define BSP-only init Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-8-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|MN2PR12MB4424:EE_ X-MS-Office365-Filtering-Correlation-Id: 91b15770-bc22-4b32-20fb-08dde3fd8b06 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?VFAzMkZyVnpKcmhvQ3o3MEozMDlRZVdha3VvS29ibGt3UlIyUmF3cmhud1dP?= =?utf-8?B?cFREZE5DeU8xNUd4bTlZNEpKaXJOTTBrTWlGYUZBalZWOUorMzNZUTFRVXhZ?= =?utf-8?B?K21ZOGplamRweTdZelY5enpYVXlNQjMyci9ueGtyZzEyZ1VMd1NOQTlWdG55?= =?utf-8?B?aG1XZTg3L3I0bkZuVWh3eEpSNjhpQ1BYSzZQRFNYTDlDZjZVckdLS2N1ZU5W?= =?utf-8?B?WGp5ZzB2Y2NLa1VHSC9qSktSVG1VNEtpVkpDWm1HMmJQd05RbzBYZ2Ivcm1x?= =?utf-8?B?R1liRjZ6dzNOSTg5SnRxMFlUNGtGUUh1U1VpN2pLM2FnMVpWZURmMk1NclQx?= =?utf-8?B?WjVQdUdIdnI4OXFJN09FSDFoUjB0MURxSEFBRDNDV3R6YnhobkZqck1yWm5R?= =?utf-8?B?MEgvUDJ2MEZtMVhXOE4vdmJXWVBpY1MrbTM0cFJRSlJvOUxUaUtPZmF5R0xp?= =?utf-8?B?NlNQa1JXcEdwdEFBdElhSGdjSWZuVGlZN1d1MUdsZWc5ZWJMOTdtbnQrdk5q?= =?utf-8?B?VlB6NUJ0Rk8vckI3dmFEZnRuTWZocWYvMEF1QkVwTmpzUithaHlERGNPV0Fh?= =?utf-8?B?RUgwVTZyYldrL0FrbDAwN3QxNnVnL24rSFhzaEYzNXRsV0pzVHUzeGNnSThq?= =?utf-8?B?cTNsQzBXQlEvcU5NSXo4OHYvczZmS3liMDltcVVldUo1c1hvWS8yVTgxbXp5?= =?utf-8?B?eGZISTAyYTdUS2ZEUUtCbnRRNVhUQTA4M3Y1MFFLSGZrNVVsTlh5ZUw1bUlG?= =?utf-8?B?alM4b1d2cFdKa2xZMklVQUtFZVU4a2ZnMWt0bnRYVGh0eUVLTC9ZTWRvK1hp?= =?utf-8?B?Ulpkc09waHlZb1NMZllpM0ZUVGszd1RYb05yQk05NXU2OTdiVmlhYWN1cksw?= =?utf-8?B?QWt1dG1nbnlGVmNmSm03aDZHZnd4QTcyV2dCcXR4NUo1dndteEJjYmxCbmd0?= =?utf-8?B?TG1QR2JKbTdJNldFS0hhc2lEeEJqcUJOK1h3a041U0U2aXdMTWxNTW52YTNl?= =?utf-8?B?S0RQS3I3ZFJNaHpvSXZlR3dQdTBrczAyNVFtS3lMd0Q4TnkzZSszSzhBUVY2?= =?utf-8?B?VHlpNUVoUzFkL1dLeHhOSjBuM1ppRGRjOGZsd2Fjb3VUTk1Jd1RnTkl6TzAw?= =?utf-8?B?ZWpSeE1wNHdDaHdQUmJyQXMwQTBIaHhVS0ZjSE5vQVpnZ1NieDUrdHFIbllN?= =?utf-8?B?ZXgzZkhoKzhjOW5kMmhsa0s2cnRJQ3AreE00dXczV3JNa1hFcEFsUERkeUFX?= =?utf-8?B?cEYrMllxbmlNT2xteUkwT3lzWjhabGFQdy9ScUM0dXRML0VLcWRnbmNaSWd4?= =?utf-8?B?SzFWU2FqYSthV0NMR1YvMXpZSTcrYm9BaE83eURhb3B2SUFVem9XRFpPbjU4?= =?utf-8?B?bk54Um9xNzVIcUNJN2VWYVhhczNaSmhLcmZNT05OdDBCOHdMR1pBSUMwM1pl?= =?utf-8?B?MTVDVm5KcWtpM003aHBPQjAzdVF2RWFscEJQTTh5K0kra2JKa3NtWVdhNzdG?= =?utf-8?B?TktFZGtzd0dnUjBQaFdiREN6cEpsdUxkeEJCZ1grVDJFK25mODhoaWlHKzcy?= =?utf-8?B?NUMxTFl0a1NPMkZrdVh0UVhaSEpLZFNJT0l1TkRhQWxEbG9zYmxma1ZkMkk1?= =?utf-8?B?UnpBVWJoN0VlOUQ1NWRLN0pHVFc3RUpQbU5odlZFd2RCYXF0SEltQkd2b0RO?= =?utf-8?B?U2tyOCt3K2lkQUVYMGtNQ1lhdzBacUU2c0JwL3Z1MnEyejk4L0FJTjh6a1dH?= =?utf-8?B?UksvZkx4cHRwM3Z6bndjSzBMWGdlTTFTZGZYam1HMFF0QWxTZ2YvNVdGTnhr?= =?utf-8?B?blJKekgxWHVVUUxtaERneVU4clBIYnZJbGZIY3R6YkYxcUJ0Yk94cHU5bEtW?= =?utf-8?B?Y0hrWk5Rdis0V0ZLdzdPU0xGdGY1Y0lnazkvbnUzaUpzMzV0cnk2Zm1ISWNK?= =?utf-8?B?bXl5M3NpTGR3SXZvSEFmcEQva3pYOG41Y000eTVXYmtRZ3ZVcU1vUGM0Zm1m?= =?utf-8?B?NVJFWFJZbmkxN0VNVFJhVDcxQ2xPRWFYT09SMnNsVlRqK2ZsUEJHY2d1VVpz?= =?utf-8?Q?wt/6bR?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:45.4488 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91b15770-bc22-4b32-20fb-08dde3fd8b06 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4424 Currently, MCA initialization is executed identically on each CPU as they are brought online. However, a number of MCA initialization tasks only need to be done once. Define a function to collect all 'global' init tasks and call this from the BSP only. Start with CPU features. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-11-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * Change cpu_mca_init() to mca_bsp_init(). * Drop code comment. =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * New in v2. arch/x86/include/asm/mce.h | 2 ++ arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/cpu/mce/amd.c | 3 --- arch/x86/kernel/cpu/mce/core.c | 28 +++++++++++++++++++++------- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 3224f3862dc8..31e3cb550fb3 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -241,12 +241,14 @@ struct cper_ia_proc_ctx; =20 #ifdef CONFIG_X86_MCE int mcheck_init(void); +void mca_bsp_init(struct cpuinfo_x86 *c); void mcheck_cpu_init(struct cpuinfo_x86 *c); void mcheck_cpu_clear(struct cpuinfo_x86 *c); int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id); #else static inline int mcheck_init(void) { return 0; } +static inline void mca_bsp_init(struct cpuinfo_x86 *c) {} static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {} static inline void mcheck_cpu_clear(struct cpuinfo_x86 *c) {} static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_= info, diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 34a054181c4d..8bbfde05f04f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1784,6 +1784,7 @@ static void __init early_identify_cpu(struct cpuinfo_= x86 *c) setup_clear_cpu_cap(X86_FEATURE_LA57); =20 detect_nopl(); + mca_bsp_init(c); } =20 void __init init_cpu_devs(void) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index c7632da8b460..25c243e87b2c 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -657,9 +657,6 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) u32 low =3D 0, high =3D 0, address =3D 0; int offset =3D -1; =20 - mce_flags.overflow_recov =3D cpu_feature_enabled(X86_FEATURE_OVERFLOW_REC= OV); - mce_flags.succor =3D cpu_feature_enabled(X86_FEATURE_SUCCOR); - mce_flags.smca =3D cpu_feature_enabled(X86_FEATURE_SMCA); mce_flags.amd_threshold =3D 1; =20 for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) { diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 9cbf9e8c8060..7f2269ce5846 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1837,13 +1837,6 @@ static void __mcheck_cpu_cap_init(void) this_cpu_write(mce_num_banks, b); =20 __mcheck_cpu_mce_banks_init(); - - /* Use accurate RIP reporting if available. */ - if ((cap & MCG_EXT_P) && MCG_EXT_CNT(cap) >=3D 9) - mca_cfg.rip_msr =3D MSR_IA32_MCG_EIP; - - if (cap & MCG_SER_P) - mca_cfg.ser =3D 1; } =20 static void __mcheck_cpu_init_generic(void) @@ -2242,6 +2235,27 @@ DEFINE_IDTENTRY_RAW(exc_machine_check) } #endif =20 +void mca_bsp_init(struct cpuinfo_x86 *c) +{ + u64 cap; + + if (!mce_available(c)) + return; + + mce_flags.overflow_recov =3D cpu_feature_enabled(X86_FEATURE_OVERFLOW_REC= OV); + mce_flags.succor =3D cpu_feature_enabled(X86_FEATURE_SUCCOR); + mce_flags.smca =3D cpu_feature_enabled(X86_FEATURE_SMCA); + + rdmsrq(MSR_IA32_MCG_CAP, cap); + + /* Use accurate RIP reporting if available. */ + if ((cap & MCG_EXT_P) && MCG_EXT_CNT(cap) >=3D 9) + mca_cfg.rip_msr =3D MSR_IA32_MCG_EIP; + + if (cap & MCG_SER_P) + mca_cfg.ser =3D 1; +} + /* * Called for each booted CPU to set up machine checks. * Must be called with preempt off: --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2079.outbound.protection.outlook.com [40.107.223.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CADB303C85; Mon, 25 Aug 2025 17:33:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143230; cv=fail; b=oZaimZQpaoz2LATHMs/sk5cE8jG4Xpit27GwtsXDG2VakUb6kVA6yBvDKmGGq0EfOtk8PY0/QefDehftwmMfMqkeR+YXs6qxVozTfRkBqey6lSk6PQDVcuEALjobBxqNfN5+5JYy2Es7150sMUKry+uiYxbqYJYzdqwvwuHGKCE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143230; c=relaxed/simple; bh=5kHUFgEZHbngWxU1kwBudr/xbfVc2s/7vQlfVCbKXjI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=aWZiHBy3UsQXanHqe0dZwVV01/Yiw5hTvmFcOyAa5oXFf01Mh4bYoPUonZ0FxBPZgcIrxnXLLZlYX5+lq3ipPbOxkALdQy9IRBon9rIrJUuZsiYReglmmvyRRNLsvA3IDyFS9xMCmHE55oFWoK6Qw+ZSa3VnEbZgwgrHRD+70SA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=1vm1kz/y; arc=fail smtp.client-ip=40.107.223.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="1vm1kz/y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=trOPZEBN4SoxsoYHpxxkQMq1f2XrGwwkrNqUCsxx68l+gNajd+fzt5yi5nsQ2sTJvh0Uof4qk9ghNRpdQjlnGSYKVA5SuA17m6DAbhGkSfAiVT7zbT4EIUu/prNUlzrCLvIwvwYLrJC4bHNdTzfRcA0pNaqi3ONJNvoV91vm2YWcNvSHe+x1NMeN4eGWIC3e1VllL4E/anCUmn7cPwBDImf1A3ADODKAP8ZnkG1noRnKag/tt9Ss+kbMKUZ6UQdHrP9TMu59Yo2fcsxA3tmubdrNnwL5zSpxmcb6J0LCKDiqNKkT7hp7P+MHsNNsQYbT2kyKHHVhH5MEjVVVt5ffVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RHhxZW3PNqBknlXKPI+asz+F3+h7MiowBObHbyjtJ1k=; b=C83/CzAPI5ejSz8Ss/b0f8CxyLkOpvVb03LvAwtOi36TD3aD+RB58eHlYYfK6dNbsZZaUxBPZZRT2vDCCVBZA9NlhqjljfAkfOtGR/llieyadRPDMXUf9/+6mWBdqaSJfDq0b69JDX5iGRyg3dxEynhXVModrGgF3fS2LxQrbcVjwOEWFzHWMVw7K7L8C+M8c0CCtaaPa7FT9VOPrB5PxWLa6yh/v3HK416Rf+Yh5Dh9aPgKa5mUV0yPAz1IHtuucGdUtGaXMwQULabBzPCqaG4lwyOUpHvbI5Z3d66FlhSoyG8KHWVaIuJ60K8dh/YsUrbO8SRzCCEvb7a0K/AMXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=RHhxZW3PNqBknlXKPI+asz+F3+h7MiowBObHbyjtJ1k=; b=1vm1kz/yDHQXDyqxtGA2vJ7QGORpdJ0MWm+bKX2eVn8qjC3tuiUTyRy3B3IUKCWGhpkJ/HTWDYkepuXZdtPhbcsPURD3BAYyFG7MakzBkhksz0K5FztIet6n77BK4RdiD0xFkmp6xf/7i0EGQhzBe1y2jS1wavzfLO8pfOTHRhY= Received: from SN7PR04CA0055.namprd04.prod.outlook.com (2603:10b6:806:120::30) by CH8PR12MB9814.namprd12.prod.outlook.com (2603:10b6:610:26b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:46 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::46) by SN7PR04CA0055.outlook.office365.com (2603:10b6:806:120::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:45 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:40 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:06 +0000 Subject: [PATCH v5 09/20] x86/mce: Define BSP-only SMCA init Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-9-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|CH8PR12MB9814:EE_ X-MS-Office365-Filtering-Correlation-Id: 9becf3c4-e61a-4f6a-52e4-08dde3fd8b4e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SFQ2aEhMZy9oL1VPZXgxTFh0UXIrdzhhcW9ScHIzUnAvdTM3NmtJaVByYmpG?= =?utf-8?B?aVMzS25sZ1pEcnl6UUhEQlRJT0VTcUlqb01DK29rRHVNUFl4dGZlRTRiY204?= =?utf-8?B?OU1yNlR5a0J6WU1yZzRwNW40WEJOTUlUSjBJaE1KNFVkWDJpZG9ORElGMkFx?= =?utf-8?B?Q05ndGYxU3hIbmpnSDNjYW1GYWI1YWpkcHRvWXJtZ2wwZ0VPWXc1NEtacTNJ?= =?utf-8?B?T0pzRlk1YzI2Ni9QSXhUQUlmTjVnMERZeEd2d1FQOXJEZnZsZ3AvcllyQWhl?= =?utf-8?B?L2tyVUhObFFXSXBoL05aU3VRQ0piS2hCbDhxdHl3Vm8xclcvMEJLR0dBK1d5?= =?utf-8?B?dWJUNlVReDM3NUgvdUNpRFo2NjJBc1VLamRmeUtaQ29HMjN1TmU4aVNOdGY1?= =?utf-8?B?UHZyYVhBd09OckFMT2dleXdmaUx0d1lTWnFtQWJvNTdUUkx2RXU1R0JhMnhj?= =?utf-8?B?cmtJWHRlYzkvYXZSU296aDdjdG1qZWhiRGdTMTgzZjNGQ040L2lPSHNzazhp?= =?utf-8?B?dHY5VTJHR0lxVUNhMkx6c0doZlBkb1BZOEwvd0loYWRTNVFKd2czY0cvYWZO?= =?utf-8?B?cTZaZnNCNVNHL0p5cDJab1lJcTZzZy9TdlU5U0lRdkpuamRrQ0JTQ3pIYkhk?= =?utf-8?B?UVZlQ1hSRlZmZytaMXJKOEJoVE1NQXVMeDJ5ZlNWakpESTI5VStBQWJ4Tmsx?= =?utf-8?B?Umo4V0l4VW9DK2phL1N2eG9XcERXazNHcnMyYkRjbURxNTh0T0tGUDJvdlow?= =?utf-8?B?QjVMR3ZlbkZCbEdpWjkzQmJ2RmI2TkhxVGlLTWVvM1R3VGhUajU2NUNLUStp?= =?utf-8?B?cGp1VGJ5djQ1SWc4U1NuN1ViVU5xaWZkR2RpUmNJRkhBSVgzVVpvdVN4U2FJ?= =?utf-8?B?NURUS2E1MkxsRjh4U1lzMTcrY1JDUE9pMnJTT240MktBQWM0NW5oMkVCZmxP?= =?utf-8?B?RzE0Q2QwVVNQaG1RcDhzZ3Q4ckpxQmMwOWtZR0grV2M4T1JUdU1vOHM1UHI2?= =?utf-8?B?Ty90NkJBNjcrNXlzRloxMDlJWlZVRHhGUWZYTmExM1VjR293ejd4MGQvcVov?= =?utf-8?B?U2dnZ2VUd1JHU3NUNHNPYlQvd2gwdmZpZmFjQ1BvYTJvNUJmV3N5d0ZxaWtN?= =?utf-8?B?OTgzSWJ3WllYZkdJYzNFbFRFQ1V5bFVJZ3ZoNkVyLzhPMjRBeEtvdGlMcDNS?= =?utf-8?B?V1VuSGhXQ2hjQWQveC81Y2lRMTVLN0gxY2NmRjFrMk1UdlN0M1c3eHordG5v?= =?utf-8?B?VHJHVG03STFDdXBSVkxWY1NmT1hNeFhvVHdERHBzbFI4WklEbVRiRUsrUysx?= =?utf-8?B?Sm43ZFc3MjBBMlRLTW84QlVMUXJFckNYaGJvUkJyRGx2OG9KZHJsK0JDUS9Z?= =?utf-8?B?YUNpbmh1Yk9FSXd3R1YvZUVFbWlPMWRHakxXc2hRNmgwWVZiSG9nT1BxNHFR?= =?utf-8?B?c0RiRksrNzNobUdvWGpjOEgxRTlmZlZ3VitnUVY4Z0hDMjMvK0hpMVhUUTVF?= =?utf-8?B?YVdSQ0puY3NOT2EwY25LK1RIS1VyeFZzWUJmdXZseEVYdHlzVHpESVoyemVU?= =?utf-8?B?OWx2ZUFyUFdYMnF2RVdRTllpcnFELzE2T05kbDNQN3J1cExRZG9YbVhRcmQ4?= =?utf-8?B?WVhrQVBlV25BWC9Lb0lkUkpyTDE1a0RadVNsYWhzTFFYOWNVSTU2Y0xDVWNn?= =?utf-8?B?UlZIQW16NHdLSjBTTnpneWo1dVpmN2FJekYxbkVaeWNOTHhqUjZDeFk3SFdk?= =?utf-8?B?RDBnVjlQcHNqWTlvVFJoQ3FjbWV4V2pkbDByK3dtYnRuUml2QWJzaTlNa3lV?= =?utf-8?B?MGsvdHJES1pPOTRXaTNhaTNsQmVWemFkbTVZdklDczZrbGp3ZEZjckJrSTQy?= =?utf-8?B?TEYvQXd6TzFQejY0OFV3Ri9XMFMvUUpESHRJaHlYNmw0dHRyMVJscG9qU2Fh?= =?utf-8?B?aWhOeWNmdW9XUTRBRUg1Q2lkQjIyQ2M2QVBxc0hNeUZkcTIralAzYnBSVXNE?= =?utf-8?B?bTFlZFJrZjRZRFZkcWV3NlZ4cHA5blIwM3A4Rll0QzBBbHdpN1dtOEZ0Tkdp?= =?utf-8?Q?vCqsmL?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:45.9213 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9becf3c4-e61a-4f6a-52e4-08dde3fd8b4e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH8PR12MB9814 Currently on AMD systems, MCA interrupt handler functions are set during CPU init. However, the functions only need to be set once for the whole system. Assign the handlers only during BSP init. Do so only for SMCA systems to maintain the old behavior for legacy systems. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-12-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * Change mce_smca_cpu_init() to smca_bsp_init(). =20 v2->v3: * No change. =20 v1->v2: * New in v2. arch/x86/kernel/cpu/mce/amd.c | 6 ++++++ arch/x86/kernel/cpu/mce/core.c | 3 +++ arch/x86/kernel/cpu/mce/internal.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 25c243e87b2c..efcfce329ca7 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -688,6 +688,12 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) deferred_error_interrupt_enable(c); } =20 +void smca_bsp_init(void) +{ + mce_threshold_vector =3D amd_threshold_interrupt; + deferred_error_int_vector =3D amd_deferred_error_interrupt; +} + /* * DRAM ECC errors are reported in the Northbridge (bank 4) with * Extended Error Code 8. diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 7f2269ce5846..18a8e8f97482 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2246,6 +2246,9 @@ void mca_bsp_init(struct cpuinfo_x86 *c) mce_flags.succor =3D cpu_feature_enabled(X86_FEATURE_SUCCOR); mce_flags.smca =3D cpu_feature_enabled(X86_FEATURE_SMCA); =20 + if (mce_flags.smca) + smca_bsp_init(); + rdmsrq(MSR_IA32_MCG_CAP, cap); =20 /* Use accurate RIP reporting if available. */ diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/i= nternal.h index 64ac25b95360..6cb2995f0ec1 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -294,12 +294,14 @@ static __always_inline void smca_extract_err_addr(str= uct mce *m) m->addr &=3D GENMASK_ULL(55, lsb); } =20 +void smca_bsp_init(void); #else static inline void mce_threshold_create_device(unsigned int cpu) { } static inline void mce_threshold_remove_device(unsigned int cpu) { } static inline bool amd_filter_mce(struct mce *m) { return false; } static inline bool amd_mce_usable_address(struct mce *m) { return false; } static inline void smca_extract_err_addr(struct mce *m) { } +static inline void smca_bsp_init(void) { } #endif =20 #ifdef CONFIG_X86_ANCIENT_MCE --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2069.outbound.protection.outlook.com [40.107.244.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42ECC309DC4; Mon, 25 Aug 2025 17:33:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143234; cv=fail; b=bwRk/XEJ8V2NtiMLo1Op/bE3qwA1kIjIXmSN+ecBy3I+4lUMFauu6RArkacVWcVw4vxIoKlJCVcl7WuMO1Osi8JYKAihegOPLjz5Fd5wtOtcfTms6APF6lcin3pyghUEu3OHbAADSJ/n7xdQMxT/pTujkDl/AIXvIBDVppdCixk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143234; c=relaxed/simple; bh=vM1QlFK0rfeLluoW5HpmMThtZJwKF6+c9BYfz6Q7Vb4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=rM2FirIka2v9IRIogCjIjm/lEYcxik+5NDVkP/L1AFyGzoYCA6T7LRBdqQMfRWxQqOMAZTpPsLa9enIzYR4zTbXRHlliUkNZ2iHoNMLuH41V23pQsyLU25PVDV9c/b5qu3HUHHcBJSkT/tCpRGWGOHpeYDjyFh9eplTx5UagRmg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=5mxtsUn7; arc=fail smtp.client-ip=40.107.244.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="5mxtsUn7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NjtLJyVcaQ4f0vmy+J9cnmz9XodHW2OPONt+GF9f95Ahkrroe06fzIvIcMzOa7EGCMB0MJ8Cui1SEHz/JiG07mfXm0E6jR+H8XbiiZEU0RfvGkytL+UyeUYEY7YV7CWzRiiin8eI3nzbhaUMU66QhVi2VlmcnOXtKKL8NZECxeEqSUkN96CEqbEIbQ7AcxGUzQ1k92uZrkv+8xddw1jzdpBrXnPk8MCB4d46zBcf+oHu0od/4njEY1f9vEtadPa9U7gtWSS8kFCIb57THztp8DJUiTOoDkHvIoGHE/oZbLGPH5zvUrx3PKPbE7x0aEjkOjsVbLNQhtwvg1Mv1VozKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+ZBFhkBQoqpyBDohL5Z7nrRGM2MKh9nmPi8cuGqm+QI=; b=DK+EO602B9btKHtgklIj0uh7JLKwVOPIm4hkuQIW0hn3YAUEGZpAhZhz8xB/NC+sQlpQkicSoYjUIxedGNnhKtkq3oUMECOCdLUFKc5b8DxtMeSj9oKOWRkPWDaR7/iVk5d9K6TUNNAtbspu9wq9WvqTR5GOZ+43YEO+Gx6MAABo5b4JtBKMKHzGGBZCoSIBhaYnDI4RT5UrJPQvU05gzGHK+w6avskQLwVBifaURnIE8gC/CdfPgWDqZf6S431rH3PKih82llZR1CN8iH0ljnW2ZYkYA3zayMB0rNZPLhZjXTZo8rpBFt3G+Dp+RVhvQ30JyfwEvnBEarMQS34MJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=+ZBFhkBQoqpyBDohL5Z7nrRGM2MKh9nmPi8cuGqm+QI=; b=5mxtsUn7gftfNNowwBd8cm/3IMVljZsevHAkIwx6SbdtkEiw3YlNX8ArrDd2Pd6T7f9Oz4tYl6avmT4P20m1Tw7rkNe+/tHRqa5h2yN/4IaVnTN3FmM20iSUaIEn0bo/h3SUKzcCKqbQn8SDhxNrKoD5C8WBjkUb++y3tTZYy1s= Received: from SN7PR04CA0035.namprd04.prod.outlook.com (2603:10b6:806:120::10) by DS7PR12MB6069.namprd12.prod.outlook.com (2603:10b6:8:9f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.20; Mon, 25 Aug 2025 17:33:46 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::1d) by SN7PR04CA0035.outlook.office365.com (2603:10b6:806:120::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:41 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:07 +0000 Subject: [PATCH v5 10/20] x86/mce: Do 'UNKNOWN' vendor check early Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-10-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|DS7PR12MB6069:EE_ X-MS-Office365-Filtering-Correlation-Id: 89d97768-ddbd-4407-1156-08dde3fd8b5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WExBd212dUl4TDBkSlZ4MnFpdFd5ZXdBOW80S0ZRSXNrQk9iNWhEZWVhSVo4?= =?utf-8?B?bE5HbzFYTDEzWmNhcEtPUUtuSkIwME5JYWxCSndjYmZmSnl6K1MxVmFwUy9R?= =?utf-8?B?TEdoNUZaQmZUWTk1WlVFRitCeWtJSUp5TUIxTjNwNGZNeEFhRmZOMGh0NnRS?= =?utf-8?B?SWpBOVFQZldBa2NMNXk5TGVsdkNBN1lhekNVdDd2dk9BMW1KTkloZUFBbm9p?= =?utf-8?B?N3pPdjdEYitTelBQaGZzalhTc2Y3VmY3QUp0M2tFTGxKUnhjWVZsQXdPWDJm?= =?utf-8?B?TW96RlpmaFlmV3A2L1NranNYZ1VybHVFMHBSSW9DNzhISnNGVFFPNUUrM1pt?= =?utf-8?B?aXVNRG1vYncvMzV2WFV4d0xQUTZmODdhL0V2cDRXVG1Va1FBWS9xaDFrRW1s?= =?utf-8?B?ME1Gb1ZlNkZYN2RNcktCbkoweWxUTTN1MWl3RzJQdEREeXFzZDFHMmVsMU5v?= =?utf-8?B?N24wTDZsTGVsckl5UElOY1NpT3hZTmQ4SmErUk9jbUpuYzlKQUJQbW1Ecllu?= =?utf-8?B?Ry9HNWliOE11VUI1RGtmdlZWdjF4NlM1SjBaTUJyc0JCQkhJVzE1WU8wSzF3?= =?utf-8?B?SkxCbC9XaHpCOW0xYzNGaXdYRncyakVJSi9JMVRJMlVXQ0ZxaUpJdmhoQ2tn?= =?utf-8?B?WmhZVThLTFFLS2FNRVlvb01tRkJmTGk0d3pacCtLVURNK0ZCT3ovRlpWU2tQ?= =?utf-8?B?eXFsZm9jRDc5empmQlI0RHJWZElpbUdyTThyNUJUazZhNEkvRzlYSHZFclFP?= =?utf-8?B?dlNtOFhaalhIK3ltT2lRL3IwNXBCd2htdVF5N0hCV09zelhBWkhYS25WeWJS?= =?utf-8?B?aGQwMGRFZnI0ajZjdVNZa1ZEVzFDVWw0Zi9tb1dmV1E5SWJSRG56WkFWdTVv?= =?utf-8?B?dHF3azZmRFY0cnNmZllaRnB3TkNYd1F4R0JCQjQzZlNzaTdPVXpzRUxJNXhi?= =?utf-8?B?TldtSWhIOUNYNGV2V2NBVnRpZDFPVVVjbjByaThJOHZ5Z1NDdytUdmdpWnFt?= =?utf-8?B?d0xHQ1E3c1k5Q1RPVjJwdC9uV1pGb2tJZWJ1cmlkbXhJOG01bWRub2hlODR4?= =?utf-8?B?enU0MFF1YWRISG0xbERHNXRPQWpOVXZpbVEyMS9ubFYvQTViY3U0bC9RSlNY?= =?utf-8?B?elNVSDdXMVh6c05QaFFmNWtKNmo2UjFCYWRXS3M5YVYvbWhVeE1WL2tQQW5I?= =?utf-8?B?TEdSTmNoVG56N2Y3UTRKYW1SZEh5a2d1ZFV3N0FzN2xpUklsQ0F4QjNwRkx2?= =?utf-8?B?VW9SYjBIRU1xWmtZeDduME9vQlhQWjhnd1Rad3FMR2lxMkF0aExLQVBXUXBs?= =?utf-8?B?d3N2QU1WRk5TaUlPSGZONGp0dW00VU9BQ0VDUnBGUzdHUU1GUFh3bWZqdnVt?= =?utf-8?B?TGg0MDgxZnF6WU1LRWJXMWR2SWxhK05NWjJvN09XOHhJdkdVakhCaEh4RXRY?= =?utf-8?B?Y1RXbWV2UnIxaDBOWnFkeVg0cUF5Y2NwSWNzTDlJR05PYm1Mam1FSi9tOC9j?= =?utf-8?B?b2JjL24zVHdKVjBVbi9rUXhCMUZYa0h6dFpES0NyTjBjRTNHcWIvMldaeEtP?= =?utf-8?B?V2JaZEdSejY0N0dxTTJqb09qMUh2QUVpNElnUGJUTWdRSWdWMzFPVTM2d2dj?= =?utf-8?B?RlZNdWFlM1FKdE9GYnp3S25QeGhNamxwODRudC9Ddk5uWjVkb29VT0tKV3dI?= =?utf-8?B?anNtRzQvWkt4WDh4dWtscTE0QmxyNVpTa1hRQnJUUEp6NEd5TXk2TWRCN2hH?= =?utf-8?B?eks3blJ2cWM3ZjFhaHFUM1FYRzIyUWMyd3BVd2QwdlVKYnNwWDFrV254Z2xy?= =?utf-8?B?eDN5b3RaYzcxL3ZmWVJhb3M3RE1TcUZLUTBNU0dTaERZYXVrcVREc2Z1SjZG?= =?utf-8?B?aHgrTUZQK3RvSC9MYTh6UkJGTHpRckNwdHlsOFdYNGxlb1ptSWhlcGxWbUpJ?= =?utf-8?B?M1EzaEJ2M3dadVI2bTE5bThtTXN2VEZ0OWhkUXlXdFo0akxjaHpQOTZoaEJK?= =?utf-8?B?NnJhRk9wQWVJUW0rMWR6QWNnUnJZdVdsY0JuQzQwcFRrQjJ1ai9GR09HS3Jh?= =?utf-8?B?VFZJcCtpajdrUnBoL2J0Sm5XUVFscnlSdTJjUT09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:46.0056 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 89d97768-ddbd-4407-1156-08dde3fd8b5b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6069 The 'UNKNOWN' vendor check is handled as a quirk that is run on each online CPU. However, all CPUs are expected to have the same vendor. Move the 'UNKNOWN' vendor check to the BSP-only init so it is done early and once. Remove the unnecessary return value from the quirks check. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-13-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * No change. =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * New in v2. arch/x86/kernel/cpu/mce/core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 18a8e8f97482..14456f6c2f7b 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1979,14 +1979,11 @@ static void apply_quirks_zhaoxin(struct cpuinfo_x86= *c) } =20 /* Add per CPU specific workarounds here */ -static bool __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) +static void __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) { struct mca_config *cfg =3D &mca_cfg; =20 switch (c->x86_vendor) { - case X86_VENDOR_UNKNOWN: - pr_info("unknown CPU type - not enabling MCE support\n"); - return false; case X86_VENDOR_AMD: apply_quirks_amd(c); break; @@ -2002,8 +1999,6 @@ static bool __mcheck_cpu_apply_quirks(struct cpuinfo_= x86 *c) cfg->monarch_timeout =3D 0; if (cfg->bootlog !=3D 0) cfg->panic_timeout =3D 30; - - return true; } =20 static bool __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c) @@ -2242,6 +2237,12 @@ void mca_bsp_init(struct cpuinfo_x86 *c) if (!mce_available(c)) return; =20 + if (c->x86_vendor =3D=3D X86_VENDOR_UNKNOWN) { + mca_cfg.disabled =3D 1; + pr_info("unknown CPU type - not enabling MCE support\n"); + return; + } + mce_flags.overflow_recov =3D cpu_feature_enabled(X86_FEATURE_OVERFLOW_REC= OV); mce_flags.succor =3D cpu_feature_enabled(X86_FEATURE_SUCCOR); mce_flags.smca =3D cpu_feature_enabled(X86_FEATURE_SMCA); @@ -2276,10 +2277,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) =20 __mcheck_cpu_cap_init(); =20 - if (!__mcheck_cpu_apply_quirks(c)) { - mca_cfg.disabled =3D 1; - return; - } + __mcheck_cpu_apply_quirks(c); =20 if (!mce_gen_pool_init()) { mca_cfg.disabled =3D 1; --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2071.outbound.protection.outlook.com [40.107.212.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A80793090E0; Mon, 25 Aug 2025 17:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143232; cv=fail; b=GfjHbHD2ebFgxZnez9I7kix5sOBBKTUAyHltZJEOLFjyoslXgUSgBPsbclgg5PFbqc4HgbLFrhHBZgGD5f8llZuI2Gav/yL7ko/GePot5KW6girEGPaFinSdlEpElfln3jA4/gW19raOVdpBGMSfLk6raUFokVC6bQPBzArs474= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143232; c=relaxed/simple; bh=ggqh6x4rvHEOds7dkKzb66W9vx8ae/v/vWbD1sUbTuw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=gz8EhsDkHBa0hMsmqVIYaJl4hhQYUFUuQg/2jyJVGUqhJcaVkKkDAOIjLDpQIX4UHGqFM/Lw1qXLEYQhYGNsai9ChFi5JBIVL98S785mjntW6Q9AG31KQfyts2+IQYa66WEwIQo/esLtvd59Zg3/YxomAKbbJQB6Ce3xdUk3FT8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=m0lQuziM; arc=fail smtp.client-ip=40.107.212.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="m0lQuziM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T1NYvqNpkDeDhtGuP7N92UPxYGUjzPsypu37/NHhojxYtPlOQ54NbmQlGdWmcWzBOLFvRWkzDUvljVVTL3cuQVLagMjARUddApGL3Xt1GokxgNI4cWy/M94TMm1t+6FwHnW9x8g237zSppqeUnMJiVs3nTh8Ytb0S95FvrjQdhEbYjmwKKjlCvxKs0mIEUJ+JDKfGNNzYvo8JbwkcyU01iTW02rXyCMqovzjgWl8LsAO+NmEb9mbS7BrrNhX8UNyR6LMMPDMseHN1KzBo6fmXTkVtEBuSdKM9Xc76VbqvO+vqWTSQVgolK9viczbBURZ0P5LDcnXWta/TPToNj/qog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a5xXiO3DzM8FFJ40MVcyoLFGb9B1WJMxADKeXS7uWH4=; b=XEmhhPpZXjmlzalsqhiF8xtJqwKKm3L+1Fo56DKzf+AAQRvg1HHmwwkpwH5fENPgfBx+l0ojHEzjsCXwjk5f1qq0d/dWZNraKEUnBnJoWiJ/Kz8wE8u8WAUdXFcaIMzaI6S7KLNxv5WCaSHF57TV60xVAFFPTU2aFT+puQrVIqjDhxmqIIULvdJMhuCyRbs1FFTOz1OVs9dQHotTxh5usZduBCzeqmvo6rbj5QkEgvNZA+dkLw9IxEslJOtJtecaJwQU1YaArsrV7HKcYjdd6QuK9xH0jM9wYwDJ00dWQkuCZQBLvnSq2YrTucJ1gXChz1/jJoM4giMIhdaIRMsJoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=a5xXiO3DzM8FFJ40MVcyoLFGb9B1WJMxADKeXS7uWH4=; b=m0lQuziMf636zFaXooVEP8BCvDi3pnf1LTrwq5KJeUCPj/51Svpq8sbNlSVlujLsJ4+weK0c06O9KZAjJ2vTmA0kLuTedwPBMUkjil1uUuSi6td8XMGd8R3qFPQcfolW695gkwp/BjWBYuYwGuK7jU4S4ZIX/JyoLYvjN+JStW4= Received: from SN7PR04CA0048.namprd04.prod.outlook.com (2603:10b6:806:120::23) by SA5PPF634736581.namprd12.prod.outlook.com (2603:10b6:80f:fc04::8cd) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.20; Mon, 25 Aug 2025 17:33:48 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::b8) by SN7PR04CA0048.outlook.office365.com (2603:10b6:806:120::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:42 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:08 +0000 Subject: [PATCH v5 11/20] x86/mce: Separate global and per-CPU quirks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-11-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|SA5PPF634736581:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fc37fd9-441e-4bf1-62c3-08dde3fd8ba3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?aUdyb04yWHNMRnd6QTUwZ253WXRmYTlVckFPamFlSjZLdFNjMHdTTHFmNXBk?= =?utf-8?B?K3ZpZVhEcGozUWVIWjY4OFFmdzc0MDZ4R3VUR1hjMmxKb1lvekM3SHVlUEFY?= =?utf-8?B?SmVMU1NvYTlRR3JTVlExL2IxK1V2NDJTbk9OM0xIUVRud1RrcldSZ3ZsbEx3?= =?utf-8?B?czBxVG15bUdXcVVFVFNyYWZvWE1wWEN6eVkxKzJmQ204NUtzWWRWeER3d0d0?= =?utf-8?B?aW53bEJrSFF3MXJESDVONkFhZ05OdFhUODJyNmNmYzExNk1ZWm93VndJZ1V1?= =?utf-8?B?bDBFSitVN2pkaHFsam5xcTRHbXF0eXpOQTQvQjlscSszZ3JETnhqcW93cE5O?= =?utf-8?B?MXlOSTRDNmZ0dGpsTC82QlkvbUM3cklZdlpWOHg1bllWdXNSWVg1Zk9YMmtr?= =?utf-8?B?WUEvcnkrQi9FS0tlcU9ad2xTRjgvMUl2ZStXOENraFF0Y2VUNjVjZVI3dloz?= =?utf-8?B?WG1KNTM0K2FHSEpwUURoWHlxMlMrMDRjWmJpZk9JcFpUdTZnMExFV2hSUXdn?= =?utf-8?B?d1BXd2pYdFk0MEtCLzdWY2RBK1dlNHNCWkZ6REs5bWJuRVh1NWcwMGpyU1A0?= =?utf-8?B?ajhGTHQ0WTA2TEx0TGZ6TzBlSzJhb2lSakVKcmJFTnhSVVZFL1lGdWtqWFFr?= =?utf-8?B?VHVRQ1hzc01hY1RoS2VlRHdvSTRYcWxkdStnb0I3VTBEN0ZIZTI3Rk92STlE?= =?utf-8?B?YjQrUnFkcTE5NlllWDdkZFNnZ2tBTklOU2l1OEV4YWtmam9CY1BLUmwrT3Ay?= =?utf-8?B?czhVbjZHM0lUYTV3eDd1c3lPNDZWazRCR3RYZjVJNkpWb29HdExkSHF4c3Nt?= =?utf-8?B?dmhaZWNHcEZWTllPc3lqbmJaTWIrN2gxeHRxZFFZb29qMTc2UEdIK21BTjl0?= =?utf-8?B?L2MyeENMUnJYSzczNHgzRnZqVHRqc2o4TUVtZkZkK0MvL21nL2Njd2E4S1JY?= =?utf-8?B?dzd6SjBaNStVQmFMU3lMc25aL29jQWJlTUticlYvZmZ1UzhJbEVRYTZ5YktW?= =?utf-8?B?eXBEQVhzUE5wVnNkZVFwUDNaNE54VHhEL3ZpTUZQZTgxdm9hWHIxc3VoK1Rr?= =?utf-8?B?VUZZOXpsdGZFZGJHU0ZZcWdKckI3NjJEY0xLU3FZK0JSR2hLcjh4bndiMnR3?= =?utf-8?B?ajFZTmYrOVRKdkJ0N0tHYWtWTWU4aHFZWVlWRUZIZHJmSndKOHNRZFdMeGty?= =?utf-8?B?UXlKdHBqam5lSlplbzJXWEFjYWh2M2NlcldrVnFmc0dwS0tISm1icEt3Umc4?= =?utf-8?B?NVp6MHI1VWkrMW53TXNRaEV5L0tWRXlHWlIzNjFMT3JnRDlLWWt2V2VnaEx3?= =?utf-8?B?R2QvRjVaNzRFMjVBajlGSUppQlcyM3lHeGVqM25TK1lQRVFGbE43QUtxUm93?= =?utf-8?B?UDUvSmFwNFBzdWpUcGRXcEhGcU4rbjZoMmN0Ny93dFJtNXEyazQ0MldiZndh?= =?utf-8?B?QnMrK2orNWVVOVNNT01HM0dHaU5PNVF3MFRzaGRudmJya3ZsRDA3NVV0aUlm?= =?utf-8?B?UVEyOWc2SmROU3ZTL3NSL3dJUTlNUm5xdnhRQkVkbVc4VFlHR1BnV3JYR3hT?= =?utf-8?B?RXE3Z1hYTWFHR0JUaS9EYlFEYU96MGVabm9CZUlyc2xzQk16WElNZG1JT2Ft?= =?utf-8?B?MDlrcWF5QlVEVWZvNFFzaDVVNzZFcnhkWm1EZXBVVmd5RjVBVC84cUY0NFlM?= =?utf-8?B?YitUTy9YOVZPUk5tNzVZc1RuRDhLdTJFMVN1djNpOUl1cXdYQ2YwTU1yZi9y?= =?utf-8?B?Zi8xUld0OHlldHh6Tnk5c2JxM3I4N3lobVYyZ0EvWjZJakl3WnU3bUtLMVdz?= =?utf-8?B?ZDZSNUZrUUV6dXhjQ0pVd29DS1Y4S2JZMDNndGNIcWhpenRqaEpnMUJzcXUw?= =?utf-8?B?WGl5bVdESVFzM3lFTndkZ2I1Y0Z2NUhyWVhyUW9wSEtSdkFvTytpWjRVbVBt?= =?utf-8?B?YW1JdUZ2RjR3UlpndFlRZEc3Q2ROb0IyRU95Zi91VkRnSlF3QVdpYXBzN2Fw?= =?utf-8?B?T3B2TlNqV08yZ2V2MGcyTFhpOGpKYTNxY1NubCs4U2RZblh0ZyswRXpVd202?= =?utf-8?B?b0ZyUjR3dGh3S08yK1h3SG9GMVY4cXlTd2hjdz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:46.4804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fc37fd9-441e-4bf1-62c3-08dde3fd8ba3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA5PPF634736581 Many quirks are global configuration settings and a handful apply to each CPU. Move the per-CPU quirks to vendor init to execute them on each online CPU. Set the global quirks during BSP-only init so they're only executed once and early. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-14-236dd74f645f@a= md.com =20 v4->v5: * Apply consistent naming to quirk functions. =20 v3->v4: * Add newline in mce_amd_feature_init(). * Remove __mcheck_cpu_apply_quirks(). * Update code comment ref. __mcheck_cpu_apply_quirks(). =20 v2->v3: * Update code comment. * Add tags from Qiuxu and Tony. =20 v1->v2: * New in v2. arch/x86/kernel/cpu/mce/amd.c | 24 ++++++++++++ arch/x86/kernel/cpu/mce/core.c | 85 +++++++++++--------------------------= ---- arch/x86/kernel/cpu/mce/intel.c | 18 +++++++++ 3 files changed, 65 insertions(+), 62 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index efcfce329ca7..42f5c115395b 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -650,6 +650,28 @@ static void disable_err_thresholding(struct cpuinfo_x8= 6 *c, unsigned int bank) wrmsrq(MSR_K7_HWCR, hwcr); } =20 +static void amd_apply_cpu_quirks(struct cpuinfo_x86 *c) +{ + struct mce_bank *mce_banks =3D this_cpu_ptr(mce_banks_array); + + /* This should be disabled by the BIOS, but isn't always */ + if (c->x86 =3D=3D 15 && this_cpu_read(mce_num_banks) > 4) { + /* + * disable GART TBL walk error reporting, which + * trips off incorrectly with the IOMMU & 3ware + * & Cerberus: + */ + clear_bit(10, (unsigned long *)&mce_banks[4].ctl); + } + + /* + * Various K7s with broken bank 0 around. Always disable + * by default. + */ + if (c->x86 =3D=3D 6 && this_cpu_read(mce_num_banks)) + mce_banks[0].ctl =3D 0; +} + /* cpu init entry point, called from mce.c with preempt off */ void mce_amd_feature_init(struct cpuinfo_x86 *c) { @@ -657,6 +679,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) u32 low =3D 0, high =3D 0, address =3D 0; int offset =3D -1; =20 + amd_apply_cpu_quirks(c); + mce_flags.amd_threshold =3D 1; =20 for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) { diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 14456f6c2f7b..21a5ea239e93 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1807,8 +1807,9 @@ static void __mcheck_cpu_mce_banks_init(void) struct mce_bank *b =3D &mce_banks[i]; =20 /* - * Init them all, __mcheck_cpu_apply_quirks() is going to apply - * the required vendor quirks before + * Init them all by default. + * + * The required vendor quirks will be applied before * __mcheck_cpu_init_prepare_banks() does the final bank setup. */ b->ctl =3D -1ULL; @@ -1882,20 +1883,8 @@ static void __mcheck_cpu_init_prepare_banks(void) } } =20 -static void apply_quirks_amd(struct cpuinfo_x86 *c) +static void amd_apply_global_quirks(struct cpuinfo_x86 *c) { - struct mce_bank *mce_banks =3D this_cpu_ptr(mce_banks_array); - - /* This should be disabled by the BIOS, but isn't always */ - if (c->x86 =3D=3D 15 && this_cpu_read(mce_num_banks) > 4) { - /* - * disable GART TBL walk error reporting, which - * trips off incorrectly with the IOMMU & 3ware - * & Cerberus: - */ - clear_bit(10, (unsigned long *)&mce_banks[4].ctl); - } - if (c->x86 < 0x11 && mca_cfg.bootlog < 0) { /* * Lots of broken BIOS around that don't clear them @@ -1904,13 +1893,6 @@ static void apply_quirks_amd(struct cpuinfo_x86 *c) mca_cfg.bootlog =3D 0; } =20 - /* - * Various K7s with broken bank 0 around. Always disable - * by default. - */ - if (c->x86 =3D=3D 6 && this_cpu_read(mce_num_banks)) - mce_banks[0].ctl =3D 0; - /* * overflow_recov is supported for F15h Models 00h-0fh * even though we don't have a CPUID bit for it. @@ -1922,25 +1904,12 @@ static void apply_quirks_amd(struct cpuinfo_x86 *c) mce_flags.zen_ifu_quirk =3D 1; } =20 -static void apply_quirks_intel(struct cpuinfo_x86 *c) +static void intel_apply_global_quirks(struct cpuinfo_x86 *c) { - struct mce_bank *mce_banks =3D this_cpu_ptr(mce_banks_array); - /* Older CPUs (prior to family 6) don't need quirks. */ if (c->x86_vfm < INTEL_PENTIUM_PRO) return; =20 - /* - * SDM documents that on family 6 bank 0 should not be written - * because it aliases to another special BIOS controlled - * register. - * But it's not aliased anymore on model 0x1a+ - * Don't ignore bank 0 completely because there could be a - * valid event later, merely don't write CTL0. - */ - if (c->x86_vfm < INTEL_NEHALEM_EP && this_cpu_read(mce_num_banks)) - mce_banks[0].init =3D false; - /* * All newer Intel systems support MCE broadcasting. Enable * synchronization with a one second timeout. @@ -1966,7 +1935,7 @@ static void apply_quirks_intel(struct cpuinfo_x86 *c) mce_flags.skx_repmov_quirk =3D 1; } =20 -static void apply_quirks_zhaoxin(struct cpuinfo_x86 *c) +static void zhaoxin_apply_global_quirks(struct cpuinfo_x86 *c) { /* * All newer Zhaoxin CPUs support MCE broadcasting. Enable @@ -1978,29 +1947,6 @@ static void apply_quirks_zhaoxin(struct cpuinfo_x86 = *c) } } =20 -/* Add per CPU specific workarounds here */ -static void __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) -{ - struct mca_config *cfg =3D &mca_cfg; - - switch (c->x86_vendor) { - case X86_VENDOR_AMD: - apply_quirks_amd(c); - break; - case X86_VENDOR_INTEL: - apply_quirks_intel(c); - break; - case X86_VENDOR_ZHAOXIN: - apply_quirks_zhaoxin(c); - break; - } - - if (cfg->monarch_timeout < 0) - cfg->monarch_timeout =3D 0; - if (cfg->bootlog !=3D 0) - cfg->panic_timeout =3D 30; -} - static bool __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c) { if (c->x86 !=3D 5) @@ -2258,6 +2204,23 @@ void mca_bsp_init(struct cpuinfo_x86 *c) =20 if (cap & MCG_SER_P) mca_cfg.ser =3D 1; + + switch (c->x86_vendor) { + case X86_VENDOR_AMD: + amd_apply_global_quirks(c); + break; + case X86_VENDOR_INTEL: + intel_apply_global_quirks(c); + break; + case X86_VENDOR_ZHAOXIN: + zhaoxin_apply_global_quirks(c); + break; + } + + if (mca_cfg.monarch_timeout < 0) + mca_cfg.monarch_timeout =3D 0; + if (mca_cfg.bootlog !=3D 0) + mca_cfg.panic_timeout =3D 30; } =20 /* @@ -2277,8 +2240,6 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) =20 __mcheck_cpu_cap_init(); =20 - __mcheck_cpu_apply_quirks(c); - if (!mce_gen_pool_init()) { mca_cfg.disabled =3D 1; pr_emerg("Couldn't allocate MCE records pool!\n"); diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/inte= l.c index 9b149b9c4109..4655223ba560 100644 --- a/arch/x86/kernel/cpu/mce/intel.c +++ b/arch/x86/kernel/cpu/mce/intel.c @@ -468,8 +468,26 @@ static void intel_imc_init(struct cpuinfo_x86 *c) } } =20 +static void intel_apply_cpu_quirks(struct cpuinfo_x86 *c) +{ + /* + * SDM documents that on family 6 bank 0 should not be written + * because it aliases to another special BIOS controlled + * register. + * But it's not aliased anymore on model 0x1a+ + * Don't ignore bank 0 completely because there could be a + * valid event later, merely don't write CTL0. + * + * Older CPUs (prior to family 6) can't reach this point and already + * return early due to the check of __mcheck_cpu_ancient_init(). + */ + if (c->x86_vfm < INTEL_NEHALEM_EP && this_cpu_read(mce_num_banks)) + this_cpu_ptr(mce_banks_array)[0].init =3D false; +} + void mce_intel_feature_init(struct cpuinfo_x86 *c) { + intel_apply_cpu_quirks(c); intel_init_cmci(); intel_init_lmce(); intel_imc_init(c); --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2077.outbound.protection.outlook.com [40.107.92.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10C9830AAD0; Mon, 25 Aug 2025 17:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143236; cv=fail; b=AWnavUZ9JqzoIubSrJ8hW9EuGU6WQttWjvdY8bjRZxKkUpsCLBOfZpskt8c5hfjZ8L/YHOxjLWI3inlZViaUBL+bibfYKibNShqCr6+UOFwnhP5YW7w5sgU8Vf2h0fTloIJau6Vqip7/OzejS9HBHS9VE9FnTpJP7LmhAwCXn1Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143236; c=relaxed/simple; bh=/tm9fmLWlNZosIX0p0kUv8XJIRt6+wZPyBK/FkAp6to=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=lx8dYcGopPT8LBHAAy6oFnNvGa3fbMKufK/3Q0FlIkRGDyR9gzw0QSejxWnnhru9m8xzCJCUgq56H/Xtyxqjd5opLcx3MH/wB2Q/hRkBwl5CJOyhWyPfSZhQeF1fCoUz9IYt6I80bLodaTY6TYCVwdUJqVXz9U/9dbFZoDf9aOQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=rjClSTnj; arc=fail smtp.client-ip=40.107.92.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="rjClSTnj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bVIsuvXYHssL2CvQc+qkzuzbIsQMzRhIRlTiTExbHZiO6WGJfsCV7LeTE8Ra5fbFTsPHs6nkU4baDtAA6womZ7JJGqeTjnaKyy2DROkz03IqSH4HAZ9Aresr+cdJgiuVM6tCVHPot0ePHJ6POQW9+aqN5kAniiPbAhKPEiu746GyWrPkW/XGeMZowiGKnF6oyqL4dQslIeoVyBfs1pFuXB7IBZmtU8G2qmXp/eYNXzBMdtl5/k0JYIP6C54EoVMVqD0Rs66q0vfebgyqKtxeAUUeT9jEAp7oNe+rPQR2uqmjVpx8tmlzuco5DjKIC3+KH/IHl54TOKwZWTi7OqzB7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AyQ25cKn5JeQPpWBZbHflPZ1cEtWF9lEUW2RWd63CXU=; b=guZA0C4luLqAVFj880luea6jfRqt7jFDdCo82pf1kAxuj0NFR7LDWf99NeHaMEe5BoLjV1OLnHZvyGLlYUBGLGSGQmdfPdRruc8UQz1krq0G/ad5r4TOBHEHXipKNUqvT4VzivR0BWX33G0j9xGL1aMCZdo6L7gbsdaBjpL8IXdN27tXsCu5h7qp8vjMmIvCffFEb/4I4IUqrgME4H0lohC5kZI9xGi/XmVd5dUjNGzlcvWALvf8EpZoACECzaDKFgTsqiMNtjHpOEYt/G71qVCuHrvt4XOBt/gMZ7NL0wFQRZ6TGnXQymQD/gdCsms5JoRitYcBD1GoSAv4RmrYtA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=AyQ25cKn5JeQPpWBZbHflPZ1cEtWF9lEUW2RWd63CXU=; b=rjClSTnj2+jnNSa1VJ1jEKJu55owQTmWWBb9ueR3mNm3tvDuBNSU3HS2j9DPM9F3JQlp0fcf6Dnm/ndPfOWxT1rpxlfFFVaeLHm5gN+yrprbvEOhyJKqr0zYiKjQCZNa+/8//YRsMoKeGM5qvTJQy5Q0/LGuN1twomPL/tGQ/Bs= Received: from SN7PR04CA0033.namprd04.prod.outlook.com (2603:10b6:806:120::8) by DS7PR12MB6167.namprd12.prod.outlook.com (2603:10b6:8:98::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.16; Mon, 25 Aug 2025 17:33:47 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::ef) by SN7PR04CA0033.outlook.office365.com (2603:10b6:806:120::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:46 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:42 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:09 +0000 Subject: [PATCH v5 12/20] x86/mce: Move machine_check_poll() status checks to helper functions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-12-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|DS7PR12MB6167:EE_ X-MS-Office365-Filtering-Correlation-Id: 081222c1-4bda-444c-2229-08dde3fd8bbc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?T2FZdk1YSXkrV0dPK2lRNitKVTRFSjNSTnRSSEd4ZlNxZHpLRTE4VGh4WSty?= =?utf-8?B?V1VxLy84RWE4cGh5czZVRFcrWmRrSTROeEhqTE4vMS9jK1BNeGR0eHhmcTNr?= =?utf-8?B?YzI0S2diREZyYW8xQTB6dmdKRk1wK3NxaG5CblRQdDFDd2NZMHlTTklLS0Nu?= =?utf-8?B?OFVMaGdQeG1lMndyZDNqbHlBTXNIOWRNVTlueUY2UW5abFNaMTV2OEVWWFF6?= =?utf-8?B?R0Z1VzZTc0VzY0VYTXpuM2ZxN0k1cFdIZEVNUUo1Y3pOUjlyazlzZjBFbUpu?= =?utf-8?B?UkhIenBLeEJlbGdReTY1NXNaTmltSWFBalUrUGtXVWhTcFVqcDA5azg5Wk5n?= =?utf-8?B?ai9WeVBpMExLNGtEVXM0clBqMnJkeUZHeUxqT2tRVUxVNGRqclFSU09Gdkd6?= =?utf-8?B?SlRrdXJVU0hMK1NUVThzUW9UekRoRHk2RVRRLzlnV29NeHdWTW5OYzFkek9S?= =?utf-8?B?RkhadU5VYUhLeEtaQTRnQzVMUUdZY2J4Rmx2MFRjT0VIalRMUnF3cVhSUUxx?= =?utf-8?B?dTVKK0NmREszaVhzUVV4L09WSHJJajZqWTQxc3IxMmpDZGgzYU4wTnBSUVJ0?= =?utf-8?B?bTB2Si9GVlNtOFBhY1Z0eWF2aU1GODg0UHgxWWNNQjdxVzVTNWFSUUtMcTFn?= =?utf-8?B?MzZNVEpNSVc2TG9LbUs1SGpRejJiOThvc3dFTjl3LzNpSWVnRDZnL2Q5VHNY?= =?utf-8?B?ZjFlanNzekpPd0ttSEdJR0UxVjVNNzlidHFIaURKbXdFMjU0OXhVVitXQUov?= =?utf-8?B?QlBTWlUzNnA3R2lNMVJ6cFAwTElLbjZsaEdsSUVWbzBoem95elh0TEpFVlhL?= =?utf-8?B?TXpCQ2ZhSHI2TmYvUHhXck5PODUzRnZtQmE4Sk5xUUlaOTJJcms5WFJEUmhI?= =?utf-8?B?L1oyb1FkRjNaOTZkLytHWHBQMStFamdzMmJQWlVaUUtjNm00US9IRklhZC9O?= =?utf-8?B?VmhoeGJtM2d2YUc1RzFkamN6b3VxMjdKanJ0Wjh2b3NNd3R6amIyWFNmWXAz?= =?utf-8?B?NTJtdERoSE1JaWtQTExic2FiZlFwbFlleFpXc21DOUk0d2dZbXIrV1YzVkV1?= =?utf-8?B?NzFIbWQ3RUtHb0I1ZCsveWJaNHhJell0MUY2cWVFYTR0NjUyVVZoY3FLNkJn?= =?utf-8?B?R1pVa1lCc0pnK0lrVWw0eVByR29nSmNTVjZXczNoaVpQbURucE9UUDlBSldH?= =?utf-8?B?a25BMnZSTjBzOU54Y2dYOWhhQTJTdnIrdmFGeGRLZ2VDVlRZWFQxNk5xQmRJ?= =?utf-8?B?djFKdlpvdWxpQjhUUk9Ob3VEeGNrNWw4UnJ0eTZSY09VOVB2RE5UZXpFM29E?= =?utf-8?B?bWhFdFRyeG1FNG1zMlI0VmhYWDRCK1AvNHptQ0FHUGVpSDEzMTY5dFpDTVFT?= =?utf-8?B?eHhVeFh2VGtIMGNRWTY2dURlb3FCaGQveElLODJWZUVUOGx4SFFZMzNwMkRJ?= =?utf-8?B?bHdoNlNTdG1uN2xQSW9mUnFoTS9CZmxEMHNORTZPL05VNm5IdHNNek9kVjBI?= =?utf-8?B?WVVnMzNPemxOWmwyTHdZaW84SThBSmxEVzQzdExqYkM3Q2lyMXhIZUk3RmZR?= =?utf-8?B?ekI3Vjh0eWJ1Z05VblNsQ2gyaU14V3pLbktmWFJjRVJ6K1VRbnpjYmxSVDVi?= =?utf-8?B?ek1UZUpqakJGc3I1Wk1lWWZrTlhyUzREK0hyZTBWblFISnZ6dkVISWl6Zmlh?= =?utf-8?B?eWZTa2hrT1paOTRkYUZGZTZySEhIY0hUcUhFWTF1UVlIWnlaWGpCVmxJa3FB?= =?utf-8?B?ZlF6ai9xWFFnRGFwUG8xWEtrYm1mU3c5eGxUV2owNHg4ZHZsYWZnS2VPK1pT?= =?utf-8?B?TTlRbVJRaDlQaWp5bUEwTFdzWFlNNmQ0aDlZcnFqajFxblNtdkpYRXQ1cXhZ?= =?utf-8?B?Rk85RmdtZ0FmaG9kTklKcEY3Lzd4b0taWWQweU91VUhIclluemI1MzhFWXpQ?= =?utf-8?B?QUxDeis2WU5sNXVNZU1xZmdGUFhFVnByV25qTTFEaXZuRFRRWWR1U2xXb3Zp?= =?utf-8?B?em9xQzA4VUJodWU2S0dWUlExRk9sOWdCcllScm1TejA5b3ltV2JHUXRIc2ZH?= =?utf-8?Q?mNutv9?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:46.6414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 081222c1-4bda-444c-2229-08dde3fd8bbc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6167 There are a number of generic and vendor-specific status checks in machine_check_poll(). These are used to determine if an error should be skipped. Move these into helper functions. Future vendor-specific checks will be added to the helpers. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-15-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * No change. =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * Change log_poll_error() to should_log_poll_error(). * Keep code comment. arch/x86/kernel/cpu/mce/core.c | 88 +++++++++++++++++++++++---------------= ---- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 21a5ea239e93..b3593a370bc9 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -714,6 +714,52 @@ static noinstr void mce_read_aux(struct mce_hw_err *er= r, int i) =20 DEFINE_PER_CPU(unsigned, mce_poll_count); =20 +/* + * Newer Intel systems that support software error + * recovery need to make additional checks. Other + * CPUs should skip over uncorrected errors, but log + * everything else. + */ +static bool ser_should_log_poll_error(struct mce *m) +{ + /* Log "not enabled" (speculative) errors */ + if (!(m->status & MCI_STATUS_EN)) + return true; + + /* + * Log UCNA (SDM: 15.6.3 "UCR Error Classification") + * UC =3D=3D 1 && PCC =3D=3D 0 && S =3D=3D 0 + */ + if (!(m->status & MCI_STATUS_PCC) && !(m->status & MCI_STATUS_S)) + return true; + + return false; +} + +static bool should_log_poll_error(enum mcp_flags flags, struct mce_hw_err = *err) +{ + struct mce *m =3D &err->m; + + /* If this entry is not valid, ignore it. */ + if (!(m->status & MCI_STATUS_VAL)) + return false; + + /* + * If we are logging everything (at CPU online) or this + * is a corrected error, then we must log it. + */ + if ((flags & MCP_UC) || !(m->status & MCI_STATUS_UC)) + return true; + + if (mca_cfg.ser) + return ser_should_log_poll_error(m); + + if (m->status & MCI_STATUS_UC) + return false; + + return true; +} + /* * Poll for corrected events or events that happened before reset. * Those are just logged through /dev/mcelog. @@ -765,48 +811,10 @@ void machine_check_poll(enum mcp_flags flags, mce_ban= ks_t *b) if (!mca_cfg.cmci_disabled) mce_track_storm(m); =20 - /* If this entry is not valid, ignore it */ - if (!(m->status & MCI_STATUS_VAL)) + /* Verify that the error should be logged based on hardware conditions. = */ + if (!should_log_poll_error(flags, &err)) continue; =20 - /* - * If we are logging everything (at CPU online) or this - * is a corrected error, then we must log it. - */ - if ((flags & MCP_UC) || !(m->status & MCI_STATUS_UC)) - goto log_it; - - /* - * Newer Intel systems that support software error - * recovery need to make additional checks. Other - * CPUs should skip over uncorrected errors, but log - * everything else. - */ - if (!mca_cfg.ser) { - if (m->status & MCI_STATUS_UC) - continue; - goto log_it; - } - - /* Log "not enabled" (speculative) errors */ - if (!(m->status & MCI_STATUS_EN)) - goto log_it; - - /* - * Log UCNA (SDM: 15.6.3 "UCR Error Classification") - * UC =3D=3D 1 && PCC =3D=3D 0 && S =3D=3D 0 - */ - if (!(m->status & MCI_STATUS_PCC) && !(m->status & MCI_STATUS_S)) - goto log_it; - - /* - * Skip anything else. Presumption is that our read of this - * bank is racing with a machine check. Leave the log alone - * for do_machine_check() to deal with it. - */ - continue; - -log_it: mce_read_aux(&err, i); m->severity =3D mce_severity(m, NULL, NULL, false); /* --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2082.outbound.protection.outlook.com [40.107.236.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D7E13093A7; Mon, 25 Aug 2025 17:33:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143233; cv=fail; b=mcIg9lMF77LLwNlLq3CSPBfPXoL7g7kzqBdeXalNDQ6dtFHAwHrz+y1KO3pCjTFJLZOr4iyYqM376wqHZUV1lUydEzvDahRt+bupX/QYxkjwXv7TvaLDwx3rD8xmo/hzJOGpeheo+lz3R9++WfcCfAayv+hAyWjkTjRukK2bNqc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143233; c=relaxed/simple; bh=GCZyg5EZx95O/q1qpCVtkzwRjZIIqEu6oFVSFGyAKdw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=hv+82BhjnJDPfCmzZhDMzN7fkB/jo6z/Bt5EnO7LjIAjSnZQIpJvBbwWPrAgUqNnvP2IKGbYgGG8atfzxsbczrJjBrkjogdy6V+Dl9FfDzax2wndH271HLyRxApOkM3i9xWMmV8RaArPvZzIioSM1pq8c5HnhMj2WPuXsVRYKkI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=zFHSa4dX; arc=fail smtp.client-ip=40.107.236.82 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="zFHSa4dX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mYSIzvB1H1UpUBUnboFASPzOirGNai/DZ9QpyCsPAcdgPywH7Rwe3d2vyYlMA99LCvo31Uk7GI8OQXvo1qb9rOZk4E2Zj3Zebm9F1oycc+kxoE8XIHEfYYnfXQNgTbT+wZDXp+lNhipappcvLwbB7TNb85i1tKjrNEcD/iMpktpTYZqLi3ArDGjCOPimLwkxp2K5fNpAxs/k3D/kXN4NK/MIhKJ+YZPfi32QOv+kC8BeOK/TcUR1VOPhbtSVLx4Q0KO1vdGpoKDFT976O0KlUFikdu3rR37olTal6DNS6yRAiudQpe5AbIixdpyTm2JO7NGs2QGqI1p9WO14XDirOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=57bxtnJR6Ul5tGmldAwGIQPZfCzpv0fYkhXfY7qkXjE=; b=gNX2uopSe4bL970JIZiTmbJj3lIhdcUOJzA8XnI80ZsDS97/iIizfe9VxBjo+/K+H3H+L5+zUkiiFr9w3Jxg2HC2Ng7J+2q4+qvyIWihsf3SiJFU+edoEt9mfM9oOY96GuETRIrhG80YY5aaaK7M8aor5PvFymhbvNPlyRgI0hOYGt8wtpGe1UaXGsL2g7srg2C9eyaYMqW9Scxbssxj+w43fVke/cdRtz8AJk3NWR8tYLTLPlxVVXhmw/0OFuc3OKF/Hgayr6a82L1bWH8F59698UatepRymYkqNFaH1iv8NxS7vj56ElS2y7RUxjgbaD0n3qg71+FHFKlyyJjMHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=57bxtnJR6Ul5tGmldAwGIQPZfCzpv0fYkhXfY7qkXjE=; b=zFHSa4dXy4+eLTpcacciV7IxcgMPWauI+9cZO75vk2rrNBxCv36PgntwFdWdqI9Bf8fQqkenubKEOhPYlKc0HrIPZcvjeBDBdOuFACLy1oixN6/SQriGqu4TCdu+iyWldUQvHMrrOFSknG3X74iRct8Anh+CxExjI8T+ZAyl6uI= Received: from SN7PR04CA0048.namprd04.prod.outlook.com (2603:10b6:806:120::23) by CH3PR12MB9220.namprd12.prod.outlook.com (2603:10b6:610:198::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:48 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::f3) by SN7PR04CA0048.outlook.office365.com (2603:10b6:806:120::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:48 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:43 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:10 +0000 Subject: [PATCH v5 13/20] x86/mce: Unify AMD THR handler with MCA Polling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-13-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|CH3PR12MB9220:EE_ X-MS-Office365-Filtering-Correlation-Id: 376e4ed9-b34c-40f1-d381-08dde3fd8cae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?QVQwTUl2K1ZOT1hNVzkzUitybVJ4bm91aGVzV2NXa0pCTkpuQ1RaTEZPSk9T?= =?utf-8?B?enN4ZEdSaDJKRkJRZkVzS1NSM2VuNnhKRVFpL09NdnZYMXhFa1BGS3lDQ1g3?= =?utf-8?B?dnRyVEV1UWQyRDZmcTRYY1ZnczhpSW1qbWFWWVo0QVRZdmQzaHFXNE13WmFz?= =?utf-8?B?anBUR21zNW4xNFlEc2RhK0JwRkZ3c2tlK2ZCMXhSS0syRkRHNm5FV2ppMW5v?= =?utf-8?B?UTI3QVNyYXlMUVY3Z09pSEdKb0ZIWE96WndiR1JWTE5sdG55UmRsR1Zja3Fa?= =?utf-8?B?cXNjY3JhUmRaZHBSclZLTnZISDh4TXovZ2lkK3VuQjJHZElYeTdsYVdZaXlm?= =?utf-8?B?NWNYaDRhcHlwdmgzN0x4cmRoSGlqTmZCU0hjeC9PdWJXdVZGSGZ3QWd5bTQ3?= =?utf-8?B?cWdtclIyVHRyQzFCb1U3WTJQd1NhdkdpU05QMkZGSmdjbkgvYnB4Mm9DUTFX?= =?utf-8?B?SUFtNXd0YU1TRU9pcERsUzNLMTdIN3dYMzNZTWp0QThqc2tuWVhidSszTTN5?= =?utf-8?B?N1lvS05zL3JtTkVmYTdOWEVPd2FwMTFsaHdTZTVKcHFJbzFXbFJsOXVVZVdo?= =?utf-8?B?SVVpZ2Rmd05vdHRpOURCMU1kL3hoMUptMWpMREdvbitaRWhZZ3FWc3ZkYmdw?= =?utf-8?B?SGN6b2g0SG9COHg0WkhXUU5OR0tCZDFJL0k0REdETU1kNEh0MWRmbXR2eFEv?= =?utf-8?B?MzdKU0JoN0hLU0xzUlZoS0JGL0w0U0M4MDRzZmpTWmFVQ0ZPZ3J0NEZqQzdw?= =?utf-8?B?NEc4dDdBYWlPMjNxMkJyeTlXNzZ0STlWbUpza3NwMm5nWmIrZTE0RGRvb2lh?= =?utf-8?B?ajYxS0IwQkZHamE4T1NKSnlxdHJzZEJtT1l5ZXFsTjI5RStLS09XMnNjSVhy?= =?utf-8?B?cTlNUUcvbXlLQ2FrcWgzeDJoemZWdE1WT1VHT1B1NXhuUnJiVzdwRXN6ak44?= =?utf-8?B?Z2YvWW5kbnBGeWRwTkQ4dVJ6d1J3UmVkTWpsWnhVbzQzTWFsU2lQdFkxVUZF?= =?utf-8?B?bzZSbFFIMGMybjU1cFFJRVlBNkpTaHNhZ2U5ZERQNGZvU2xCQkRaT0pkSklS?= =?utf-8?B?UmJnL0hIUHJKVmlCR1RwbDBHT0JWcG1tV2RMY0c0cFNMVEFUc3lNZzlhTzAv?= =?utf-8?B?dS9mZGRkN1FscWJod2g4dTJkanFrb0JSZ0plZDN6c0RwZVYrRVNYZGlIOUVu?= =?utf-8?B?WlNMekJ6TDV4dkVnWmdvWHVzT25KSU1iVWlCUzZPeU9BMndzcDNFU04yOVRY?= =?utf-8?B?Y2ZJWW5YcFlWZXJueUdScnFtOFFHUlFpNDJoQXlrZDk3Q3A1OUUySGo2Q2pi?= =?utf-8?B?MHdvelBqa3RjckZkcmF6Qng0YnB3dlZxSldIdEM3S1g3S3MxVE1XWmhVeGJp?= =?utf-8?B?MSsvWDdIamdpT09INlN2dTR1R0pud1BsWndvQVlOS3V4bm9LRklvNXdyQmdj?= =?utf-8?B?c0xTT1BTTS83U0YrQVQrSmdaS1plT2xRTWNrUlduNmVjMUR2Rmg0NkxTWE4y?= =?utf-8?B?OHc0OUV6a1VZdFY0SzFvWXMyNDIxSkpzbG5NNk9XRjR0OGNCczFTWmlHenJG?= =?utf-8?B?blgxSC9od3ZBMUZEcENjb1JIbHdnSVNrQ3BGZ1NXdTZaeDd4eGxZTVlWNHNK?= =?utf-8?B?b0d0MlZBblZ2SVBVVU93Zk15WkRMN2FCb0xJZUZ2VmdiTWZ4VWV0RlVRZ0Yx?= =?utf-8?B?b0pZRkxBallQNHd2aCtoWG1qOGY0ZEkzLytGWktFTENuUmFZeURxdkY5SllR?= =?utf-8?B?QzFIY2JxaVdRQVpKdlRyVitvdTc3bEo3U3p0VGdmUDl1TGxKTTdhTFJVdVYr?= =?utf-8?B?cGRnbzg1dHZBS0cvQTVQKzlQUEhMM3lwOFk3SFhSZ3FQOWR2QSs1cUVCKzBw?= =?utf-8?B?RHgrTzd2YlpWeGpISmhuaXNPRXdGRVhGTVVpSWZUU3l4YmhUSkxYaDlHVGZu?= =?utf-8?B?ckVrOGlSZUFpUXdyT1c4VGhCNVBIQnhTRWpLVDVzbVgzYnM3QkZKREQvSzh3?= =?utf-8?B?eUU2cDBkcEhnVlBSdk9qVTBzRkcxSlB6WWRwdXNaTkRSNmRtSSs2Y1Q1N1p3?= =?utf-8?B?aDgzbDRrT3piUjRGTjhBaXJ5eVRkUTB3dllPUT09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:48.2334 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 376e4ed9-b34c-40f1-d381-08dde3fd8cae X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9220 AMD systems optionally support an MCA thresholding interrupt. The interrupt should be used as another signal to trigger MCA polling. This is similar to how the Intel Corrected Machine Check interrupt (CMCI) is handled. AMD MCA thresholding is managed using the MCA_MISC registers within an MCA bank. The OS will need to modify the hardware error count field in order to reset the threshold limit and rearm the interrupt. Management of the MCA_MISC register should be done as a follow up to the basic MCA polling flow. It should not be the main focus of the interrupt handler. Furthermore, future systems will have the ability to send an MCA thresholding interrupt to the OS even when the OS does not manage the feature, i.e. MCA_MISC registers are Read-as-Zero/Locked. Call the common MCA polling function when handling the MCA thresholding interrupt. This will allow the OS to find any valid errors whether or not the MCA thresholding feature is OS-managed. Also, this allows the common MCA polling options and kernel parameters to apply to AMD systems. Add a callback to the MCA polling function to check and reset any threshold blocks that have reached their threshold limit. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-16-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * No change. =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * Start collecting per-CPU items in a struct. * Keep and use mce_flags.amd_threshold. arch/x86/kernel/cpu/mce/amd.c | 49 ++++++++++++++++------------------= ---- arch/x86/kernel/cpu/mce/core.c | 3 +++ arch/x86/kernel/cpu/mce/internal.h | 2 ++ 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 42f5c115395b..63d8b12fe30f 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -54,6 +54,12 @@ =20 static bool thresholding_irq_en; =20 +struct mce_amd_cpu_data { + mce_banks_t thr_intr_banks; +}; + +static DEFINE_PER_CPU_READ_MOSTLY(struct mce_amd_cpu_data, mce_amd_data); + static const char * const th_names[] =3D { "load_store", "insn_fetch", @@ -560,6 +566,7 @@ prepare_threshold_block(unsigned int bank, unsigned int= block, u32 addr, if (!b.interrupt_capable) goto done; =20 + __set_bit(bank, this_cpu_ptr(&mce_amd_data)->thr_intr_banks); b.interrupt_enable =3D 1; =20 if (!mce_flags.smca) { @@ -900,12 +907,7 @@ static void amd_deferred_error_interrupt(void) log_error_deferred(bank); } =20 -static void log_error_thresholding(unsigned int bank, u64 misc) -{ - _log_error_deferred(bank, misc); -} - -static void log_and_reset_block(struct threshold_block *block) +static void reset_block(struct threshold_block *block) { struct thresh_restart tr; u32 low =3D 0, high =3D 0; @@ -919,23 +921,14 @@ static void log_and_reset_block(struct threshold_bloc= k *block) if (!(high & MASK_OVERFLOW_HI)) return; =20 - /* Log the MCE which caused the threshold event. */ - log_error_thresholding(block->bank, ((u64)high << 32) | low); - - /* Reset threshold block after logging error. */ memset(&tr, 0, sizeof(tr)); tr.b =3D block; threshold_restart_block(&tr); } =20 -/* - * Threshold interrupt handler will service THRESHOLD_APIC_VECTOR. The int= errupt - * goes off when error_count reaches threshold_limit. - */ -static void amd_threshold_interrupt(void) +void amd_reset_thr_limit(unsigned int bank) { - struct threshold_bank **bp =3D this_cpu_read(threshold_banks), *thr_bank; - unsigned int bank, cpu =3D smp_processor_id(); + struct threshold_bank **bp =3D this_cpu_read(threshold_banks); struct threshold_block *block, *tmp; =20 /* @@ -943,20 +936,20 @@ static void amd_threshold_interrupt(void) * handler is installed at boot time, but on a hotplug event the * interrupt might fire before the data has been initialized. */ - if (!bp) + if (!bp || !bp[bank]) return; =20 - for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) { - if (!(per_cpu(bank_map, cpu) & BIT_ULL(bank))) - continue; - - thr_bank =3D bp[bank]; - if (!thr_bank) - continue; + list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj) + reset_block(block); +} =20 - list_for_each_entry_safe(block, tmp, &thr_bank->miscj, miscj) - log_and_reset_block(block); - } +/* + * Threshold interrupt handler will service THRESHOLD_APIC_VECTOR. The int= errupt + * goes off when error_count reaches threshold_limit. + */ +static void amd_threshold_interrupt(void) +{ + machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->thr_intr_= banks); } =20 /* diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index b3593a370bc9..e7a9a175bf49 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -831,6 +831,9 @@ void machine_check_poll(enum mcp_flags flags, mce_banks= _t *b) mce_log(&err); =20 clear_it: + if (mce_flags.amd_threshold) + amd_reset_thr_limit(i); + /* * Clear state for this bank. */ diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/i= nternal.h index 6cb2995f0ec1..e25ad0c005d5 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -269,6 +269,7 @@ void mce_threshold_create_device(unsigned int cpu); void mce_threshold_remove_device(unsigned int cpu); extern bool amd_filter_mce(struct mce *m); bool amd_mce_usable_address(struct mce *m); +void amd_reset_thr_limit(unsigned int bank); =20 /* * If MCA_CONFIG[McaLsbInStatusSupported] is set, extract ErrAddr in bits @@ -300,6 +301,7 @@ static inline void mce_threshold_create_device(unsigned= int cpu) { } static inline void mce_threshold_remove_device(unsigned int cpu) { } static inline bool amd_filter_mce(struct mce *m) { return false; } static inline bool amd_mce_usable_address(struct mce *m) { return false; } +static inline void amd_reset_thr_limit(unsigned int bank) { } static inline void smca_extract_err_addr(struct mce *m) { } static inline void smca_bsp_init(void) { } #endif --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2048.outbound.protection.outlook.com [40.107.237.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C382830AAC6; Mon, 25 Aug 2025 17:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; cv=fail; b=hohbD1Qm4VPwOHc/t6kjfCSvh5aWWd+e91u9MSWhy7JdZOLESIjR9tx8ftegnplVKx8+axTa/fr+VazBmXsavjo9elOwApoP+wu0qMOZw+QB/4abPhbo9TaNGR4kJvViXMCdMNEXtMMoebixCCSIguO692Wh2cfalNkI3/BGcjc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; c=relaxed/simple; bh=+qcV1grJKsgBwBdMVadlDHsW351W8nndrRnO6ePdrPM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=nRMeXffGenOUfjGE3NK+jSO0ws3NhN2iMlX6A3zqJw936BqZ9O27+pzUNRoZenxn3kW+zOO+urU3YVV17WE0wbKmcx6ZWe/lVDtZvknfT2LRTbh4jmgnlXjAKbyHhxwP8dwcmuUw6uIZN6lo6sqps9JsQJOdc3tDqO7HA0ZJRF8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=og8OmCnr; arc=fail smtp.client-ip=40.107.237.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="og8OmCnr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M5xSGSZES31RuN80vHbJnH2bMaJ7izCmU9tWHsKYeaGeNpi+GmXlTlkRmpIZAjB9rvc2UhGqMlW7mxxSU1x2j2iknaqsVC0J7vchIMVfRoBRQuYh/lZ4rK+A3DE4wo72Kl2NRN2BnfTKxqbCMZi10J/5HHOc4XCkiZX6/aFTm0o3NPNKbpz9V3Gzti+cDw5AV5QxUl+5aPk/2yO1REdShCYuPmlRf1rAGrecYhYgtlYKepxwWQfTV6omU5XiPY6mKFIDTA84kUJlJsLdXs/ffwB44ndh59C0dtwATxifDQ29WyHXbYjEi3H0ewgvs0XzLKBWu5z/YmOrqHrKORV45w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Hh2S3cKezwjHo+/GZmeuMrOOyupyV11xw3oJ70ZkdGs=; b=OuJOnnEjWpWObc+qdpljG1AgV4/LvfijJ97gba2WmtyNnH7OX58St2Xfg7YrDyYPdR2bDt9mhRDaBJ7jOYiFIOqekfOOqMZJq0Zh0nu9n746vth+IAlzJFavO5Dah81X2d+VQn+F63dyo7iDnRvytie5UZEXj5qBf52h1wWK53QvByPtCJNJZVTR6R/BT0Hygk1rq4Hm8AD0A9MqgFjAuVvrRje4Q+WFrdojgmAc26fnEDDe9SbxcIJvJ4ZwpuVmHmjjkgR83Yz4KW8TreQmKoQwqENEFu/r2tSpEKtXhg/RD7ScoBYyRd/EBgkonuctntU+DaSeNor1Sd0PlY/hjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=Hh2S3cKezwjHo+/GZmeuMrOOyupyV11xw3oJ70ZkdGs=; b=og8OmCnrgdQfD7bftdIz3sJtW90zyMEs57gfGDoPXXJvxgZ6phMmKLzCvyl7n2yXyDieBgCMGi7c93LcqeaoMQ9YyTA02IM3cvu/ICY9d55lLxBhIldP0H44S/5II6MpDMofQdjoeCETz6S38DEoMeOv1dVGue0o1P+JYrpGK+g= Received: from SN7PR04CA0060.namprd04.prod.outlook.com (2603:10b6:806:120::35) by MN2PR12MB4456.namprd12.prod.outlook.com (2603:10b6:208:266::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:49 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::12) by SN7PR04CA0060.outlook.office365.com (2603:10b6:806:120::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:48 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:44 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:11 +0000 Subject: [PATCH v5 14/20] x86/mce: Unify AMD DFR handler with MCA Polling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-14-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|MN2PR12MB4456:EE_ X-MS-Office365-Filtering-Correlation-Id: 20304e4a-e324-4c32-4f7b-08dde3fd8d1c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?aUNXUjVyY1h6Yk0wMkE1Ry93SklleGFOeFQxaUFmNlFxdGMyYW5lU1VLaE1q?= =?utf-8?B?a0NBeDJpVHlsNE1oVlJrdTQ5Y1JwSTNZdXN6WWlSdXBMMEV3OG1HZDNEOWxs?= =?utf-8?B?M3hKQ0UwU0FPQ2ZXbDdod1dlVkxTdUxJY1B3bzd0a3lhTzMvUGdwNlFIQWRi?= =?utf-8?B?YnZHb0s0MThzRnhiT0NpRUR5QWJXblRKdHdDN1VqYmFUQkVLL1JaNFRwUElj?= =?utf-8?B?cTdWcWJJNzdYRXV6dUhNOEw5TXBXd3hHWm1VNE5yR3JQNTJ6ZExReHpJc0Nw?= =?utf-8?B?WCtEOWNEdUxwSGdwWkZ1QXRjdmZJNkZGUkRWb3ZMb0w0ekRGcmtOQ09uUTE5?= =?utf-8?B?R2ZQdUFVMU95dzFhL2hDUzNrYS9PSFIreDZncHVqVUdRT3Y1QklQUzB3aGJj?= =?utf-8?B?SEtQaDc2c1VJZzlzZFQ2WWM4TTVzZi9PWUUwcXVXMHkyajNNRGFYaDdQMW1V?= =?utf-8?B?NTBib3o5eDhkUnpjWGllOWNIb0ZXQWVVYVVpbDN0ZWRKTWNhR0pHc2VPbnkz?= =?utf-8?B?Qm9yNjhTVmhEZGZPMjQ3M3lOZk1SRnBGNzBRTzQxU2NqdGdFeDc0YTRYejhF?= =?utf-8?B?T3laOHlkclROcTdOVVBraXFPNERIT0FsYVBEUzBDM0U1L1k1R0NSYnhtTXFt?= =?utf-8?B?Vk9lSEFsbzZXeHZGRm5CQk9MY2ptb1lHUW0zdmVKSll2RURtcVByaDVSdGRn?= =?utf-8?B?Zzg0L0JuNHAydjh0YkhxV3dab0grSFNhNzI0bHNzUENCczVSODFvT2k2SnRz?= =?utf-8?B?M1dYVHhzNGRLbnprTDRyTnlGSHhTT3BvamxpN0p6ajhmSWRoclA1ZUZ1bWZM?= =?utf-8?B?RkxvcFhVTVZ3U3EvOC8wa2dSRytLWENLS0k0NVJrNSt2aWdIUEJENDV3SDVO?= =?utf-8?B?ZTh5NDZkd1ZoWnNFOFB3ckI0eDdDZjR6QUZ6TWQrSzFKbkUxcFBERUExUWpK?= =?utf-8?B?YzlNRlpsc1Z2Y2ZpM2QxMWQ0YlowaXBDLzk4YXloVTkyTE94Q1hrTzVZMnVI?= =?utf-8?B?M1QrVWRJVVlPc0o5QmlwSjlhU3l4NEdDWTVJMHNydkdQNzBwYUpvbStRekNY?= =?utf-8?B?L3FWcmI4K215WVI1Rld2VmllYmxnQmU5LzhhVkJCM0hWZjIxNFFhajZIeU5W?= =?utf-8?B?eUdtN3g4OHV5WmhJYWEvaEFETnlLYUg2a3hEZXJaRWlld3RZK2JqQXpUZ3BI?= =?utf-8?B?S1QzbWlUQ3JobWdZMkVnTmxmZnRCMXpyUmczYy9BZmwyN1BsM0V0bEVxbUdV?= =?utf-8?B?Q0JWbGVJMEg3UmV1OU13SzFwaVBDTWdIc3MweTNqVDNFWlI0V2xrWHNPdGVO?= =?utf-8?B?TFBFNHMwb1VXSldOVlZIQXU4dGJvQjBML1JZOTd0eGg0OXhqZTRodWF0LzRR?= =?utf-8?B?bWtnVlE5anpNOFpNMnNyUlNPbHJ6Z081ZWhRd2NjYmhCR3AwNExUMXVCUG0r?= =?utf-8?B?MVNubU5CTytjUnNMQ3VxN3J2NXMwRTdEQ013OVR5VnoxYUdDS3VidzVYWTFp?= =?utf-8?B?Y1Rxb0M3c1ZvNk1qRmcwRWFQZWJvMjNNWjBKQU1UNnQ4WTdFN2lzRGd4aVlU?= =?utf-8?B?QlB4WWNPZmJSUTNjNlJXZUpGYUMvaVNTcHJGOEdocnVsbXBUNWtiSDZ4KzNX?= =?utf-8?B?b3JaZnFiZGlzZUZvd1M4QWJRenk3WE9wRERCUWlUR0E4bkhkTUE3Z2pJZTha?= =?utf-8?B?dEN6aW1BcEFlU3FhN01YaGt6czR5cnFaUitmdFNLWVJhWHFCRzZPWk9XVjVs?= =?utf-8?B?K0pDYVZGcmxxNWZEeUx4UFdveDlPU1c0RXNsNGVnckFFaWxPbGYzMllZWjNX?= =?utf-8?B?RXVZeTNEYWJpRXN3SE9KQXczbVdiVVZGNWt6bGZhN0dUenFSMlRYT1hLTFgz?= =?utf-8?B?ZURKUzMxeTFlc2NSZTB4VzJuREVRdm9aTXNTRTVSZzV3ZU96RFk1eGM3TlhY?= =?utf-8?B?ckE0WnEzM25VQ2hVY09KY1VuK0F5S1JKUG1BTHkzN05wRUFjMGI2aC9qaWQr?= =?utf-8?B?ZUs5c09SYXYxNTIyNG1VRndFM1l1VDFyK0xlcGR5cVM4NEJFTHJ6TUNCeE1m?= =?utf-8?B?ZmVZODczQy9WOHlPN1c5c0VKcUlST0pHazhJdz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:48.9500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20304e4a-e324-4c32-4f7b-08dde3fd8d1c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4456 AMD systems optionally support a deferred error interrupt. The interrupt should be used as another signal to trigger MCA polling. This is similar to how other MCA interrupts are handled. Deferred errors do not require any special handling related to the interrupt, e.g. resetting or rearming the interrupt, etc. However, Scalable MCA systems include a pair of registers, MCA_DESTAT and MCA_DEADDR, that should be checked for valid errors. This check should be done whenever MCA registers are polled. Currently, the deferred error interrupt does this check, but the MCA polling function does not. Call the MCA polling function when handling the deferred error interrupt. This keeps all "polling" cases in a common function. Call the polling function only for banks that have the deferred error interrupt enabled. Add an SMCA status check helper. This will do the same status check and register clearing that the interrupt handler has done. And it extends the common polling flow to find AMD deferred errors. Remove old code whose functionality is already covered in the common MCA code. Reviewed-by: Qiuxu Zhuo Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-17-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * Add kflag for checking DFR registers. =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * Keep code comment. * Log directly from helper function rather than pass values. =20 Link: https://lore.kernel.org/r/20250213-wip-mca-updates-v2-13-3636547fe05f@a= md.com =20 v2->v3: * Add tags from Qiuxu and Tony. =20 v1->v2: * Keep code comment. * Log directly from helper function rather than pass values. arch/x86/include/asm/mce.h | 6 +++ arch/x86/kernel/cpu/mce/amd.c | 103 ++-----------------------------------= ---- arch/x86/kernel/cpu/mce/core.c | 50 +++++++++++++++++++- 3 files changed, 59 insertions(+), 100 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 31e3cb550fb3..7d6588195d56 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -165,6 +165,12 @@ */ #define MCE_IN_KERNEL_COPYIN BIT_ULL(7) =20 +/* + * Indicates that handler should check and clear Deferred error registers + * rather than common ones. + */ +#define MCE_CHECK_DFR_REGS BIT_ULL(8) + /* * This structure contains all data related to the MCE log. Also * carries a signature to make it easier to find from external diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 63d8b12fe30f..4a832c24d43b 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -56,6 +56,7 @@ static bool thresholding_irq_en; =20 struct mce_amd_cpu_data { mce_banks_t thr_intr_banks; + mce_banks_t dfr_intr_banks; }; =20 static DEFINE_PER_CPU_READ_MOSTLY(struct mce_amd_cpu_data, mce_amd_data); @@ -300,8 +301,10 @@ static void smca_configure(unsigned int bank, unsigned= int cpu) * APIC based interrupt. First, check that no interrupt has been * set. */ - if ((low & BIT(5)) && !((high >> 5) & 0x3)) + if ((low & BIT(5)) && !((high >> 5) & 0x3)) { + __set_bit(bank, this_cpu_ptr(&mce_amd_data)->dfr_intr_banks); high |=3D BIT(5); + } =20 this_cpu_ptr(mce_banks_array)[bank].lsb_in_status =3D !!(low & BIT(8)); =20 @@ -796,37 +799,6 @@ bool amd_mce_usable_address(struct mce *m) return false; } =20 -static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc) -{ - struct mce_hw_err err; - struct mce *m =3D &err.m; - - mce_prep_record(&err); - - m->status =3D status; - m->misc =3D misc; - m->bank =3D bank; - m->tsc =3D rdtsc(); - - if (m->status & MCI_STATUS_ADDRV) { - m->addr =3D addr; - - smca_extract_err_addr(m); - } - - if (mce_flags.smca) { - rdmsrq(MSR_AMD64_SMCA_MCx_IPID(bank), m->ipid); - - if (m->status & MCI_STATUS_SYNDV) { - rdmsrq(MSR_AMD64_SMCA_MCx_SYND(bank), m->synd); - rdmsrq(MSR_AMD64_SMCA_MCx_SYND1(bank), err.vendor.amd.synd1); - rdmsrq(MSR_AMD64_SMCA_MCx_SYND2(bank), err.vendor.amd.synd2); - } - } - - mce_log(&err); -} - DEFINE_IDTENTRY_SYSVEC(sysvec_deferred_error) { trace_deferred_error_apic_entry(DEFERRED_ERROR_VECTOR); @@ -836,75 +808,10 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_deferred_error) apic_eoi(); } =20 -/* - * Returns true if the logged error is deferred. False, otherwise. - */ -static inline bool -_log_error_bank(unsigned int bank, u32 msr_stat, u32 msr_addr, u64 misc) -{ - u64 status, addr =3D 0; - - rdmsrq(msr_stat, status); - if (!(status & MCI_STATUS_VAL)) - return false; - - if (status & MCI_STATUS_ADDRV) - rdmsrq(msr_addr, addr); - - __log_error(bank, status, addr, misc); - - wrmsrq(msr_stat, 0); - - return status & MCI_STATUS_DEFERRED; -} - -static bool _log_error_deferred(unsigned int bank, u32 misc) -{ - if (!_log_error_bank(bank, mca_msr_reg(bank, MCA_STATUS), - mca_msr_reg(bank, MCA_ADDR), misc)) - return false; - - /* - * Non-SMCA systems don't have MCA_DESTAT/MCA_DEADDR registers. - * Return true here to avoid accessing these registers. - */ - if (!mce_flags.smca) - return true; - - /* Clear MCA_DESTAT if the deferred error was logged from MCA_STATUS. */ - wrmsrq(MSR_AMD64_SMCA_MCx_DESTAT(bank), 0); - return true; -} - -/* - * We have three scenarios for checking for Deferred errors: - * - * 1) Non-SMCA systems check MCA_STATUS and log error if found. - * 2) SMCA systems check MCA_STATUS. If error is found then log it and also - * clear MCA_DESTAT. - * 3) SMCA systems check MCA_DESTAT, if error was not found in MCA_STATUS,= and - * log it. - */ -static void log_error_deferred(unsigned int bank) -{ - if (_log_error_deferred(bank, 0)) - return; - - /* - * Only deferred errors are logged in MCA_DE{STAT,ADDR} so just check - * for a valid error. - */ - _log_error_bank(bank, MSR_AMD64_SMCA_MCx_DESTAT(bank), - MSR_AMD64_SMCA_MCx_DEADDR(bank), 0); -} - /* APIC interrupt handler for deferred errors */ static void amd_deferred_error_interrupt(void) { - unsigned int bank; - - for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) - log_error_deferred(bank); + machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->dfr_intr_= banks); } =20 static void reset_block(struct threshold_block *block) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index e7a9a175bf49..6b3569b412a6 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -687,7 +687,10 @@ static noinstr void mce_read_aux(struct mce_hw_err *er= r, int i) m->misc =3D mce_rdmsrq(mca_msr_reg(i, MCA_MISC)); =20 if (m->status & MCI_STATUS_ADDRV) { - m->addr =3D mce_rdmsrq(mca_msr_reg(i, MCA_ADDR)); + if (m->kflags & MCE_CHECK_DFR_REGS) + m->addr =3D mce_rdmsrq(MSR_AMD64_SMCA_MCx_DEADDR(i)); + else + m->addr =3D mce_rdmsrq(mca_msr_reg(i, MCA_ADDR)); =20 /* * Mask the reported address by the reported granularity. @@ -714,6 +717,43 @@ static noinstr void mce_read_aux(struct mce_hw_err *er= r, int i) =20 DEFINE_PER_CPU(unsigned, mce_poll_count); =20 +/* + * We have three scenarios for checking for Deferred errors: + * + * 1) Non-SMCA systems check MCA_STATUS and log error if found. + * 2) SMCA systems check MCA_STATUS. If error is found then log it and also + * clear MCA_DESTAT. + * 3) SMCA systems check MCA_DESTAT, if error was not found in MCA_STATUS,= and + * log it. + */ +static bool smca_should_log_poll_error(enum mcp_flags flags, struct mce_hw= _err *err) +{ + struct mce *m =3D &err->m; + + /* + * If this is a deferred error found in MCA_STATUS, then clear + * the redundant data from the MCA_DESTAT register. + */ + if (m->status & MCI_STATUS_VAL) { + if (m->status & MCI_STATUS_DEFERRED) + mce_wrmsrq(MSR_AMD64_SMCA_MCx_DESTAT(m->bank), 0); + + return true; + } + + /* + * If the MCA_DESTAT register has valid data, then use + * it as the status register. + */ + m->status =3D mce_rdmsrq(MSR_AMD64_SMCA_MCx_DESTAT(m->bank)); + + if (!(m->status & MCI_STATUS_VAL)) + return false; + + m->kflags |=3D MCE_CHECK_DFR_REGS; + return true; +} + /* * Newer Intel systems that support software error * recovery need to make additional checks. Other @@ -740,6 +780,9 @@ static bool should_log_poll_error(enum mcp_flags flags,= struct mce_hw_err *err) { struct mce *m =3D &err->m; =20 + if (mce_flags.smca) + return smca_should_log_poll_error(flags, err); + /* If this entry is not valid, ignore it. */ if (!(m->status & MCI_STATUS_VAL)) return false; @@ -837,7 +880,10 @@ void machine_check_poll(enum mcp_flags flags, mce_bank= s_t *b) /* * Clear state for this bank. */ - mce_wrmsrq(mca_msr_reg(i, MCA_STATUS), 0); + if (m->kflags & MCE_CHECK_DFR_REGS) + mce_wrmsrq(MSR_AMD64_SMCA_MCx_DESTAT(i), 0); + else + mce_wrmsrq(mca_msr_reg(i, MCA_STATUS), 0); } =20 /* --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2067.outbound.protection.outlook.com [40.107.223.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23D2330DECF; Mon, 25 Aug 2025 17:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143237; cv=fail; b=M2/wyrwujx7juLkw74rVOUIGBoaD4g33vKp9CqFSIbpNm18QRSld2F0MwP6l81tkBrfY9jwZfqe/CbzrAlcGDKXvQD73eKa75RTXo0rkAKFYhVFnCrjQCqf/ry1D6rOSXOeAATuw5mcxNEk/aACHkNNgo2qa3Th177wl8Pepmfs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143237; c=relaxed/simple; bh=qnilMg90yaze4yTfkS6GvxCBZc0LzpBS9TCbP4FVjMo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=FIdyDswrnCbSDm1A7cmqqOKnN5NxZDY6iwgNKROV6B1jx8RWVdJKEKl9+ZXmj0b/x/6SNCkDUNMLo6wKvsp4VZ7yj+hChFt6dtS5JdqcrWZRGmCCtIES+kOxMGrNiLW4OLt4C6D6FBhdsEO865jNHm/QxGWn+mBi0Qg2gz8ZK50= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=KpPo0R6C; arc=fail smtp.client-ip=40.107.223.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="KpPo0R6C" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BbS27y4DwryvOouTHNCkt4w60hln3zwM3NPirvJsfXXOjgdhf8iDqRAFTRUS083ChB+TKb+0zkyjlSm5BhTgeE1LI5NXTHAHahDubS7SQwycPUo6Yj79BvS2+kfWi7fWkbrAPzoqowlx73om0fHMh7051+uVR0a8Xeff5WHGvh3Vv225TeQpRZ1aa3VQyUB92ZFwKPaXZ4hsSy93CsHchy3VmGeQ3jinVDYaZzdf1/d0cACEvE81zlmMCg8SVcQlM4Cy++C7XIaz6S5t6I/2qKhMSJXf444/NbH349npIpJMNluL0WI8/upBlVFGUsJSGnKqx3ORZS39DqblZz8Zzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1svcgkOGQOsqlabklr9ihJOI2getr6trkjNyHoebhs0=; b=Aa9kYyYHSV6YpAesqfUeJEtW2UaeMjjDlq3YVK257pFcF5nPYyytuEeCvquUHClYd2daMtUkSun8DqRK9XNlkHwLOTKODThmp2Y9Haj2WSGj4Y6b0OOsaD6NFfT0wIwbdW3cfdYDkFWd8HBkPuEZ5BMF2/n7CEYC0tSWZGoZkLoUsngRi12ThaiNYaz7lLJCHL/BoZUiQcbNdYQUrNgQ+Nu9YKIecbCaxKXHkEAjTBy1yiCD+Tafdmq3vzi0YyhfjeHSOIZ6w2ygYX6DJGGp1SzZ+VLqxCY7TQeQTldSxBowM5fbo7r2Q064Laf6DYQMup0Co+Ndbmpft0jo4y6wxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=1svcgkOGQOsqlabklr9ihJOI2getr6trkjNyHoebhs0=; b=KpPo0R6C7Tpi3bTs6aqvfyA4riUkeILETGoszYbydsdBurFwzJzNHKKpA/+xbDimZT2o7lPsIJrG2gNWhvrcU6f+NvVO8UQY571K8WoFNFrt6jQPx8o1forxKKekNuEbviaICMS5krwf3xDho06q7ugTkmCvtraG5PE89tyxX5w= Received: from SN7PR04CA0057.namprd04.prod.outlook.com (2603:10b6:806:120::32) by MN0PR12MB5908.namprd12.prod.outlook.com (2603:10b6:208:37c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:50 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::27) by SN7PR04CA0057.outlook.office365.com (2603:10b6:806:120::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:49 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:44 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:12 +0000 Subject: [PATCH v5 15/20] x86/mce/amd: Enable interrupt vectors once per-CPU on SMCA systems Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-15-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|MN0PR12MB5908:EE_ X-MS-Office365-Filtering-Correlation-Id: 78b88116-e9d3-484e-dc25-08dde3fd8d8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WnkyVGI5NVZOUTNIZE8wZDNRT1NPb0tHbmdHaHlWeVVTckxZd2ozQXpMczFB?= =?utf-8?B?N25SbmRGT3FUQ0ZrUkpHTUdEZHdZQldoNXBjY2hnMFUvQkFpbElCVGRGVHdj?= =?utf-8?B?V0xWOG1xVGZ1T1l1MURSOHRTRHRBVGRabzVvMkFsOWkzMFBscFc2ZCtJOXdj?= =?utf-8?B?eEd3TjFOV25Zay9sYzFiRHRrTWVzbnZaUlQ4V1QvZ2xCT3pFWHNtRngwblpP?= =?utf-8?B?VTRmOE9NQnhKUkdDb2RnY2NGYTlkRE5ma1N2OU9BWmVuc0xMa280UndPaFF1?= =?utf-8?B?TUs0eFVoVi9KUlA5ZFNOSXFOWFg4SklpeVpwRVRRNEtFWmlNYW44R2VoRjNu?= =?utf-8?B?dTFpeHdoMU5KWTJoTnJmc0xCUWlvYUNubkVKYWJwYjlnZlkwSlVScGxvc3hm?= =?utf-8?B?ejNwb0ZDWEZoN3JTakpyN0dmNG4yeEh1NXVpZWQyWlZHdGwvTVRvelUrcHla?= =?utf-8?B?Q21INU5UQVliejJrdkUwdzNxN0FsNTRNdmRnTmlQTVZVZXBwZHB5K0VaSlRW?= =?utf-8?B?K0xxaGw0eHhPQ3hVVlBialYyU3Z4RndIbHNsSG9mWStIa3ZvS01pQXRSTkN2?= =?utf-8?B?Wlk4bXBOVC9oZDUwNE9tenhuWHJraDg4UmN5OWpNTzBxWTl3WjJrdGpuOUts?= =?utf-8?B?dEtGQ1hSQVVzYk8zSXZOa2ZqNGNOazNuWFhDbVRPNnRpUGNtN1l0SFJycEc1?= =?utf-8?B?ajlaZTFQSlFBK1ZWcFFVWi9rRzhxV2pSTDh0cUh5T2FISkxMMk9DWjBnVmNy?= =?utf-8?B?U0ZMWGM3aGRjL29UOGdRbm1RbytXTGI4dkNWZ0x1Q2phOS9IRkVNWnpKbEdv?= =?utf-8?B?bE9UZlpnV2xPZUZGNHloUXlxR2RzN0I0SlJOdGNaUXY0T1JRSFBqbHJQVFRF?= =?utf-8?B?M3NhbDJDWklYWXI1d3YyWTBaZGFmMXBVb09qUWZRQjRwUFRrbUpBVFNCQjFu?= =?utf-8?B?MG1OSU40bjNUbG93OGJQTENkTHZ6NnlrWjJmVm9zZWNYWUhyV0I5eVNzem1D?= =?utf-8?B?ZmJJTjZGWTlOYTRzWTdOUWVwaEZLR3lvSkcxMTdISm10TEJyck5zSEYyOUc2?= =?utf-8?B?ajQxckFXUFNSR0pSWHBraDBRYU5YME9rcDZPNGRLdldUNVh6VFI1eWVJVmNI?= =?utf-8?B?dDZtSXZEUXk5aGUxUDdvRjBqOTR0MnVteGxleUQ4M0xoRGpTV25uL0dZaEZw?= =?utf-8?B?MDhnMXRBWkJ2MXJ0UVBqK2lTZWhPUURWdFhQcnQvcmZpRU5KMlVzTVVZSXJI?= =?utf-8?B?TWMrb0prZ0ZiOTF2V3BZTCs4NnhFKzhJQkgyMzJ5TDdhVEtWU2plZXVMM2Vq?= =?utf-8?B?dVVmL1J2MytFU3JrcXVPSDFDcitGdXJWZUI5YmdFalpKRUpRWGtYRkJXU2lB?= =?utf-8?B?elRaTmxMcVZNS2FrNFZUdXYzaXE0SjRyUXM3dDJuNHdFUGVGUWFGOVl1dXZR?= =?utf-8?B?NWtzcGtNUUc2ZGRoc1VUM3RSNDRYMk5YRFJobkw4dDFLbWhDdFpkdU1kc1RS?= =?utf-8?B?M0JXUnczMjFWeDZGRTFTbTU4UWdiTlJaU05SeGdrZHNONFZOcFFVY3prK2dG?= =?utf-8?B?QXB2LzJadFJ5bVdvRWhDU3lGTEh1Q2JEck1jYzREL3U2aFFrUU9PMzl0VTFO?= =?utf-8?B?L1doUE51SHRDRDNKbG1DQk85dmNpUlhBOUhWVkhhZDJKNWhOaW02bDJkM21E?= =?utf-8?B?bFpOSFVvWWhOdnB6RVhGczRZdlVRZjY2RmxETDg2ZHJhWDNTWjhvejdGTzRO?= =?utf-8?B?SzZFc3JpSmdEVDhMa1E4Y1l0aTdpMVV6UzBFbWdJOEJXYnhxdXJrcFlFZGRG?= =?utf-8?B?ZWlCZ3FwUnhHSlVXY3N0aG1mSS9rYlRGSDI3MHhtOHVzMTU1bVZhdUtDQlRa?= =?utf-8?B?OXc5S3lYUHFlK1JLY3czcTg1L1JEZlplL3NaMWlqQnZrWUo0V3NhRDNXbGNB?= =?utf-8?B?cHJFR3pzWUxNdk5vUEpwbzVrUldZcnZodjRRMFdQRy81cGo5bmdzOFNRSDhy?= =?utf-8?B?ZVJ1cGt4ZzJMYTNVSURHSEllVVJJOGtRVklocnZtWXR6NlQ5ZU5JaUt4b3hD?= =?utf-8?B?VE5rVERwT3QwS2M3T0FrVUhObFQvSzI1T1N2Zz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:49.7067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78b88116-e9d3-484e-dc25-08dde3fd8d8f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5908 Scalable MCA systems have a per-CPU register that gives the APIC LVT offset for the thresholding and deferred error interrupts. Currently, this register is read once to set up the deferred error interrupt and then read again for each thresholding block. Furthermore, the APIC LVT registers are configured each time, but they only need to be configured once per-CPU. Move the APIC LVT setup to the early part of CPU init, so that the registers are set up once. Also, this ensures that the kernel is ready to service the interrupts before the individual error sources (each MCA bank) are enabled. Apply this change only to SMCA systems to avoid breaking any legacy behavior. The deferred error interrupt is technically advertised by the SUCCOR feature. However, this was first made available on SMCA systems. Therefore, only set up the deferred error interrupt on SMCA systems and simplify the code. Guidance from hardware designers is that the LVT offsets provided from the platform should be used. The kernel should not try to enforce specific values. However, the kernel should check that an LVT offset is not reused for multiple sources. Therefore, remove the extra checking and value enforcement from the MCE code. The "reuse/conflict" case is already handled in setup_APIC_eilvt(). Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250415-wip-mca-updates-v3-14-8ffd9eb4aa56@a= md.com =20 v4->v5: * Added back to set. * Updated commit message with more details. =20 v3->v4: * Dropped from set. =20 v2->v3: * Add tags from Tony. =20 v1->v2: * Use new per-CPU struct. * Don't set up interrupt vectors. arch/x86/kernel/cpu/mce/amd.c | 113 ++++++++++++++++++--------------------= ---- 1 file changed, 48 insertions(+), 65 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 4a832c24d43b..44fa61cafb0d 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -43,9 +43,6 @@ /* Deferred error settings */ #define MSR_CU_DEF_ERR 0xC0000410 #define MASK_DEF_LVTOFF 0x000000F0 -#define MASK_DEF_INT_TYPE 0x00000006 -#define DEF_LVT_OFF 0x2 -#define DEF_INT_TYPE_APIC 0x2 =20 /* Scalable MCA: */ =20 @@ -57,6 +54,8 @@ static bool thresholding_irq_en; struct mce_amd_cpu_data { mce_banks_t thr_intr_banks; mce_banks_t dfr_intr_banks; + bool thr_intr_en; + bool dfr_intr_en; }; =20 static DEFINE_PER_CPU_READ_MOSTLY(struct mce_amd_cpu_data, mce_amd_data); @@ -271,6 +270,7 @@ void (*deferred_error_int_vector)(void) =3D default_def= erred_error_interrupt; =20 static void smca_configure(unsigned int bank, unsigned int cpu) { + struct mce_amd_cpu_data *data =3D this_cpu_ptr(&mce_amd_data); u8 *bank_counts =3D this_cpu_ptr(smca_bank_counts); const struct smca_hwid *s_hwid; unsigned int i, hwid_mcatype; @@ -301,8 +301,8 @@ static void smca_configure(unsigned int bank, unsigned = int cpu) * APIC based interrupt. First, check that no interrupt has been * set. */ - if ((low & BIT(5)) && !((high >> 5) & 0x3)) { - __set_bit(bank, this_cpu_ptr(&mce_amd_data)->dfr_intr_banks); + if ((low & BIT(5)) && !((high >> 5) & 0x3) && data->dfr_intr_en) { + __set_bit(bank, data->dfr_intr_banks); high |=3D BIT(5); } =20 @@ -377,6 +377,14 @@ static bool lvt_off_valid(struct threshold_block *b, i= nt apic, u32 lo, u32 hi) { int msr =3D (hi & MASK_LVTOFF_HI) >> 20; =20 + /* + * On SMCA CPUs, LVT offset is programmed at a different MSR, and + * the BIOS provides the value. The original field where LVT offset + * was set is reserved. Return early here: + */ + if (mce_flags.smca) + return false; + if (apic < 0) { pr_err(FW_BUG "cpu %d, failed to setup threshold interrupt " "for bank %d, block %d (MSR%08X=3D0x%x%08x)\n", b->cpu, @@ -385,14 +393,6 @@ static bool lvt_off_valid(struct threshold_block *b, i= nt apic, u32 lo, u32 hi) } =20 if (apic !=3D msr) { - /* - * On SMCA CPUs, LVT offset is programmed at a different MSR, and - * the BIOS provides the value. The original field where LVT offset - * was set is reserved. Return early here: - */ - if (mce_flags.smca) - return false; - pr_err(FW_BUG "cpu %d, invalid threshold interrupt offset %d " "for bank %d, block %d (MSR%08X=3D0x%x%08x)\n", b->cpu, apic, b->bank, b->block, b->address, hi, lo); @@ -473,41 +473,6 @@ static int setup_APIC_mce_threshold(int reserved, int = new) return reserved; } =20 -static int setup_APIC_deferred_error(int reserved, int new) -{ - if (reserved < 0 && !setup_APIC_eilvt(new, DEFERRED_ERROR_VECTOR, - APIC_EILVT_MSG_FIX, 0)) - return new; - - return reserved; -} - -static void deferred_error_interrupt_enable(struct cpuinfo_x86 *c) -{ - u32 low =3D 0, high =3D 0; - int def_offset =3D -1, def_new; - - if (rdmsr_safe(MSR_CU_DEF_ERR, &low, &high)) - return; - - def_new =3D (low & MASK_DEF_LVTOFF) >> 4; - if (!(low & MASK_DEF_LVTOFF)) { - pr_err(FW_BUG "Your BIOS is not setting up LVT offset 0x2 for deferred e= rror IRQs correctly.\n"); - def_new =3D DEF_LVT_OFF; - low =3D (low & ~MASK_DEF_LVTOFF) | (DEF_LVT_OFF << 4); - } - - def_offset =3D setup_APIC_deferred_error(def_offset, def_new); - if ((def_offset =3D=3D def_new) && - (deferred_error_int_vector !=3D amd_deferred_error_interrupt)) - deferred_error_int_vector =3D amd_deferred_error_interrupt; - - if (!mce_flags.smca) - low =3D (low & ~MASK_DEF_INT_TYPE) | DEF_INT_TYPE_APIC; - - wrmsr(MSR_CU_DEF_ERR, low, high); -} - static u32 smca_get_block_address(unsigned int bank, unsigned int block, u= 32 low) { if (!block) @@ -552,7 +517,6 @@ prepare_threshold_block(unsigned int bank, unsigned int= block, u32 addr, int offset, u32 misc_high) { unsigned int cpu =3D smp_processor_id(); - u32 smca_low, smca_high; struct threshold_block b; int new; =20 @@ -572,18 +536,10 @@ prepare_threshold_block(unsigned int bank, unsigned i= nt block, u32 addr, __set_bit(bank, this_cpu_ptr(&mce_amd_data)->thr_intr_banks); b.interrupt_enable =3D 1; =20 - if (!mce_flags.smca) { - new =3D (misc_high & MASK_LVTOFF_HI) >> 20; - goto set_offset; - } - - /* Gather LVT offset for thresholding: */ - if (rdmsr_safe(MSR_CU_DEF_ERR, &smca_low, &smca_high)) - goto out; - - new =3D (smca_low & SMCA_THR_LVT_OFF) >> 12; + if (mce_flags.smca) + goto done; =20 -set_offset: + new =3D (misc_high & MASK_LVTOFF_HI) >> 20; offset =3D setup_APIC_mce_threshold(offset, new); if (offset =3D=3D new) thresholding_irq_en =3D true; @@ -591,7 +547,6 @@ prepare_threshold_block(unsigned int bank, unsigned int= block, u32 addr, done: mce_threshold_block_init(&b, offset); =20 -out: return offset; } =20 @@ -682,6 +637,32 @@ static void amd_apply_cpu_quirks(struct cpuinfo_x86 *c) mce_banks[0].ctl =3D 0; } =20 +/* + * Enable the APIC LVT interrupt vectors once per-CPU. This should be done= before hardware is + * ready to send interrupts. + * + * Individual error sources are enabled later during per-bank init. + */ +static void smca_enable_interrupt_vectors(void) +{ + struct mce_amd_cpu_data *data =3D this_cpu_ptr(&mce_amd_data); + u64 mca_intr_cfg, offset; + + if (!mce_flags.smca || !mce_flags.succor) + return; + + if (rdmsrq_safe(MSR_CU_DEF_ERR, &mca_intr_cfg)) + return; + + offset =3D (mca_intr_cfg & SMCA_THR_LVT_OFF) >> 12; + if (!setup_APIC_eilvt(offset, THRESHOLD_APIC_VECTOR, APIC_EILVT_MSG_FIX, = 0)) + data->thr_intr_en =3D true; + + offset =3D (mca_intr_cfg & MASK_DEF_LVTOFF) >> 4; + if (!setup_APIC_eilvt(offset, DEFERRED_ERROR_VECTOR, APIC_EILVT_MSG_FIX, = 0)) + data->dfr_intr_en =3D true; +} + /* cpu init entry point, called from mce.c with preempt off */ void mce_amd_feature_init(struct cpuinfo_x86 *c) { @@ -692,11 +673,16 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) amd_apply_cpu_quirks(c); =20 mce_flags.amd_threshold =3D 1; + smca_enable_interrupt_vectors(); =20 for (bank =3D 0; bank < this_cpu_read(mce_num_banks); ++bank) { - if (mce_flags.smca) + if (mce_flags.smca) { smca_configure(bank, cpu); =20 + if (!this_cpu_ptr(&mce_amd_data)->thr_intr_en) + continue; + } + disable_err_thresholding(c, bank); =20 for (block =3D 0; block < NR_BLOCKS; ++block) { @@ -717,9 +703,6 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) offset =3D prepare_threshold_block(bank, block, address, offset, high); } } - - if (mce_flags.succor) - deferred_error_interrupt_enable(c); } =20 void smca_bsp_init(void) --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2074.outbound.protection.outlook.com [40.107.212.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6EEB23054FB; Mon, 25 Aug 2025 17:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; cv=fail; b=jnNhjYNS057/191e+wc6+HKUN5/ERlrbCv/ZNY88iuvj9IJUPfah0h4ImoiaGRkL5vPotGoSSb8LFgYxzOz6rmq/gNvuJqz28lXF6tlFaVv+Kr6BGEqgzfADTVtS6Qz44iA+XUygadvEnRc41MJx99md9UEUUgIiMKUS4+0P3rA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; c=relaxed/simple; bh=VloJpj1zckQAPNB/Igkh2wML9gd7UDtj0gqizHR3aTQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=BCtwCmFhOpby6e8/JWyeg9+FNQyAD12yXQV/O68kkoKWZfArEE9marlZOs1E/F0mP+Ml6wXoxXKBg5yZFU9HWEgx5Uuln30ue3A6rGvl7epSZFY2ZmL9vpl0Zkw2Nlu3VckxM36+DzseKG8e34+s2R91+LQZW8cAoXEtikkLM9Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=erfs8abH; arc=fail smtp.client-ip=40.107.212.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="erfs8abH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u1TuSmoNpZSU2v6/HSgpEB2L/ShchAsbqG5qPiWcfr2yhAKG3Tf3pHtCu98oXY3o6SvxdYy96ukaAehCJ2bd9UirXtHsgAkd1wE0pk2HemnS9/jPS0RrREvBeuV3ECirI0WudZBeb86oqKqExTZZceL2tntd+Kk8Q3okqUxXQFvq+F4hhyf0dSHY1XifbpLez1PztMpF9PC/IgK0M9dIKzJN23/fXY7SgffAydvm/dUKWT3gIsIJeOO71+sJLyopirUQbWtv90ALdBOKrWt3gRDT/tKLN7PT/VMT1A7zCqd9zgxQk5HYlss6cG/gIv3XfMLOviBbA6WOWo8He5UPtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uPnCuM62b+V2696LUhgaSUORujh6D09Ivy/7bRGeB4o=; b=qPAUZyUCPyGFyqquKeAZqoqWkGM4Z1fzhhOdyorXhGUNA+IKieLMD8+i0QfodsjhFDzTe08RggH4BZXtio56c23+A109rKDgRMX0kh5KSn8mjtlTKDPSJr2TauFlMmp9dj3lewg820Xtyi11vM6fn+ffuBSGvavJ4jaStIOomYEtp0qDaPwVqTHbwVWL4p0Bcw8+N+zCrEHPmylmT4qG0nJ807E7VX1g4C6ccCOYde2YohZD6lYeFAJkYgYN2h3nNNnpZY8xptAP6XcZCQVhaKdkxnELPIHiMWlNfmLJ3SECWqcu7sOs543du2nc3W9zhcrEanhKuXRwInDeIDEUnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=uPnCuM62b+V2696LUhgaSUORujh6D09Ivy/7bRGeB4o=; b=erfs8abHmg44gEbR8/mJlPsf6aWOOkcln1gC8eipzLXFz85gdrwnffR3k1Vs0z5wFWOM1XCWPfKY2OHwSKJfbo47B3lrnSLBkCswe0KvTqvwhTlmEKE3mmMfpEUOLrbG+MbcMwdEQlxcUqc+ChKGdE+A8qDhQUf3Qjzzu988QZ0= Received: from SN7PR04CA0058.namprd04.prod.outlook.com (2603:10b6:806:120::33) by IA0PR12MB7776.namprd12.prod.outlook.com (2603:10b6:208:430::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:50 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::66) by SN7PR04CA0058.outlook.office365.com (2603:10b6:806:120::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Mon, 25 Aug 2025 17:33:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:50 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:45 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:13 +0000 Subject: [PATCH v5 16/20] x86/mce/amd: Support SMCA Corrected Error Interrupt Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-16-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|IA0PR12MB7776:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a88cd7d-fde7-4e6d-652f-08dde3fd8e1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Y2ZhWEoyeWtCa2VhUTRjUzcvQlVEdE5VaWVXUWxCQmlGYlhHdjdQVFBhd2dL?= =?utf-8?B?Nzl2cDFRTGNhSmJLRzJmRS9ZSnhDRldKbExya3IzVU1BMCtoVktXUmlwWXIv?= =?utf-8?B?NmZoR29tajRzaC9xZS9XR3ZYWVVrZHR5RFFmQlh4WHB6dmllaHMzR0pOaWFm?= =?utf-8?B?bkZUYi9BSjF3dlFJbDU5bGNvcjIrZFZzSGlBaVZqZVdrRlJTZTAvOUZYejEv?= =?utf-8?B?K2Rpdk41VmQyMEV3QnJMTlN4YVRuQ2x1M3RYWU4vLzZJMTNaRXZRZ08xdkFL?= =?utf-8?B?eVZlaElrVHRGR1hsWE9SbmZ2SXQyTU4rUlU5RjRTUzBBSVgvSmVob1U0NmdN?= =?utf-8?B?aWtyUmNKcXhZRVFyTkZ2Y1lWeW9MV1NVcnk1cGxnSjlnYWVuZ1RFVHJGbUov?= =?utf-8?B?S3BZTmZLelE2QlFvb0t1UFdYNUZXOW9KYzA4a1ZQZjk1OUJqZUZsV3RnRTBm?= =?utf-8?B?dnVrcnZuYXVycWNlVU1jU2JyVEpmV0JuQ0VjdjJJcjBmeTM3d3dqWHpGVDg1?= =?utf-8?B?WHp2ZWJnOWtzc0ZQUnVnT2NIQTB3ckgwaUljU3VJZFlNQ1F0NC96c0ZVSTVE?= =?utf-8?B?Q1dxV3Zyd1ozR2xqZzJ3VDRLWmF6NGdzV2cweXQyQ3ZPMTNJenhuOFdVMDBz?= =?utf-8?B?bTZMRnhkeStHb3BIZThZb2FUSmhwWURmTXl6Wll3NGlNb3VwT3lCRlh1Z2xJ?= =?utf-8?B?enpXNnVnN2ZBWnN2ME9XZU4zWVJwdG9zM3lYd3VTaXhubzZDNXdyMHpsYVFr?= =?utf-8?B?aXJuQXgyaVQ4OUhDSjRpakQvSW1QcWxSM2FpbEluZmdVeFJkZllLR0VKR052?= =?utf-8?B?QkhJdDFtRW9aTGFjVGV6WnFxdFh6M1FHd1BVemplYzhKZW5NOVpoaUxjVWxH?= =?utf-8?B?Q2pNUUkrQ2xZUXY4UG9aK1RGd281T3pvMHViN3pkaUsyanBUdEtENDF4M2Iv?= =?utf-8?B?b0tESmxZN1BrNStFMTlnazdsQW9vN09oWGs5MFB6cFhNejd0aUQ0bEVSbjF4?= =?utf-8?B?SFBRYzVOSWZtZXc2Z2xNM3NDclI2TjR6TkgycGo1NE1tMUlpMVFKK0tBOFlH?= =?utf-8?B?eFZaUnJFSmtCYkNVaGdyU1luOStyajBrQlFhVC8yYTBnb1psUnhyMHk5a0tk?= =?utf-8?B?OWx3YTZaRVRUTkQvTEI2bldiY3JFMGNhMlZzNFE4UXV4UGJRM2wxeklGWW9Q?= =?utf-8?B?Nm9iM0pBNlV3VVdLanY4bStIejhQSUUySGxlbituREFBRXo4aVg1MGtpcncr?= =?utf-8?B?K1lIWG9Rb1hIeHduRXhibnpSVkJmR3V5VnVCb2dTUWFINkVSa2I5SUc3V2VZ?= =?utf-8?B?NUVoMWZ2aTJsOVB3T25DU1oxczhoK0Y3K0U0akwveFdzZ2NIRlhISmM1Lzlj?= =?utf-8?B?dEhod3o3UUcyMjdYN1NheTk5aW9SeDFwS2tDZFMwcTZRanFqYXJKYzZGZmll?= =?utf-8?B?N0wvOS9pMlpsSW8rMk93UVJFamZwc21ZNURLZEJVTDNIc0RJTktTQTRnS0xj?= =?utf-8?B?eTdTL3lYak9sYzJoUlp4VnI4eGlBbzJJNjAzL0kyaEg3SkFOT2ZMVkkrMHM1?= =?utf-8?B?M1l2ZUFGUzZZWUlFY1BxcGltem5KbHNwWWVJeXJZdTJLQlB2U3RjY2w5R0R4?= =?utf-8?B?TjVpM3FwR3VzalROZlh3OWY2cHFlMnVtbWYrQWFYdm9wVmhHNGRoSVA2SnRq?= =?utf-8?B?ZjdxQ2pPWW81Uk5zMmhuK1c5ZzZtVXFIRzVhVFJWRnJQdzJ1LzlKMWJQQXVM?= =?utf-8?B?NEc4UjRWdjlZSzJ0OTBDTVJRTjB4RnBRME1WZmtITmxXYXJrN3dHTXJ0WW5i?= =?utf-8?B?MjQzdFBZZUxnY1lCck1NQkxzL3ZPOWg3ZGZlU2J2YWhXLzdVbU1Sd1ZOVEtC?= =?utf-8?B?VWJucEs3WEw3UkxVMGVvZVRNb1NEK0RsMlFuNlpVNUZSR1g0eUswTGFWUlUx?= =?utf-8?B?RjRUUUdHZklxaVRaWjJrOWV4YzgrSjc3dGtoQTRVVVh4QlZ1cEo5YUpsY1gv?= =?utf-8?B?aVNlOG9vYk9id1A0SzFETjFWZFZ4MU40VUxmcmErMDhnSmliVGtiQ0VQMHYz?= =?utf-8?Q?pAWTdN?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:50.6155 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a88cd7d-fde7-4e6d-652f-08dde3fd8e1a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7776 AMD systems optionally support MCA thresholding which provides the ability for hardware to send an interrupt when a set error threshold is reached. This feature counts errors of all severities, but it is commonly used to report correctable errors with an interrupt rather than polling. Scalable MCA systems allow the Platform to take control of this feature. In this case, the OS will not see the feature configuration and control bits in the MCA_MISC* registers. The OS will not receive the MCA thresholding interrupt, and it will need to poll for correctable errors. A "corrected error interrupt" will be available on Scalable MCA systems. This will be used in the same configuration where the Platform controls MCA thresholding. However, the Platform will now be able to send the MCA thresholding interrupt to the OS. Check for, and enable, this feature during per-CPU SMCA init. Tested-by: Tony Luck Reviewed-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-18-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * Add code comment describing bits. =20 v2->v3: * Add tags from Tony. =20 v1->v2: * Use new per-CPU struct. arch/x86/kernel/cpu/mce/amd.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 44fa61cafb0d..559ad5ddb7a0 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -306,6 +306,23 @@ static void smca_configure(unsigned int bank, unsigned= int cpu) high |=3D BIT(5); } =20 + /* + * SMCA Corrected Error Interrupt + * + * MCA_CONFIG[IntPresent] is bit 10, and tells us if the bank can + * send an MCA Thresholding interrupt without the OS initializing + * this feature. This can be used if the threshold limit is managed + * by the platform. + * + * MCA_CONFIG[IntEn] is bit 40 (8 in the high portion of the MSR). + * The OS should set this to inform the platform that the OS is ready + * to handle the MCA Thresholding interrupt. + */ + if ((low & BIT(10)) && data->thr_intr_en) { + __set_bit(bank, data->thr_intr_banks); + high |=3D BIT(8); + } + this_cpu_ptr(mce_banks_array)[bank].lsb_in_status =3D !!(low & BIT(8)); =20 wrmsr(smca_config, low, high); --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2063.outbound.protection.outlook.com [40.107.94.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 705AA30BF5C; Mon, 25 Aug 2025 17:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; cv=fail; b=DxTh2N1//QY14KZHO68p0p+NBzJtIHr0jSyRRMy9saSCkSn8BR04dB8W5RMdtlcs1uUVwdWogBRKU6tP9ypaWIrVyGm5NiDh51iwmxtUVExMXIqkszUdKfo4ruXOBKT4QVW1Re+4uS6p4N8efz5MBJHRO5UYg0XmgVsryxMp8Jk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143235; c=relaxed/simple; bh=Z8UtCcAdO7YJqJEN7FUgBjYOkgwJjXmh5ny6lTm0r0Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=NAuXb9eSjf7qKx/OXBQMyrrl0ppDYL4amK33NSghg2AvRoP8/1fKxai1YVrSMacyNHv6v8xiuy9umiSqD5WDDMgaFOn1eGXT/yguGA3FA0+rnsqbFpQKemB/SClWsiUSTT5AR1czh40JWb4G11uF/E5EWDEne5hWq7odVYeUUxE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Dw6arO/O; arc=fail smtp.client-ip=40.107.94.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Dw6arO/O" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WTeiYPELpHmcoon9+m0HCkGn8YSRGx2Nhgnn+i/N3WlxEp/4KfLyEBTW1IhQd/pJCvgRlR7BUhkC8KA3MUWXYEEkAwn5O7vGXz1NqqTEFqx83olbztR5dFk6C8x+aEg34qjCuTdaYp5qRx23cYPRfZLlp0x3FPFJiLfMSqJPt+fPlDixBnGSqFbzLRRKFxuLRMmOrlnGY/ppRy8jq6UWI6bSkEQuxxCXA+oCQGq7rsgsrbEe63M5uFsMTtnXfxK1MJ4xgtqKEQlSp6YPz4j7KcidyLaJzfEobN2yMZLkoHzXn9S+HNz5zYer3YYZ6A45c1P/48NTRtXAEKPj5/pyPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/YR5kOt+6Q4zzkyEaMUPLLLU78+PTuo9LSkTHBvPXFY=; b=RncCuF1GuOZI271TDar+bdCe0CKSBbw5J2aKEZ6QkpVqdvQ0wji78DOxB4vPQg60WMbG3Maqz37T7gOjyibC8+AzQFn2zWMvJ+WblS/gFparUkyX3wzZeN045Y3vH9VU8JU555LoXpT99XGyCZ/259PzBN4T+GD0nw3dHfe+xVxaQ63gOhSgO5QjGC7oDkvDAjoMH1T4Vo5vBgsKPAAxgoRUbbt78dcR9D7ZgRw2OFxPUetvOHzoDaRwV7iXESs0megKOuwSbHR4LlQymmqt1a8KVuroM+DR+5JSgGmcbHPTBkmkL15tZ6APSoCbseKBws5CcWkaDSdedcCVZvuFtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=/YR5kOt+6Q4zzkyEaMUPLLLU78+PTuo9LSkTHBvPXFY=; b=Dw6arO/Occewrqs2KlRbNn6V2KA/2LrrqEaqauvD2LyXdRKJQoi0Jz304b13ahSGKKau5fBX7gwdMSgXkLPUpj8izS0+O0FV4MGUvvwoDAenxpCjoOeQ8svQNkCZvKjHECgmgq5PE8vcCREfgckbbu68aVgC3Aiz2A1NGS3Nypo= Received: from SN7PR04CA0042.namprd04.prod.outlook.com (2603:10b6:806:120::17) by DS4PR12MB9747.namprd12.prod.outlook.com (2603:10b6:8:2a5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:50 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::fd) by SN7PR04CA0042.outlook.office365.com (2603:10b6:806:120::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:50 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:46 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:14 +0000 Subject: [PATCH v5 17/20] x86/mce/amd: Remove redundant reset_block() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-17-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|DS4PR12MB9747:EE_ X-MS-Office365-Filtering-Correlation-Id: 91f40839-bb8d-4437-42f4-08dde3fd8e1f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NDd2RnIxTEZTUXcvT1lwTWU0SmY3QjJFdDN3a1djR0pqY3FZd0FrUXBPQU9a?= =?utf-8?B?UWFqckFsN1ViQ0xlYkVmMG5mMTVOUEQ4YW9WMUdJWk04STJoMGFaRjJIVlFV?= =?utf-8?B?cXNZOFNZbzZGMTRkanN3dTRDVW8xdGtHanA4TU5UT3FCVHRNOWRiUGFyK1RH?= =?utf-8?B?NWJHalFYaXQ2MUluSkN2YlJqZkhxelJQUm5haGdwQlpmTkg1MjVjQWhJN3Qz?= =?utf-8?B?bjVHRWo4V0pvd1BkU0VtOHo0c0RsVUdWMlU1U2lObTlQOGhwcmk4VXlITFRU?= =?utf-8?B?ekFjWllsMW4renVVaElVVmRwanRWNjBmK1JIYmNIYkUxamVKbVVvaEZGYzFX?= =?utf-8?B?TlFWazR6aVFvZHlFd2Y3TlpzSTdyaXA5MHovU3N3cjZLd2h6bFFUSWNlR0VG?= =?utf-8?B?MkFRTWhHQVFSTWlrdnM3ZzBvUWlXbjhZYnZMWEh0RlhkSmFzZHBNK3pBU0VQ?= =?utf-8?B?V1oxU3cvbHZwYW81UExwa3pGR1MvTHBlekFNeU9NS0pLR3ZvdEJWMi9kK3NI?= =?utf-8?B?bURJSnFrWFlmUElaYmc1MTdFbWc1RzBpODhQZTcraG1zV1pWbXNMNEExcEht?= =?utf-8?B?dThNSHdYeC9JL0FXYjNQUHRYSngzV3BmRTMwd2tJS1lJRWFab0F2TWFScmho?= =?utf-8?B?WklVNjgyY2wyZHZnTi9Wak9MWWRvcElCaXIyNE02N3JsUUoybmFYZlNGMks5?= =?utf-8?B?cFp5c2RTTm9rS08vdDJCTUY2VkFNRDVPUUVpU0wrOHJTN2FzL3JMSXpjRWtT?= =?utf-8?B?Sk15SkEzc21SN204ZEorZ3lLZW80eHV6ZlJZc0U1aURKY08rOE1WdGpEQkJm?= =?utf-8?B?c1ZLazNCWmt3SFR0T25vMmNhR0JxdjU3MEQ0SHJJei9rWUgyTnF1YXk3UlNw?= =?utf-8?B?ckJlL2kvREhjU1VKbGgvNUttbzBkRXRYWllBdjdaL3FCUS9Pb0xpRGZvanph?= =?utf-8?B?cStNaTB4V3NxVkNjWTYwcTZ0WVhvSWUzSGNaTTJSN0R3SzAwVDU0enJ1L2hx?= =?utf-8?B?cmFVK2IrMHZpWDdHN1RKU1RCTjNSWVhod1VpVXEyd0VvY3ZRTm1KQzdmRkZC?= =?utf-8?B?RSt1aDlhOGJhMXBEc3o3VnBnWmdSVjZOTEtJVERud1JvMTRmSTgwQ0dDWFM5?= =?utf-8?B?ZmxNeXRjbnVnc1MzT0NaQ2thNVQ3bHpnK05HQzJnSHB0eStXendNd3I0Tmkr?= =?utf-8?B?VmRka3grb1UwNGx3V1FCeXVDNVJOY1RDSFBPa05VdGNnbkZtTC9TVloyMlg0?= =?utf-8?B?VEMwcDBJR3F3c0p1bzhiT0VhV2ZYNVpqSG9WUkl4NUpQeFI0L29DVjRzLzZX?= =?utf-8?B?YkZTczB6S0JGakloT0xINjh1QlpWVjhwcytMT1FxTjR2U1UvQ2ZsYnc2anNl?= =?utf-8?B?NGh6aU1CVER3UEVxWXRoN0M0MEZ0eHpnTXNDSm51VHhkSzFRMnQ2TU5QR1hz?= =?utf-8?B?UFJ6Q2xuZFJKTXN4MWpEaVFyQlhmR251NmtjWEptaHdMeTZ5eGhlNjkwSC8r?= =?utf-8?B?eW5KVU9EeTBQMy9KNWUvMnBPN3lEV1FtTHhSNHN6Z1NmMnFESXdsTnpLeGFw?= =?utf-8?B?S09RUjZqUjFFS0JYb3VNcFBlc3pMYktmWmNRSXBXMkJnVVJkUDRadFkrM2ND?= =?utf-8?B?OGs3dUV5cDNoNlk4RkZhNmFVUHNjcFN0a2FLekYrUEVxMGNqbWthYUJUczVB?= =?utf-8?B?bHFYZW80LzFFVG9UOXk3T3JhWDArbE1ISzQ0UUw2eVJWbnlsRmh3QVRVZHE1?= =?utf-8?B?RkcvSjg4NnQvQm5DOHNjMUNDeFFXUmZFNHdxWHE5TlZtazZOWXM2K1cyMktt?= =?utf-8?B?ZWZIU095OUQzQWFyRmtNUlhGSXg4UkNBOUdUVHZZWVNJSUFQdFhESFhFVSsz?= =?utf-8?B?SExoVzVOZXY3UUJ0M2p6WUREcnJ2VnJrRUxPWkxXV1VHS0dEQnlUbGR0Wks3?= =?utf-8?B?K1J5WTZ6LzNwd3RHTEY2NURXSHNaTG9SczRDY3h4ZEdwZk9JZDNCVEVCNDB0?= =?utf-8?B?Zk5kd2lMMkR2MzN4SDhPN3FYTDFNVDlsUXZUd0M5TE5Vdk05bGNkNzI4Z2RW?= =?utf-8?Q?FTAZnt?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:50.6450 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91f40839-bb8d-4437-42f4-08dde3fd8e1f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9747 Many of the checks in reset_block() are done again in the block reset function. So drop the redundant checks. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-19-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * New in v4. arch/x86/kernel/cpu/mce/amd.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 559ad5ddb7a0..b929b09dd7eb 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -814,29 +814,11 @@ static void amd_deferred_error_interrupt(void) machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->dfr_intr_= banks); } =20 -static void reset_block(struct threshold_block *block) -{ - struct thresh_restart tr; - u32 low =3D 0, high =3D 0; - - if (!block) - return; - - if (rdmsr_safe(block->address, &low, &high)) - return; - - if (!(high & MASK_OVERFLOW_HI)) - return; - - memset(&tr, 0, sizeof(tr)); - tr.b =3D block; - threshold_restart_block(&tr); -} - void amd_reset_thr_limit(unsigned int bank) { struct threshold_bank **bp =3D this_cpu_read(threshold_banks); struct threshold_block *block, *tmp; + struct thresh_restart tr; =20 /* * Validate that the threshold bank has been initialized already. The @@ -846,8 +828,12 @@ void amd_reset_thr_limit(unsigned int bank) if (!bp || !bp[bank]) return; =20 - list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj) - reset_block(block); + memset(&tr, 0, sizeof(tr)); + + list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj) { + tr.b =3D block; + threshold_restart_block(&tr); + } } =20 /* --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2068.outbound.protection.outlook.com [40.107.101.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78B2A31062E; Mon, 25 Aug 2025 17:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143238; cv=fail; b=Q0aXS/yK7ZVM5D+R6iIBHfwRjJzZAnKwv89Z45zjWP1HJJkp+lrG5YUD+RqDRdnK+iJaXUIXXHKl8gET0pR2tuyV+CZ3oVu9RHvhm0O6WFYBhSeKqXtV+t/S1X72GrBDLocerUhOcEZa1jOeAH7SBq5kHJdSDAxisQdkmJuBiyo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143238; c=relaxed/simple; bh=vGdpBBC3VPZxEBIt96s7xztHjP/u9X2YFi149FY2D7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=j3/zyLTDXbRcHCOCf+yIjyqlBBWqQ3QIWZOPXN9wimnkGze5zFAmkX1zygDYpaE5rFMp0uJoMgG3KoZT8CvySdLh3/vbUvhXImZhzPBlBzA/gbAbSdJE/LbJ6Ea3oI+rO/z2Fqt07FO8EK4Fwi5mNMPRn28OzYdhgUV/b8W/dVc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=sXMHGWkL; arc=fail smtp.client-ip=40.107.101.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="sXMHGWkL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Be8qE86561zFfYHrw8KuxLXFw5C/9ASLolaekRv+mnMx2DFM5MSotabXHJkqkUF3IhZHHIARQjhrJ5eYs429Z5Dx8YOElMB8MZ4y+0f5R/qnIeuuWv/jJq/jsC0cYRpvyjyt9CutrPQJYb3Lvu0JpJ9JXRBY/VRSgBhoA468/ft+IOXV03KSZdZLLxXpWxPy7i0GaFQb8exF38Jovw7ei+MC/VH8rYIv72p8/j0PQdojTAaBOFa1OF62tiI0UKlKRaXoqzdUSfFsw3AH+GM2jDtN2LNzvmNcxKH4ebdGRxKsYcZqznxByZG+oTVZsHZGP+QVZN3qbeTAO1ojk+py4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JCiIVbU5YN1ojuaaNiX4WDZFOkOf/eZY77L2u4nL4Y4=; b=Dxzb8WB3rSWxN5PEOb0l47ciu0ADF5G9w5T6cJfaapod//lFYJHIaJkzoQeA43ueyyu1LSRgi3bNdy8gzisUK8D6/BQ5ysm3LcuJ0LgRSLqk4R8Wzgc55MYe7xZBkfXQd6nm/VWvcZGr55XKGuhXrSPnd16YiXCqtOFXnqY5m0bWBrO/OYKucduce3oCTEWE3u3NgIk/J3sRdYWIwg6q8UGhNnwrLLfH31vIThUDAYYgbeBjBGgFKPV4N8rlPA0ejA7lE56z+a0UPiMPs/uCPzCCqneLcwCBzxKII14iTC4u+bMOnTwnnaIcs1szTQVuGNqJUZoIpCrV0owhztLRyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=JCiIVbU5YN1ojuaaNiX4WDZFOkOf/eZY77L2u4nL4Y4=; b=sXMHGWkLNXp5T9QPNR5lTKmmyna8310iK2Idznbg9w4bxvIikLPZq8Edt+OS3M5rzZIoQ4Al477YwbA7L365scf9chuVKa8dmDClR5upoqAuw/ATzY0F3jivwLHFrLfkaA1duaEN1EBJ3LR3QftL6P8wKctrDI3XE6Vp/ZRI5r4= Received: from SN7PR04CA0046.namprd04.prod.outlook.com (2603:10b6:806:120::21) by LV2PR12MB5870.namprd12.prod.outlook.com (2603:10b6:408:175::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Mon, 25 Aug 2025 17:33:51 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::af) by SN7PR04CA0046.outlook.office365.com (2603:10b6:806:120::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:51 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:47 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:15 +0000 Subject: [PATCH v5 18/20] x86/mce/amd: Define threshold restart function for banks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-18-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|LV2PR12MB5870:EE_ X-MS-Office365-Filtering-Correlation-Id: 345f461c-0b0c-4b29-8871-08dde3fd8e6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?R0x0QTIzbzdDRUp3aGp0OUdTM05rRFNteEMxaVkvbjZFb25FbjVGUm5GR0xV?= =?utf-8?B?bHBaWC9wbTFjbHZLd0ZtOTFvcmYyUzNtYXUzYTF1UlA5elhERXNITmhMckM3?= =?utf-8?B?cnNTeGlRYzNaTXJ2cUo1WnZFRXdxLytvdHllVktTZVdEKzZXbW84UGx1NFlE?= =?utf-8?B?N2xtNkRzT0xNQ05uUDUxNE1Cd1Vva3VDU2ZpSXRMdHZZRk44aE5lZU9NZlZC?= =?utf-8?B?K2NwWFpOVVBLRlBlbCttOUMyZGI4Y28xb0FVQkZQeFBDeitGS0FIUFdSOVBl?= =?utf-8?B?SENzdEc0eGcrTklicXpWeUwremFFdGJmZkV4bGI0cFRjalZXNkVwRDZkaEY3?= =?utf-8?B?alliRlFwaFRRdnB3dGwrY3N5NFNiUVNEOGZ6TDF1cG8zbVBsSlk3d1Byckpt?= =?utf-8?B?Y0N2dTR6ZGhiTkFFbFNhb000aEEzTGtRRnhSNDBGMzlFdDJiNUZMS3QxcVpZ?= =?utf-8?B?WEwwMk50OXFmSEdYakY1RURFMTMxNkFhK20rWXE0VVdTSklWTjUxbUxXamYr?= =?utf-8?B?ZS9UeDUzTEF5VUFjWlY4bHhFcDdONXNlaG42SXR3VExJNnZvcVBheVY2b2ZS?= =?utf-8?B?ZWx3aDVjMDIzT1FHaHNValZObEh2VDIvZURURHpyMWdUckk2S29iSlk1Y21B?= =?utf-8?B?OTRWQ2VqVTBKc3VTSU11bjdXdjc4dEVNL0hsSWY4WjNFTUdwQUZnRmJoRWVv?= =?utf-8?B?Y2dNSmtKeWpkU2cxcDZZcm5PaU1EdDlibHNGYXlTOFZ0STUyUW9tVThvMHNh?= =?utf-8?B?WVJxY1E3ck9FT0NMOTAzdnp0cEZGZTR1VFg4RXJ3d2ZoQ3pzWWZ2YTd6VWJs?= =?utf-8?B?S09udlF6NW1qVDhQUzNKQ1VUTFNrY2pOUUlyRjdNNTdNQnNnVnZtK1FOVmx6?= =?utf-8?B?T0NvRk51eDJycjVYVVdpWkc0NWVHRDVZaEdmamwxeVpRWDZ4N3lreVVud1ds?= =?utf-8?B?bDB1REYvVnFrZ0J1NTF3WjdTNFdPU2k0bG9yZVhwcEk4aFZtaWYrMTFoZ21p?= =?utf-8?B?NnhIeXVHa3JFNDg2L0MxV1pyT1JlUFpWSUh4ZDI3N3c0N21KcnBvT1EzbXZL?= =?utf-8?B?ODM4YjcxWG8zdm5nOGVkRUV5MlFNRzMxbFR0NEJoTnErR3JqczgvQmhDUi9T?= =?utf-8?B?MkxSbXFYUjVhemwzeFJBbUtDNVF2MklrYTJoY1lqWStzYy9Scks1SHlpSVBh?= =?utf-8?B?eFNCc2paYld2aDU4VEhyK0pZR0JPd2htT0J4MlZwRjBsOHFad25UUXVRMW9p?= =?utf-8?B?NE13UXVBUEtxckFGZHpmSlVnaG5yZkZJTi9RaEs0d2hTMTdYT2VaL0g3UUVt?= =?utf-8?B?Zi9VVnQ1MjkrOHhDQW4zZ1JUdkhZMlAyemVsemJOcXMrRzAwZnhhVjJjNG9W?= =?utf-8?B?bFVWZ3pGZDBtMGYzYXdsbHlGQXdGWFBqYmFHSkRsVmhYUjlWK1N4MmVTbnl2?= =?utf-8?B?TEk1bTE0ZVpwa2lVUlVneVF5WDZNTW96MlNRR0JtTFVTMERNd20rY0FQS2dT?= =?utf-8?B?KzVHaE9NL2xGMlZjdVFTWEl2WEQ2TnJMaUxjbUlNc09oTHR6SUZsK0xwQjRL?= =?utf-8?B?UTQva1poZjZ1MTJ4TGhwMVdEWXY3aFVYc2d2bElKRUlHSUN4dzlnSHlpL3gy?= =?utf-8?B?VkZwdEROZlREQmVlb3hsZXh1OWFuaWlFQmtoeTlWdEF4YXA0UFkvMGdZRTIx?= =?utf-8?B?Y2NnckdZOU1GNVlNTlFhb1NJNkl4c0k3ZVE3MjNHYitYYWRTMWlJVE9kSzFI?= =?utf-8?B?Qk5pc0hCYWxsd0crUmFYQmxmVzM0M2huWXFvU1MxMFBzMDNZaW9wY0NxQjBr?= =?utf-8?B?RGFoY1NOSlBONGVoV05aU0FLSk4wSSsrRzBVdGNUVUYxcHJnOHlmT3lGaENB?= =?utf-8?B?YjZ0L3FJbzJKcmp1OFlJdktXbkdzZVBneXI4eUY3SXRlejdOd2xBL2hTNU1v?= =?utf-8?B?Mm42bVlKYlBqZ3ZxbFZYc2RzT1R6MUF2bWdvZGRvaWhTTGFwais5OGYveVVL?= =?utf-8?B?eGY1QThiNCt3Qkp6dWRQbFhsUVJaYU9veVRwNWp4V2hwTkxsUGdjMzlGYjJh?= =?utf-8?Q?UjlISJ?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:51.1662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 345f461c-0b0c-4b29-8871-08dde3fd8e6e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5870 Prepare for CMCI storm support by moving the common bank/block iterator code to a helper function. Include a parameter to switch the interrupt enable. This will be used by the CMCI storm handling function. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-20-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * New in v4. arch/x86/kernel/cpu/mce/amd.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index b929b09dd7eb..0c8ec431ebd2 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -469,6 +469,24 @@ static void threshold_restart_block(void *_tr) wrmsr(tr->b->address, lo, hi); } =20 +static void threshold_restart_bank(unsigned int bank, bool intr_en) +{ + struct threshold_bank **thr_banks =3D this_cpu_read(threshold_banks); + struct threshold_block *block, *tmp; + struct thresh_restart tr; + + if (!thr_banks || !thr_banks[bank]) + return; + + memset(&tr, 0, sizeof(tr)); + + list_for_each_entry_safe(block, tmp, &thr_banks[bank]->miscj, miscj) { + tr.b =3D block; + tr.b->interrupt_enable =3D intr_en; + threshold_restart_block(&tr); + } +} + static void mce_threshold_block_init(struct threshold_block *b, int offset) { struct thresh_restart tr =3D { @@ -816,24 +834,7 @@ static void amd_deferred_error_interrupt(void) =20 void amd_reset_thr_limit(unsigned int bank) { - struct threshold_bank **bp =3D this_cpu_read(threshold_banks); - struct threshold_block *block, *tmp; - struct thresh_restart tr; - - /* - * Validate that the threshold bank has been initialized already. The - * handler is installed at boot time, but on a hotplug event the - * interrupt might fire before the data has been initialized. - */ - if (!bp || !bp[bank]) - return; - - memset(&tr, 0, sizeof(tr)); - - list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj) { - tr.b =3D block; - threshold_restart_block(&tr); - } + threshold_restart_bank(bank, true); } =20 /* --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5D6430E82A; Mon, 25 Aug 2025 17:33:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143237; cv=fail; b=KMebbAyEZg3Kk9XdeHYtmNr1kz5CStb6H7MajZJGeJ83ccUEZCZowAWvJOwUP8FKGB+qmrnfOpJnWsskpNpvR/nfo+yKk/8bpYnMO74AuWzetDw6BLld5vy7lldIRXTB9ZMnZkpgJ5EARxofKAFjia8qxKK9TZEzn+odik8P+Zk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143237; c=relaxed/simple; bh=Kryv3hK0Yq4w3x21XxTqhkeVIlqZquNSxfh7ipBPXTI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=lK9PcA3tE3bxdvJai2TLFvAhJn/JUjbLEXzgaPjAAqLKAfy1GyHTN5vp5D4xU2+jLOfGHgF/3tca9XoYh8pG/1jLmGxMChHXxoM+a1GW5XrFyeNe20A/VUtY7h7jNfmJjrXJMsZhmrgvHcNsB40HzLsglCyuOiUU87M9na18SNE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=BnwImZ9q; arc=fail smtp.client-ip=40.107.237.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="BnwImZ9q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NgQQnFUkH64MzN002265Fwz8QM2pgBHVLKqc+uhHBnslK5ZKzW9FTahCnXHlDNhRm93Dri1KFxY6wJbHVov0BtbLt2x7pn81OgWekt+Abl2PfAPT4TIEIJeu3aysdoxY6CT/VSZyGmnM0PCVoukdEzfNEKL2woPcUUo00X3doQA2Z8KY74bggTZwwi4SLGTIwrBR7zbHn9jBmw0xxzOSWJbKlgLqF7kUmqUN+dKwc9ESL9YTx+UCg/AANXPPdZfy9m7cZhnxCB7PSUHFzenGOmmqSHNbMfWmTrMbFK5Gsy0GaCP+kOLCQ9upJev/Iize8qvTTz5hba02u+K34VnMAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+cbXniQZ0gJ3pjWEODCpdUOXjzqjwp0Xu3tJyS+q5qA=; b=JUtw9GXhy9wA9mDOJSW38ZMSYyDap4IQmP1crDM2AeDxjXQaJmzkDAoI7fMZsSi/PeJhpgyVhJysOAmyCrLvt7l4OXiifD8aGHWiLphYTrwV79CA+d7GGLljfo2TIbgPKC356eBA++A2DJQDgMdI/lYT2pHRJnQFGCkMrfJd+GGCv1N8JWbpRs4rfZel4WMh1ZV57gfZrqBw7cErrDP3++P5MOwLpf8qbShR6DfDgY0I9vrsjaqNe7hts3ZYFoqVUyU33Nr0jr8XbkYCCgUubBc+5ghyCO+T5Z//QrAbGUdFX5DHZICvplCQwg/sGF/fS3MSsuRdfn/kPcmr3y4pgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=+cbXniQZ0gJ3pjWEODCpdUOXjzqjwp0Xu3tJyS+q5qA=; b=BnwImZ9qapEab64eJ3zt0bDeR5gBwoArqsA7AlI4F90Z+j7RsxwBUEZJjOG8m3yK8YU2z1QkidN6MiTjmy/hwGuWBOqZql14QkqxKdout8FD1NBu0Tg0JgTeFOQPQS5o5jaTScjtnkw5V0jb8sZ5oecByBURCKRK/YrXLsNwIE0= Received: from SN7PR04CA0059.namprd04.prod.outlook.com (2603:10b6:806:120::34) by LV8PR12MB9406.namprd12.prod.outlook.com (2603:10b6:408:20b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.20; Mon, 25 Aug 2025 17:33:52 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::e6) by SN7PR04CA0059.outlook.office365.com (2603:10b6:806:120::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.20 via Frontend Transport; Mon, 25 Aug 2025 17:33:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:51 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:47 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:16 +0000 Subject: [PATCH v5 19/20] x86/mce: Handle AMD threshold interrupt storms Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-19-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|LV8PR12MB9406:EE_ X-MS-Office365-Filtering-Correlation-Id: e38b7a07-a4b0-4dbe-f46e-08dde3fd8ee6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cThONktUZ0UrcWxSNCtNdGRvbWxDOVljVmhwN2Myb3VXNVZwajY2c3VkR1E5?= =?utf-8?B?TXFsVytNOTdLYXhEUkRsSWVLZTJrOFJSNWFrYzdNczBodnlHcTZXMGtGK2tT?= =?utf-8?B?MU1pMDNKQXZ0bWpvWHVrUDcxYThWRDVZYWdEa3ZjemgzYWFkZWJ1djczcFNR?= =?utf-8?B?Y2s1YmdnMmZRSEtvTEZyOUJ4WkJEbW01aU5oeGtKbDlLVVdnWWNhOU9FZEZG?= =?utf-8?B?SUd4WFRTdWdFdU9ZalNYNlc5OTVUQTVuMWhuU0NWOW1UMnBPalBkRzZCdDNk?= =?utf-8?B?czdZMmhUMTRMT2VDRnA2amxUZkkrYmdVM0syWjRxelJWWEYxRWduVWNJRGds?= =?utf-8?B?TSs1Rk0wbEdRb3NjcTdjVEVUSVMyRXg0K3NuSkRvbzZCMlZZT2lONjI2dStF?= =?utf-8?B?ajVicWtnd3hLdDkvbFJaZTNkM1N0YUd5ZmY2d0JTdWVVSFdzOThvYitleGF6?= =?utf-8?B?d09xSFFvbDlyVllMYXlKS0hOUE1Na3ZqSFZnekxYcWpCc0owL0lER3lxNjZE?= =?utf-8?B?TG5oR1VKay9pa2VpZENNMWljaXRRNHVRdC9XTDRkQ3NMRFpVRmlYVjRWNllV?= =?utf-8?B?NmltNFFnK200R0loL0M1cXptb0twOVFwVm16WXZSWlBJcjNQZk15SlNZSEl2?= =?utf-8?B?eUZ2cDVJeVN3WjBEb2xUR0pveW5hQk9peWY0TjZNd2tRdStPUVE3VWxYTXFz?= =?utf-8?B?RlpuREdJOHlxaWZLaVdJVlBUVlVzUmpQOWVLRkZUdlpqNmtTWnBZOUtDU2Yw?= =?utf-8?B?RTJROU1mM2RlT2U2ME81UTh4bDBmdVQxcFMvelJYRnVBN0pBUHJrUWRrN1pO?= =?utf-8?B?eitKQjB1eGFqUmZ5Z1JEUkx2YUZUSDhFTXNMYllXMHVSU3liaTFUYXhFK05B?= =?utf-8?B?SlpYbC9OcXExdzV1MkxUSVJSbDdWK3YzMlE2bE91NXhUTDFVQVhTSFJsQW0v?= =?utf-8?B?RGxGOTk0Z3FCMHdienR3dlpWd0hYdUhPTlFvUHh5azZTUXhQa2h4dE1RWHla?= =?utf-8?B?dks1V0JFSlpwbjBDL0FxWS95NGt1aE9MMG9lMlY4aFdPcjFJeHZaTjROSnU2?= =?utf-8?B?d0lNUlNKbnpsdHNzTTdOV01scGI1T2w0MjdSYTlkZk81ZUpndHpSc3FxczVH?= =?utf-8?B?aklpYW1kMXdHS2dkSHNIMHRudVhrb2t2OC81VE5nWmpDUXpweS9uTmo5OTFD?= =?utf-8?B?Ykw2SGhTZk1SNWRaN3R5MFR4L242bTlvVUh3Y1drRDRIbytjWm9QbHE2OTRP?= =?utf-8?B?Mzg3Y2l1a1VaaXorL3NHQXpmNjk0NWdCbEgybDhwN2tPTWpXTldMNlZqVGNa?= =?utf-8?B?V2FOOGJrQzdMS2Fac2VadENXUnF2d3lyRWdjWkkxYnIxUk5Dd09ZUVVFNGFt?= =?utf-8?B?UytBU0xxcTBGWC9LL2xESjIweXN0aTFiZGZUeVNCdHJjS3VYWWg4MjV5MVRa?= =?utf-8?B?YlE5dW56QUdScEo1WHBKVUczTUdBd2JNb1NHWVFtWU1JK2JHZ3VFb2NlMCtj?= =?utf-8?B?bEhDNkMxVlBIN0FDUHNKZ1VFTDFLUVNEd0xBM09uOElIOURTVU1UQzAycCs4?= =?utf-8?B?SEFTelZvbUNERm14RXBIek5zRVNGL1B5dzRwejVuRVdFSkVvYXVGYXdxWFRs?= =?utf-8?B?UDFHVThyRFZYZ3hxTVRKOXBsWDVzWVNidXhXVTlDT2c3UDZ6YkxCbW5ocVN5?= =?utf-8?B?aTJYMk02RzVoaXJudUpTSWV0eHpNUk1MTW4rcmZOeEYwem9Ec2s1ODFjRWY2?= =?utf-8?B?T0JQUEpudzJWQzJ0d0pKMzEzSDFlVDJ2RFVzT05rb0U3T3hyMWJXcHN5R2I1?= =?utf-8?B?MWEzdHZUZ2N1NDk4SDJWNnFvZEFtMjFSOUhWaHRuc25Ea28vWGRURGo2RGpz?= =?utf-8?B?MFA5bVRXS3VXRE53VFBCa2p3QVp4NUtZUHpDckw2bVNwQzcyRFFDaHcyd3RP?= =?utf-8?B?MnJoZUxFQjRlYXpKcTlHOTNid3QyM0NwRjg1c0ZwY0V2MmMwRWNoT2tHKzhw?= =?utf-8?B?RUZyZ2I2QnBIWlhFNjlNbVd4MDJ2MFBHSndKbGhQN0hDMkRRbkM0L3RONE5Q?= =?utf-8?B?VWEwaUkxcUY3R1UzTkhGWUE0QzM0VngvYVNrdz09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:51.9552 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e38b7a07-a4b0-4dbe-f46e-08dde3fd8ee6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9406 From: Smita Koralahalli Extend the logic of handling CMCI storms to AMD threshold interrupts. Rely on the similar approach as of Intel's CMCI to mitigate storms per CPU and per bank. But, unlike CMCI, do not set thresholds and reduce interrupt rate on a storm. Rather, disable the interrupt on the corresponding CPU and bank. Re-enable back the interrupts if enough consecutive polls of the bank show no corrected errors (30, as programmed by Intel). Turning off the threshold interrupts would be a better solution on AMD systems as other error severities will still be handled even if the threshold interrupts are disabled. [Tony: Small tweak because mce_handle_storm() isn't a pointer now] [Yazen: Rebase and simplify] Reviewed-by: Qiuxu Zhuo Signed-off-by: Smita Koralahalli Signed-off-by: Tony Luck Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-21-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * Simplify based on new patches in this set. =20 v2->v3: * Add tag from Qiuxu. =20 v1->v2: * New in v2, but based on older patch. * Rebased on current set and simplified. * Kept old tags. arch/x86/kernel/cpu/mce/amd.c | 5 +++++ arch/x86/kernel/cpu/mce/internal.h | 2 ++ arch/x86/kernel/cpu/mce/threshold.c | 3 +++ 3 files changed, 10 insertions(+) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 0c8ec431ebd2..d7b226a68ed3 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -832,6 +832,11 @@ static void amd_deferred_error_interrupt(void) machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->dfr_intr_= banks); } =20 +void mce_amd_handle_storm(unsigned int bank, bool on) +{ + threshold_restart_bank(bank, on); +} + void amd_reset_thr_limit(unsigned int bank) { threshold_restart_bank(bank, true); diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/i= nternal.h index e25ad0c005d5..09ebcf82df93 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -267,6 +267,7 @@ void mce_prep_record_per_cpu(unsigned int cpu, struct m= ce *m); #ifdef CONFIG_X86_MCE_AMD void mce_threshold_create_device(unsigned int cpu); void mce_threshold_remove_device(unsigned int cpu); +void mce_amd_handle_storm(unsigned int bank, bool on); extern bool amd_filter_mce(struct mce *m); bool amd_mce_usable_address(struct mce *m); void amd_reset_thr_limit(unsigned int bank); @@ -299,6 +300,7 @@ void smca_bsp_init(void); #else static inline void mce_threshold_create_device(unsigned int cpu) { } static inline void mce_threshold_remove_device(unsigned int cpu) { } +static inline void mce_amd_handle_storm(unsigned int bank, bool on) { } static inline bool amd_filter_mce(struct mce *m) { return false; } static inline bool amd_mce_usable_address(struct mce *m) { return false; } static inline void amd_reset_thr_limit(unsigned int bank) { } diff --git a/arch/x86/kernel/cpu/mce/threshold.c b/arch/x86/kernel/cpu/mce/= threshold.c index f4a007616468..45144598ec74 100644 --- a/arch/x86/kernel/cpu/mce/threshold.c +++ b/arch/x86/kernel/cpu/mce/threshold.c @@ -63,6 +63,9 @@ static void mce_handle_storm(unsigned int bank, bool on) case X86_VENDOR_INTEL: mce_intel_handle_storm(bank, on); break; + case X86_VENDOR_AMD: + mce_amd_handle_storm(bank, on); + break; } } =20 --=20 2.51.0 From nobody Fri Oct 3 20:24:56 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC39431353D; Mon, 25 Aug 2025 17:34:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143242; cv=fail; b=DAaloPy/T/pBzpnbjz+QCaUyKeaFxIfYyAOaJ6qlLD1+4VavwB82CLMWceyzB2v2XHnGR2fLR2MO4SgQwRAs+Nhi6A1UB6vz2JEqfqNsD41aOPg/wMc3RAJd68t/TwnuvtcG4WZuvljdGfv4Pm4YxARi3U6xp7Hwv+cRvYb0XDI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756143242; c=relaxed/simple; bh=fkp4kygFwoJZPCJAiOlvCapVRkG6f44mRO7oRU48qhU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=iPN5QGkujeO0UeFr3bWb+MI4jgl7XZHis5h4kF77i5rZeSn/Won+ihTD3qJc9P3O6iHrF2lXW1qjsKEqGZXqZNyl7xaqVCoB5KJlG9d5tLnCtAn86o6fq0dNFatFxR3ibCafioAAVY47bihYNl87gS8dPfSaYwB4RqtEKIe3fJk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=2i60QwxY; arc=fail smtp.client-ip=40.107.93.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="2i60QwxY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m/ZHm6SWHEXhUt4v2SaH7+pnqyAMydtUhWJED4UcaEVCf7dEyNJoAM7KlB17NTR5LYRH6M23pi1ttWnQSHoA2Z6DcHURwscvEVBrzg6M20Af27yLOY7LA3MquD6UDJ5nxXtPx1eFxAG/eyh6muneTbHxSwHV+xLoYBzOBwWUubyXKcR5UsEDvXjZmMbG+pbXzirBR1EmSamUuCmwKspS4N+B6J4djRIU9B7qFC37Fo3KOZ4QjYeUg0e4xHUzFc9n1QSZX2AFXGTiK41iG4iM5oRsoXT95T9mV6c1qFou8wjDHe3WA3ECEIC1c18e45A1y9rZOjwIokygtwwkNyf0fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+dfVLlp9em18Tnudeeok4SZVgTZlv9Fn1mNh3ooz5Rs=; b=GEWIgKqTRzOnwf1sXbqBx/LLnDoFitEGa3JkbNg+u42ayimhA0SqKwypSf9Z/FSYs4zBbCOmWsHNXURT6OezPaOYWSk7nJqWTrAKcvji3hJoNS5LvBO+0IP651qmF9hmQGpQZAZ0vX/qt0cNU0iLRQ/ggniVVBxvXQoyGYlrp+biZ3bk8tdhyUvjMfZyX90Z94+/GIagfl4StiFOkNHq8EQizjNr9US3PQ97JVor0YCeoSkSmGoYrGPIX7IAZGclUQ1J/BpyV6Kbz39XkmM11Qj+JRUVpMsFY/E7I+1C3Um6d65MRhKO6/4Es2xvjE8AGBoVGtzLVcQbhQqshTHnkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) 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=+dfVLlp9em18Tnudeeok4SZVgTZlv9Fn1mNh3ooz5Rs=; b=2i60QwxYfgtZ9tA47jAI/t/C+K7k59G/ittHF+0r7gYw7xe+8ro3wNOY7t19X3cWPm/euBmaEZndZJVWitja4kOOCOVsDEGB8g79/m8sFye1x6ucrkyMnaWJC3LuGiAf5mD18cswFpGycFQ7nZYSei2XW1+ZLOyik/+TeuDlxwM= Received: from SN7PR04CA0058.namprd04.prod.outlook.com (2603:10b6:806:120::33) by BL1PR12MB5754.namprd12.prod.outlook.com (2603:10b6:208:391::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.19; Mon, 25 Aug 2025 17:33:52 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::42) by SN7PR04CA0058.outlook.office365.com (2603:10b6:806:120::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Mon, 25 Aug 2025 17:33:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Mon, 25 Aug 2025 17:33:52 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 25 Aug 2025 12:33:48 -0500 From: Yazen Ghannam Date: Mon, 25 Aug 2025 17:33:17 +0000 Subject: [PATCH v5 20/20] x86/mce: Save and use APEI corrected threshold limit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20250825-wip-mca-updates-v5-20-865768a2eef8@amd.com> References: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> In-Reply-To: <20250825-wip-mca-updates-v5-0-865768a2eef8@amd.com> To: , Tony Luck , "Rafael J. Wysocki" CC: , , , Qiuxu Zhuo , Nikolay Borisov , , "Yazen Ghannam" X-Mailer: b4 0.15-dev-9b767 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|BL1PR12MB5754:EE_ X-MS-Office365-Filtering-Correlation-Id: 0334d5fd-d408-42f1-ade8-08dde3fd8f45 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?OUtqc0hIWVhoNWc4NHROT3hNbmFPeE5JenpIdHlMNHRvUnNBeWRHUVk0enRR?= =?utf-8?B?NTVEbXoycmFBL0pSYU9XWk1wVGNhMWhla20weFpaaVlkd29XbGxXRGxreVhS?= =?utf-8?B?RytLc2d0WkhyUVdoZE9JWWJJK2I0TVU0OXJyc3dPWmlnT2xPL0VoeFlyaTZE?= =?utf-8?B?RUw1NHpkMUFBK1N5ellXdmo4WjNQa2hvdFREcE5yN2Q0UEdTOFhmTHREOFFt?= =?utf-8?B?eU5YZmIvRmd0SHhVS0prQ3IyQzVXMFRScTh5bndibHRlVzF1VW8yVzJCNDF5?= =?utf-8?B?ZGVzR1pDR2hUNGZzRzhmcWZ4S1Z0Z2RWa1pRQkU2dDNxaGpRQktITXBOSVlM?= =?utf-8?B?NWRVMVFiU05nbkNPb1pVdUp3S0FWVytRUU40Y3ZldG9iZEhMNWR4TE5vM0hC?= =?utf-8?B?RDZtQklsUUNKSHQvRXovdkR1TjRISVQrRWFpRFRqVHo4bSsyNzZuSlVIWHZs?= =?utf-8?B?Z3FUM2VXUWN6aFpjMjU5Q25LZEtCK1FYUkxUVDdFeDdaR3lpVnNFalhRczBF?= =?utf-8?B?Q3JLL3UvaE9kS0ppRFZmYkY3Y3hwc2JDNzVoTFVoNkI2ang5Um1JWkkxRTk1?= =?utf-8?B?NVNuV0Exb3JHUGxUYmFsVDhYSkIyVnJZR3E0cm9VbXVSYXJCUEo3UnpQbkJi?= =?utf-8?B?NzBYVWtLT25BWmdpVDVrSjgvZmRiZ1lPZUE0bGtpcUJYdVRwNENOa3o2c01k?= =?utf-8?B?QVhFUVhCd2RoeDNNVnFBZ2E3MVhoOW1SNnhjaDhlU3hVbEJFN05neUllbU5L?= =?utf-8?B?WFRIQTdqankwbm9hSjRiMmYzVjlmRUxhVnNwdm1aZ24xWm9WMElRRzlQcSth?= =?utf-8?B?dnpqa1ZETVpaRmJzSHYwSWR5NWVNR1BzNktHdDFySUtiWThFNG1TK2RzNnUy?= =?utf-8?B?Rjl2VUdEUzVTU0R3cVRacGNVY2w5MjhmOTA3K2NXYjVLMG1PU1lJV2RkM08y?= =?utf-8?B?R3oyOEplVzFCZVFINUtNZURzUHhTNHVEY0t2dDNuZWU0Mm5Nc05lMEErUm5m?= =?utf-8?B?RjQxSU5KdkI3aEFZMzdCNnlXQ0Y4R2RoejBkNUwyL1dMT0QwTnpBa0ZrYnpq?= =?utf-8?B?MWsrbDlsa25PcXExc1VUcldsYWxJMXo2b0htVHl1SEw4QXlqY0xUcEQwT042?= =?utf-8?B?emhtSmlWNTFzaEdPSDdJaHFrdjFDY1hIU3l0YlBOWDhrdnBhM3NMZHIyNk9u?= =?utf-8?B?SHNyZ29qR3E4MW5nWDF4T0syZ1ZycnFBc1NLeWU1disycFRINXd0MjVhMmNv?= =?utf-8?B?U3FVVDlJU3liekZzQ0lyMVIvNE8vK3RVRi80dFFoNUlxRi9tUWFjODBpRWtp?= =?utf-8?B?cjNHdExZZU5Cb0xvTUlNVnVJT3VDamlOdHpJZFl3aHo0QTJmVmF4dW12ZVZn?= =?utf-8?B?NmlzRUNCL1czSmZHR3EzWHBHYVUwTlptTGFqRW9ZeWNMNnlWMytKTmIyT3hX?= =?utf-8?B?ZnI3RHlXYTVEbWUyaHEyVHVpQzYyZ1FSTU9LSnhSU1dnTkg0NWpuRmVrT2dP?= =?utf-8?B?Q1dDbStaWXJZK3luQTlkaFJyM0I1ZTkyQ0ptMjJjUFFSVlVlUzVyRzZYR0Q1?= =?utf-8?B?dEs0VGEvMWhYU3lQOHd1NlhTMGhUVnFsYmhOekV4YkgyMTFFSHNmRFZqanM4?= =?utf-8?B?enFZNlpZYVpiMkl5WnpNUEliY1JpbndPRVkxV3kxU3QyWkcrdm0xMEt2UzZo?= =?utf-8?B?WERIZmloM1hDYTRKQy9OOXQrQ1lBOXBaNzV1QVdQV1d6WXFkV3ZDWUU0VGZF?= =?utf-8?B?QnU2WmJNWEpuVHg3L3FIbjJaRkVjRTFIR3JCYnRjOU42cFNmU3pXNTNiMFFK?= =?utf-8?B?dmNHdzR0NlFneS9EMzVlR3lCQmdPaUlnQmZRYWNlRDJCdjc1Lyt1MGJDK1kv?= =?utf-8?B?ZDhPWHl4WnU2bEpxdzdXaEx0L0hFblROT0ZzNHUwaGU3YTBUR2I2a1k3azBi?= =?utf-8?B?bG4vZU03WGxtTm9tbkwvblFoaGxkSmdpTlFUZmdtYjBjTHBlcjZ0bjJtckxi?= =?utf-8?B?VUptUU14cHkyekZibG1KTUlTWEhvWXZqWjhoU1RjbGZaQ05BRFFLWUpGRU9q?= =?utf-8?B?bjhBeHM1RE1Vc21rL29oeDhKVWs1dWRJTCtCUT09?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2025 17:33:52.5767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0334d5fd-d408-42f1-ade8-08dde3fd8f45 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5754 The MCA threshold limit generally is not something that needs to change during runtime. It is common for a system administrator to decide on a policy for their managed systems. If MCA thresholding is OS-managed, then the threshold limit must be set at every boot. However, many systems allow the user to set a value in their BIOS. And this is reported through an APEI HEST entry even if thresholding is not in FW-First mode. Use this value, if available, to set the OS-managed threshold limit. Users can still override it through sysfs if desired for testing or debug. APEI is parsed after MCE is initialized. So reset the thresholding blocks later to pick up the threshold limit. Signed-off-by: Yazen Ghannam --- Notes: Link: https://lore.kernel.org/r/20250624-wip-mca-updates-v4-22-236dd74f645f@a= md.com =20 v4->v5: * No change. =20 v3->v4: * New in v4. arch/x86/include/asm/mce.h | 6 ++++++ arch/x86/kernel/acpi/apei.c | 2 ++ arch/x86/kernel/cpu/mce/amd.c | 18 ++++++++++++++++-- arch/x86/kernel/cpu/mce/internal.h | 2 ++ arch/x86/kernel/cpu/mce/threshold.c | 13 +++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 7d6588195d56..1cfbfff0be3f 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -308,6 +308,12 @@ DECLARE_PER_CPU(struct mce, injectm); /* Disable CMCI/polling for MCA bank claimed by firmware */ extern void mce_disable_bank(int bank); =20 +#ifdef CONFIG_X86_MCE_THRESHOLD +void mce_save_apei_thr_limit(u32 thr_limit); +#else +static inline void mce_save_apei_thr_limit(u32 thr_limit) { } +#endif /* CONFIG_X86_MCE_THRESHOLD */ + /* * Exception handler */ diff --git a/arch/x86/kernel/acpi/apei.c b/arch/x86/kernel/acpi/apei.c index 0916f00a992e..e21419e686eb 100644 --- a/arch/x86/kernel/acpi/apei.c +++ b/arch/x86/kernel/acpi/apei.c @@ -19,6 +19,8 @@ int arch_apei_enable_cmcff(struct acpi_hest_header *hest_= hdr, void *data) if (!cmc->enabled) return 0; =20 + mce_save_apei_thr_limit(cmc->notify.error_threshold_value); + /* * We expect HEST to provide a list of MC banks that report errors * in firmware first mode. Otherwise, return non-zero value to diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index d7b226a68ed3..1c143009df01 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -487,6 +487,18 @@ static void threshold_restart_bank(unsigned int bank, = bool intr_en) } } =20 +/* Try to use the threshold limit reported through APEI. */ +static u16 get_thr_limit(void) +{ + u32 thr_limit =3D mce_get_apei_thr_limit(); + + /* Fallback to old default if APEI limit is not available. */ + if (!thr_limit) + return THRESHOLD_MAX; + + return min(thr_limit, THRESHOLD_MAX); +} + static void mce_threshold_block_init(struct threshold_block *b, int offset) { struct thresh_restart tr =3D { @@ -495,7 +507,7 @@ static void mce_threshold_block_init(struct threshold_b= lock *b, int offset) .lvt_off =3D offset, }; =20 - b->threshold_limit =3D THRESHOLD_MAX; + b->threshold_limit =3D get_thr_limit(); threshold_restart_block(&tr); }; =20 @@ -1063,7 +1075,7 @@ static int allocate_threshold_blocks(unsigned int cpu= , struct threshold_bank *tb b->address =3D address; b->interrupt_enable =3D 0; b->interrupt_capable =3D lvt_interrupt_supported(bank, high); - b->threshold_limit =3D THRESHOLD_MAX; + b->threshold_limit =3D get_thr_limit(); =20 if (b->interrupt_capable) { default_attrs[2] =3D &interrupt_enable.attr; @@ -1074,6 +1086,8 @@ static int allocate_threshold_blocks(unsigned int cpu= , struct threshold_bank *tb =20 list_add(&b->miscj, &tb->miscj); =20 + mce_threshold_block_init(b, (high & MASK_LVTOFF_HI) >> 20); + err =3D kobject_init_and_add(&b->kobj, &threshold_ktype, tb->kobj, get_na= me(cpu, bank, b)); if (err) goto out_free; diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/i= nternal.h index 09ebcf82df93..df98930a32a5 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -67,6 +67,7 @@ void mce_track_storm(struct mce *mce); void mce_inherit_storm(unsigned int bank); bool mce_get_storm_mode(void); void mce_set_storm_mode(bool storm); +u32 mce_get_apei_thr_limit(void); #else static inline void cmci_storm_begin(unsigned int bank) {} static inline void cmci_storm_end(unsigned int bank) {} @@ -74,6 +75,7 @@ static inline void mce_track_storm(struct mce *mce) {} static inline void mce_inherit_storm(unsigned int bank) {} static inline bool mce_get_storm_mode(void) { return false; } static inline void mce_set_storm_mode(bool storm) {} +static inline u32 mce_get_apei_thr_limit(void) { return 0; } #endif =20 /* diff --git a/arch/x86/kernel/cpu/mce/threshold.c b/arch/x86/kernel/cpu/mce/= threshold.c index 45144598ec74..d00d5bf9959d 100644 --- a/arch/x86/kernel/cpu/mce/threshold.c +++ b/arch/x86/kernel/cpu/mce/threshold.c @@ -13,6 +13,19 @@ =20 #include "internal.h" =20 +static u32 mce_apei_thr_limit; + +void mce_save_apei_thr_limit(u32 thr_limit) +{ + mce_apei_thr_limit =3D thr_limit; + pr_info("HEST: Corrected error threshold limit =3D %u\n", thr_limit); +} + +u32 mce_get_apei_thr_limit(void) +{ + return mce_apei_thr_limit; +} + static void default_threshold_interrupt(void) { pr_err("Unexpected threshold interrupt at vector %x\n", --=20 2.51.0