From nobody Fri Oct 3 20:59:23 2025 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2057.outbound.protection.outlook.com [40.107.101.57]) (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 0393C23D7EE; Tue, 26 Aug 2025 04:15:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756181713; cv=fail; b=qm+ln4Qnc7vFfbJPoRKirrhFJqRG4kJwY5tQXMH5UfnAgB4nB4MXcKqVTJmVLKqTBv9IwCnbyUjdsxTgWryTazTFPlHMDZTbkYBWLcMpdeolOlAspzGj9peWE9oQ+csMQLPBsSRfm5oCw3kFHWI9YZoSHyArN7MwYEbEbcaJ4l0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756181713; c=relaxed/simple; bh=QzOwBtXUGgs3sox4qTNdCSujFdaj8LytVd0H71LW8gY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TIYWX7+s3xizTdX9Qg1h8yJYwzE1JW3U/pobroWvyPjwytpq472JsDAmvotSq/9b0kaUI960czeUiaY5PnaA4sPQ4Dw3Z6RQPtounrVdw9D7s3IkeEt+tTTDjwNjw95F7/TBiOwtUPI+Hv32xqpitWpxvjo+R96/4zEIruQ1szw= 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=FsBrP4Ym; arc=fail smtp.client-ip=40.107.101.57 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="FsBrP4Ym" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AeMCsfL1bInl0h17+ylppjRpS8OUodiEQlkijwePRPSMCjilaVWPHxIm16PAulasztX+QoTWgOdnyc6eTMFAsFR3G/anWxhRhMdS8TcxxYIvWybqU6X110ENFFP/J2iMw94PtpSTLTXncYfyfC3REqADt3skhKor81uacBOn0iiHd22i1iUKASwdFVm0hH88IRDa/OKKOmd0QMKryCJoOgNQxJySjFCvU8irf/Q/uI9ew6k+33eePsO9LZGwAdsRMhDGlJbrHw2kJS3ifv/W96crVvXbi+autH+upr7js1B6AaQcmFIR7h8vNN3vh+O7h5FfRmR7glst4l5qI4GgXw== 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=5IH8oGZxcIwSCBKee6k1Y2kPyqcMYvW/bGsTY8BkelE=; b=vZGW5JsfV0qebQ7y/6HVXuzVIyEFI7/wYktUWBwBEYEvH14JneIZE1WUfDGCdJfV+FQ9iagbvoWynsu1F0y9OMHIhI3H3BQFcFjq3LSvEfz0gUNSSKZH3cQm8qjzXA8dlg2QLaAEEysbFX42Zmfcl4VvAD8HwP4+y70BG9PA7qeozRnBOB4qXiYPOSSUqO1lz6L66BOlWUTqMoHO7uzpFwm6IFvypzewMxrD4S3h6wsjwQcTsfD4vVOvD1pBC9/9MwBbOz6DXiM9OS5KFKPZxtJF2QuAHfqtS5ztopooVANXUhjOL80ln/GEADjVV1gqyKqCOcS7J3wefobAnoXlRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux.ibm.com 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=5IH8oGZxcIwSCBKee6k1Y2kPyqcMYvW/bGsTY8BkelE=; b=FsBrP4YmMdOesK0EsMIra9EliKwIcXnPl9ncHedIk4Z/mMBQ3Iw+9QTphPaoYVMHAcXm8YvLIkGkiD7lM0yzGKERFsjRWnZB/IfarWU9+4rWKvZR5MUfU56M2WecB1mdePSiioIJ5HtM6orjaoCT4BOh25yfPziIV951Xc3EwGk= Received: from DM6PR13CA0001.namprd13.prod.outlook.com (2603:10b6:5:bc::14) by LV9PR12MB9784.namprd12.prod.outlook.com (2603:10b6:408:2ed::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.21; Tue, 26 Aug 2025 04:15:08 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:5:bc:cafe::5f) by DM6PR13CA0001.outlook.office365.com (2603:10b6:5:bc::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9073.11 via Frontend Transport; Tue, 26 Aug 2025 04:15:08 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9073.11 via Frontend Transport; Tue, 26 Aug 2025 04:15:08 +0000 Received: from BLRKPRNAYAK.amd.com (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 23:14:48 -0500 From: K Prateek Nayak To: Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Heiko Carstens , "Vasily Gorbik" , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , Peter Zijlstra , Juri Lelli , Vincent Guittot , , , CC: Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , , Li Chen , Bibo Mao , Mete Durlu , Tobias Huschle , "Easwar Hariharan" , Guo Weikang , "Rafael J. Wysocki" , Brian Gerst , Patryk Wlazlyn , Swapnil Sapkal , "Yury Norov [NVIDIA]" , Sudeep Holla , Jonathan Cameron , Andrea Righi , Yicong Yang , Ricardo Neri , Tim Chen , Vinicius Costa Gomes Subject: [PATCH v7 2/8] powerpc/smp: Rename cpu_corgroup_* to cpu_corgrp_* Date: Tue, 26 Aug 2025 04:13:13 +0000 Message-ID: <20250826041319.1284-3-kprateek.nayak@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250826041319.1284-1-kprateek.nayak@amd.com> References: <20250826041319.1284-1-kprateek.nayak@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017090:EE_|LV9PR12MB9784:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d68b88a-b09d-40f6-259a-08dde45724af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AklONSsRI+h4av95ZYJokvgt7L7NYpmEcgZNKzIzhVZT+7A2fFonLJdpop2Z?= =?us-ascii?Q?DWSQlVPEdBYVaNU8mCjxQ8fkz1DXtSTAKHQB74+0+OpzmSsQ2YhCK5LD7fcV?= =?us-ascii?Q?nAueuzjeatgJXe9ze4yT7YWJjKinAjxQ62alTFBWCOZtnveWZaub/x+KZzuZ?= =?us-ascii?Q?hgxm2k13n9VlTNa00CUA9G8yKQo/QF10+iYSWT5ifgk0L3ZSIR+lb+SG9NT9?= =?us-ascii?Q?wVukEW6TkSZK9rlbvfSZjB7pUX7Q6chZ0iUeDG9djx6WzG2evHjv/e5LD8SU?= =?us-ascii?Q?Pw9I9DddUPb3bI6Y731JkvLwoConcbvFA4MRPwqwdU3IQaHHKu84ls8g2+A9?= =?us-ascii?Q?0slbTqEABXVzyRb8HeHSnAFl5GVUA/J18KWXb2Rh3bQ9tllqIHX9JuIPZDI+?= =?us-ascii?Q?zi8uJbNSiBNj3qIdwLF+bfOzRc8Q1ypgp4v674nw8uXTUhpXPguSTYasfItq?= =?us-ascii?Q?YvyXOgRcl7QleEnl2n0IpBurq7ZCsop6DSW7ftUmmFr8OHY7ZSCvOe10GRNf?= =?us-ascii?Q?DJPUGHpEe95L9TQevjN1iUJphlylOPULYzBGM0fnJcGhcU0OB6GOOCgrvpeN?= =?us-ascii?Q?WlazMkSY2IN/UMSmXGsrm8guzW6hLLoCtzcWoskfwfD5jJqHXzfW+AnGyZTa?= =?us-ascii?Q?QDpXFkqekApM/7skcoQdTy253PhGGT0AMrMUQoqYyFUDBXXSTnWrjNFNll54?= =?us-ascii?Q?3BfDWaR4IvM482QYwqvddCyRdXJ/eU3KMRuObBBnEXGNUUAqxHvb03gEXlYr?= =?us-ascii?Q?Mp1shq8TMLCzUaPL30+ivxToACS2/TG4f9jYDCNwhl1Hw5J1rGdlxS9b6EbY?= =?us-ascii?Q?9ibkciAIVSmgfN2S7G6E2c5fQmLbgaoAeGxrf+eleGObvwd01/Ud3PJkBgHl?= =?us-ascii?Q?MBQsM4DAoQXFNDx1s2hVSTNt5+/Wo/Wf+ZRta+NULTVO6RSdHLFpObWnR9qt?= =?us-ascii?Q?0BoAYaTzAMNxtqEccvqsVRmEwjFuiPIES2HwY4mQ4gGLaQSyLFtta6ul7A7R?= =?us-ascii?Q?kfY4MkQ1C2x6Xo3AzvQUbo743Ud6Ej3FcM22zRJmWK5fDLDW3WY6FJc4hNQM?= =?us-ascii?Q?zoBLbnpjQu7VyLXrae5bYUIQc0VxmeNItWqgp1G56Gp5iOxGYsQN0pkctDxA?= =?us-ascii?Q?fPQS1C9vjGPW6TrJPS3t1Csnc81XxoroSyOkHBgb1rUkjnvbkceuM5gvXLMs?= =?us-ascii?Q?P56zDXOWs+jLFgciS6S4HmiovcL+ZNxlcH5yUcOVjJP4HwowAmC7GUv2UCn3?= =?us-ascii?Q?7vNBeWFM7uyyb3oH1fwGwv4iNuaUAGYdIAFg6i27qMTREU3Ieyzz3ZT1mg3q?= =?us-ascii?Q?xZGaVKTNB6s2p74zP+81di0JMiSS4KvgJ4ZsBqmvWKizSB+BrTZdpqHxarwt?= =?us-ascii?Q?N2TZvT7JsADQg9XWxD/8XNolM51HFj6CKAXQadvfJk5HDIeoSvPDM8/Ovgh5?= =?us-ascii?Q?dtp/kTulDJqp8CcEzLHtevSuTRc/s1YcNIdslJRAb9xEOiLTRLKa/kxipm0R?= =?us-ascii?Q?sqKlUpYTIb7SKWrJdES+bCFxGm4he86gVCxKj4JeCOAl/iBnHpTak1i25Q?= =?us-ascii?Q?=3D=3D?= 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)(7416014)(82310400026)(1800799024)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2025 04:15:08.4416 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d68b88a-b09d-40f6-259a-08dde45724af 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV9PR12MB9784 Content-Type: text/plain; charset="utf-8" Rename cpu_corgroup_{map,mask} to cpu_corgrp_{map,mask} to free up the cpu_corgroup_* namespace. cpu_corgroup_mask() will be added back in the subsequent commit for CONFIG_SCHED_MC enablement. No functional changes intended. Signed-off-by: K Prateek Nayak --- arch/powerpc/kernel/smp.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 862f50c09539..4f48262658cc 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -87,7 +87,7 @@ DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map); DEFINE_PER_CPU(cpumask_var_t, cpu_smallcore_map); DEFINE_PER_CPU(cpumask_var_t, cpu_l2_cache_map); DEFINE_PER_CPU(cpumask_var_t, cpu_core_map); -static DEFINE_PER_CPU(cpumask_var_t, cpu_coregroup_map); +static DEFINE_PER_CPU(cpumask_var_t, cpu_corgrp_map); =20 EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); EXPORT_PER_CPU_SYMBOL(cpu_l2_cache_map); @@ -1045,9 +1045,9 @@ static const struct cpumask *tl_smt_mask(struct sched= _domain_topology_level *tl, } #endif =20 -static struct cpumask *cpu_coregroup_mask(int cpu) +static struct cpumask *cpu_corgrp_mask(int cpu) { - return per_cpu(cpu_coregroup_map, cpu); + return per_cpu(cpu_corgrp_map, cpu); } =20 static bool has_coregroup_support(void) @@ -1061,7 +1061,7 @@ static bool has_coregroup_support(void) =20 static const struct cpumask *cpu_mc_mask(struct sched_domain_topology_leve= l *tl, int cpu) { - return cpu_coregroup_mask(cpu); + return cpu_corgrp_mask(cpu); } =20 static const struct cpumask *cpu_pkg_mask(struct sched_domain_topology_lev= el *tl, int cpu) @@ -1124,7 +1124,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) zalloc_cpumask_var_node(&per_cpu(cpu_core_map, cpu), GFP_KERNEL, cpu_to_node(cpu)); if (has_coregroup_support()) - zalloc_cpumask_var_node(&per_cpu(cpu_coregroup_map, cpu), + zalloc_cpumask_var_node(&per_cpu(cpu_corgrp_map, cpu), GFP_KERNEL, cpu_to_node(cpu)); =20 #ifdef CONFIG_NUMA @@ -1145,7 +1145,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) cpumask_set_cpu(boot_cpuid, cpu_core_mask(boot_cpuid)); =20 if (has_coregroup_support()) - cpumask_set_cpu(boot_cpuid, cpu_coregroup_mask(boot_cpuid)); + cpumask_set_cpu(boot_cpuid, cpu_corgrp_mask(boot_cpuid)); =20 init_big_cores(); if (has_big_cores) { @@ -1510,8 +1510,8 @@ static void remove_cpu_from_masks(int cpu) set_cpus_unrelated(cpu, i, cpu_core_mask); =20 if (has_coregroup_support()) { - for_each_cpu(i, cpu_coregroup_mask(cpu)) - set_cpus_unrelated(cpu, i, cpu_coregroup_mask); + for_each_cpu(i, cpu_corgrp_mask(cpu)) + set_cpus_unrelated(cpu, i, cpu_corgrp_mask); } } #endif @@ -1543,7 +1543,7 @@ static void update_coregroup_mask(int cpu, cpumask_va= r_t *mask) if (!*mask) { /* Assume only siblings are part of this CPU's coregroup */ for_each_cpu(i, submask_fn(cpu)) - set_cpus_related(cpu, i, cpu_coregroup_mask); + set_cpus_related(cpu, i, cpu_corgrp_mask); =20 return; } @@ -1551,18 +1551,18 @@ static void update_coregroup_mask(int cpu, cpumask_= var_t *mask) cpumask_and(*mask, cpu_online_mask, cpu_node_mask(cpu)); =20 /* Update coregroup mask with all the CPUs that are part of submask */ - or_cpumasks_related(cpu, cpu, submask_fn, cpu_coregroup_mask); + or_cpumasks_related(cpu, cpu, submask_fn, cpu_corgrp_mask); =20 /* Skip all CPUs already part of coregroup mask */ - cpumask_andnot(*mask, *mask, cpu_coregroup_mask(cpu)); + cpumask_andnot(*mask, *mask, cpu_corgrp_mask(cpu)); =20 for_each_cpu(i, *mask) { /* Skip all CPUs not part of this coregroup */ if (coregroup_id =3D=3D cpu_to_coregroup_id(i)) { - or_cpumasks_related(cpu, i, submask_fn, cpu_coregroup_mask); + or_cpumasks_related(cpu, i, submask_fn, cpu_corgrp_mask); cpumask_andnot(*mask, *mask, submask_fn(i)); } else { - cpumask_andnot(*mask, *mask, cpu_coregroup_mask(i)); + cpumask_andnot(*mask, *mask, cpu_corgrp_mask(i)); } } } --=20 2.34.1