From nobody Fri Oct 3 21:05:03 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2055.outbound.protection.outlook.com [40.107.223.55]) (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 874B71862; Tue, 26 Aug 2025 04:18:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756181893; cv=fail; b=pytdfOmUYPhMFZY2ZXpooqlWZ0ny3K4RkxeQbMZQHAIuv8VY0ZKm7G6amIf0qZls1MNTMpBLmsMixyg5WTH3gRT78s2QTGa2QjiHuFG86JN8M73OCS+ks0q2/IwNo6CbDXSKvFZs+DRU9QdoLIeJsmxlvJ5gVLx+CnOGhEvERf4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756181893; c=relaxed/simple; bh=HFkmFZEvxNZLvM8FsFGastNphFN88iZpvXNX5urtHlE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nCsnj58e8zUmQv5mNbVK4uvsn2Hq2DqPJVcoYqjcIOyfntRfYg7u5ooOvUwxtsPxsRmjtCkiARUT5iBqlTSXs7N13kO9YPqAEybFbKeSNA9MqchkXHRJw9XaVuv+ZAhJEgoy4CX/5j01M0Dh7Xi4k+V36GFYcaYwltvjRyutNM4= 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=hG6tyzxY; arc=fail smtp.client-ip=40.107.223.55 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="hG6tyzxY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cmRhKW7vSQQeMAqU4Su7YQhd+QgaSsWp6/y6+dvkDbmAjXplKQlKNNo9mYrM0Zq2p+OlhAQTwuZLEIou18TEXlgk1jmAjt5u/wQ3sJSjeTj7gnhNLSq0y1X11lsL0TL+RmwB0w4nmTkM9Agx2Vb0IOHbCDwnTIwvok3anD3bX6S8latDgYtyORvkp7mkW1JBi2zin7PDyGgG4QdOBgFl2X3VAlj0LxHuKIM1/6qBQhejzREaxhcyvCJebjAGwIjNB3mRi5p6NoepSoLiNgG1vHc2nspiuIr8GnetAHblN1fxARmZ6IqBKxiL0hqS5NheBuTb+FMtGrdwv1Gc6424UA== 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=Trrev8dOAXH9haOFCq1Q86Fg7QNBF/bvlm/NED7IrNQ=; b=t4tKyaLAClwJeeHn+o0ii+4+GDJVflq4aXkNid5RtlFiTXRmJL9SIGW3TPCKMP8o9GfLzRGBCqi2lJ7cGvRU06AhazRvUV1IQrgLZTION1LR5qqtpwj63Yr3KcAYI2PCdbCdQ/0GpVllR4Cl61O3lQkUymsOOjUBVYZevc/p4L72VeEOtTwxbq8nyQNcYeBLMLUKF6RL+0LF8m6p9M34x0yPx0lg3GOGmUp3rrhjhFxGNzzOOT5J+hHMwLpQwOrK9HC8hf/tp1VSTfmpm4d80UYKLTwb0kJvelUkWfRr0T7PhMHnZNlkfvgLHjN6u7cQYZEX27/aCMUt+MNhrMNGSA== 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=Trrev8dOAXH9haOFCq1Q86Fg7QNBF/bvlm/NED7IrNQ=; b=hG6tyzxYbNoXRGogDfDkWdXl56PEGMLvkK/NqZ+FG4yWZEoeEb64IBVYzpNJ9I6vLv4eeNB1UIUIGqy65cLwZdiyVtuIAnvMlV6642kSoqA2IuDCuqRJ0WJKmq6Uz7rrBmyb3Jv6U+OHYuNVAJBKVALTjKw/sBn6A16RuW50ZK4= Received: from SN7PR04CA0090.namprd04.prod.outlook.com (2603:10b6:806:121::35) by CY5PR12MB6383.namprd12.prod.outlook.com (2603:10b6:930:3d::12) 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:18:07 +0000 Received: from SA2PEPF00003AE7.namprd02.prod.outlook.com (2603:10b6:806:121:cafe::b5) by SN7PR04CA0090.outlook.office365.com (2603:10b6:806:121::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.21 via Frontend Transport; Tue, 26 Aug 2025 04:18:07 +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 SA2PEPF00003AE7.mail.protection.outlook.com (10.167.248.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Tue, 26 Aug 2025 04:18:07 +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:17:49 -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 8/8] sched/topology: Unify tl_pkg_mask() across core and all arch Date: Tue, 26 Aug 2025 04:13:19 +0000 Message-ID: <20250826041319.1284-9-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: SA2PEPF00003AE7:EE_|CY5PR12MB6383:EE_ X-MS-Office365-Filtering-Correlation-Id: 9cf9574b-495b-4c2d-1197-08dde4578f92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|7416014|36860700013|921020; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?B3gNa4l8fQ8A2pHWg75ACnMIeYE0RJ8cveFPqmSRT2HozhpCh2hQCecqYNQ+?= =?us-ascii?Q?d47IR8e8GYgPhS33ZqGDswuM7VLxLQOFVBfHYMbgRwDGPmJKGuxra12yFbXm?= =?us-ascii?Q?dgbdepYWl2Cny+fM2JpZjhixkvhf0ImRH3F2tlm9iZtIG1IlZE37IIB8kNK2?= =?us-ascii?Q?ajgXpikrzJOlfZqfiFndIf7PA1fUosVy0pqPRsj0OHzuNVQtMi35ewNmv+q1?= =?us-ascii?Q?X95fcp7ul0qQSSoY4IZugpyH5Xvhm0Er1tI2sr69simBHHLcNWPPWdFTMv8g?= =?us-ascii?Q?ZGkbZsjoXHF6cRnhDhyRVSBHa8T3vaxn5yicUbP8Z6qCEZjjrJ1EA+cOOyYw?= =?us-ascii?Q?5GhLGacwqMHuLUuipTpAU0W1fWOJHtaxNq2zs+FDtwMjVKTGYxbxeIj9ZiX1?= =?us-ascii?Q?jpfJlD4gxwVQp2II3+9i6yDQgOd14fc+Vo8NJmtmaYQ5WToURoOIAf+2Jdtl?= =?us-ascii?Q?80eG6HMUivE0RIYCwotYPvl8Jh6mbNuL+wGdZDXhFCLVIW1thUkWwTo7TtJH?= =?us-ascii?Q?OUitqG2fnIkW6UXHpHQnE8pQhx93ITjdvFqL8fZ8y8dJJNqVyUjHEmTIBOKZ?= =?us-ascii?Q?GsEcbPxDGeoDY4UoaYb3ZnfZk0UwY3ew0xtgTCUvdEFSjCeQBzqzt/dUFKXM?= =?us-ascii?Q?jokkiHl4oPVqTOqGeccgcfkZOkxzE+HImDN86a2PjeE69e8Nfciq76EgTDkj?= =?us-ascii?Q?Jz0D9A5TqzmqWoFY6YdWzFfi/WLJMgTny0GjLCeAEbIoXpKkQPP9h65QN8NY?= =?us-ascii?Q?vKkJPCQPuM0GNpaa8etmcdAl9nqNIz2302jZtbJ8TE5Ye7Ar5XsCXNRYHxhM?= =?us-ascii?Q?3y3Mfq+SsuWeocFJJ6QlzQ5pPDKG1j2paeNfglz+MaGlyfE4y8+lM82pdj5F?= =?us-ascii?Q?VGrSjaq5BpmyXxSSiQNtEo2FNLlPqBH001Fq8foHuHcvmSPzC0kJWaupqtzE?= =?us-ascii?Q?UsBHTTcEPVJPhlOV5dpdBCZhvx/TNWFz+DB35UcXmvUsOcYOanGLpQGls7HE?= =?us-ascii?Q?Z/eiWzCdEjJa5n+XMd5sJtZ2Lz/hu7zY0P6iXGP3ZZIRyXYmvwDcn07nkJ/c?= =?us-ascii?Q?U+Lgh1OWmNXSLrjpCjraYWnMFFg6S+Nl1bLtqcRqJkPHq7mOBCCZwwGUPd/e?= =?us-ascii?Q?nn4LvGM1aErPwoL5askZQbgszfub0MOd8i99cGqnB+jto74OzzjuRqpTq5FG?= =?us-ascii?Q?gbsGlYUAvU6qE58Xm3aZQGcxoi06xL4C5bKLj5sSc4vux/YY++9tixuR+bjm?= =?us-ascii?Q?XNE4ZjpoUPdFv76bxCIutaaocYDEx+yf/CcEu4PaDXdhKJp2h6EzJnES7Fl/?= =?us-ascii?Q?VX5WRM3tYTodB6eWkhdZNYd43ilT57rp3cGH7LysZTO+aXbisOGNdx2Ugrwo?= =?us-ascii?Q?6LC3lDCcuGSbhUl+tst8BB5W6O3jRIGBT1USlLiYGHAE5/m+2mu7cN0plpon?= =?us-ascii?Q?OfmJ4BLuUlMoqX1U+Iz/fFLwu+ptCF5V7RbYgQQWgOpZAj3U7WVgG3AL7T49?= =?us-ascii?Q?mc6YcJC2X5mokL6E8Wrv9gR+7ruyTDfOCCnjBrCDw0bBkftgn4E/NFl8ig?= =?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)(82310400026)(1800799024)(376014)(7416014)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2025 04:18:07.7834 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9cf9574b-495b-4c2d-1197-08dde4578f92 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: SA2PEPF00003AE7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6383 Content-Type: text/plain; charset="utf-8" Unify the tl_pkg_mask() wrapper around cpu_nod_mask() across core, x86, powerpc, and s390. No functional changes intended. Signed-off-by: K Prateek Nayak --- arch/powerpc/kernel/smp.c | 7 +------ arch/s390/kernel/topology.c | 7 +------ arch/x86/kernel/smpboot.c | 5 ----- include/linux/sched/topology.h | 6 ++++++ kernel/sched/topology.c | 5 ----- 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index 40719679385b..8e869c13f7ed 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1064,11 +1064,6 @@ const struct cpumask *cpu_coregroup_mask(int cpu) } #endif =20 -static const struct cpumask *cpu_pkg_mask(struct sched_domain_topology_lev= el *tl, int cpu) -{ - return cpu_node_mask(cpu); -} - static int __init init_big_cores(void) { int cpu; @@ -1728,7 +1723,7 @@ static void __init build_sched_topology(void) } #endif =20 - powerpc_topology[i++] =3D SDTL_INIT(cpu_pkg_mask, powerpc_shared_proc_fla= gs, PKG); + powerpc_topology[i++] =3D SDTL_INIT(tl_pkg_mask, powerpc_shared_proc_flag= s, PKG); =20 /* There must be one trailing NULL entry left. */ BUG_ON(i >=3D ARRAY_SIZE(powerpc_topology) - 1); diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 8dbf32f362e1..8f5b6ecc055f 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -524,17 +524,12 @@ static const struct cpumask *cpu_drawer_mask(struct s= ched_domain_topology_level return &cpu_topology[cpu].drawer_mask; } =20 -static const struct cpumask *cpu_pkg_mask(struct sched_domain_topology_lev= el *tl, int cpu) -{ - return cpu_node_mask(cpu); -} - static struct sched_domain_topology_level s390_topology[] =3D { SDTL_INIT(tl_smt_mask, cpu_smt_flags, SMT), SDTL_INIT(tl_mc_mask, cpu_core_flags, MC), SDTL_INIT(cpu_book_mask, NULL, BOOK), SDTL_INIT(cpu_drawer_mask, NULL, DRAWER), - SDTL_INIT(cpu_pkg_mask, NULL, PKG), + SDTL_INIT(tl_pkg_mask, NULL, PKG), { NULL, }, }; =20 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index bfbcac9a73d1..6c0ab30a80e2 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -472,11 +472,6 @@ static int x86_cluster_flags(void) } #endif =20 -static const struct cpumask *tl_pkg_mask(struct sched_domain_topology_leve= l *tl, int cpu) -{ - return cpu_node_mask(cpu); -} - /* * Set if a package/die has multiple NUMA nodes inside. * AMD Magny-Cours, Intel Cluster-on-Die, and Intel diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 075d1f063668..807603bfe8ff 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -71,6 +71,12 @@ struct cpumask *tl_mc_mask(struct sched_domain_topology_= level *tl, int cpu) } #endif /* CONFIG_SCHED_MC */ =20 +static const __maybe_unused +struct cpumask *tl_pkg_mask(struct sched_domain_topology_level *tl, int cp= u) +{ + return cpu_node_mask(cpu); +} + #ifdef CONFIG_NUMA static inline int cpu_numa_flags(void) { diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 77d14430c5e1..18889bd97e22 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1724,11 +1724,6 @@ sd_init(struct sched_domain_topology_level *tl, return sd; } =20 -static const struct cpumask *tl_pkg_mask(struct sched_domain_topology_leve= l *tl, int cpu) -{ - return cpu_node_mask(cpu); -} - /* * Topology list, bottom-up. */ --=20 2.34.1