From nobody Wed Sep 10 07:39:30 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 C61F625D53B for ; Fri, 5 Sep 2025 18:29:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757096971; cv=none; b=GCWpuQQ9Cs/zcre773BZFny73wS7qXeAHslIdUoiXbZXcehc3AEGEYFZ9+M0I5T9xKCqGWkBMVvtqQgI+dQUxdGs+2GPpAxN2jY/g3RI4RFv+Ys2QCQPprmLySN8QiO2xCTmswwNp03hz1tHl/g/13IJFrHP64hh11QF7hpMvLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757096971; c=relaxed/simple; bh=m0GApZ753vDcb1N3dB7lnR0LUIY16x0Gy+Az6MMeGkE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jLGTRhXwt0pKOt4uQrOnLC+ImPb+LmuFBFHfNKq+KR0/Q38AWuI1uP2672nVE7J2s61m+Q8jzd4XkMFAzVCWLGjquT8ntS2ZzOOqN4BUJdSkIe8e6T2X1HP5ayALAfVXGZ9dfrM/6yAuudGtHPAXzZnB3R0JXzRlr+JOWJSHb8U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=P0lzMVFE; arc=none smtp.client-ip=192.198.163.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="P0lzMVFE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1757096969; x=1788632969; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m0GApZ753vDcb1N3dB7lnR0LUIY16x0Gy+Az6MMeGkE=; b=P0lzMVFEC1kMJI03SaZj2T9Y1VZPce0WViG8+BjnY971AiPnA6iD7+eL awZbJnfp+fpIWAa3q9B4I+CPlwcGFTLRRsQJyC5ZX/RQP7c3aJokqrHXO Cb42+oVt4TLhhxTWZ2LEQ/9/bF5kyMx5hmV9MsM63AFpAIeKXTyj/ulVG xqrYdc//HL7LTZx55Lbdhpxtv8CaB/Siq4jM/sojGdeW9Zq/OHtEr09qq Nk4a3bXe4Xb7TTioRexhQunu4O5AfZxbOCizSd1FO3JMLzNelnpG1oFXb 2Bmvb4lEa44wHX1IexdqdSnfZGoPvZPKQ4uSMgKam/7x+rvay3jnQPQtS w==; X-CSE-ConnectionGUID: JHs9JU55TouWU1BVf9jtlw== X-CSE-MsgGUID: GtdK80vIQ9edwNt4gGImWQ== X-IronPort-AV: E=McAfee;i="6800,10657,11544"; a="63281079" X-IronPort-AV: E=Sophos;i="6.18,242,1751266800"; d="scan'208";a="63281079" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2025 11:29:29 -0700 X-CSE-ConnectionGUID: sp9jsVwNRlu3RuHpmZXbGg== X-CSE-MsgGUID: VacXK4uAQFmRpYE7gpsiPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,242,1751266800"; d="scan'208";a="177456541" Received: from b04f130c83f2.jf.intel.com ([10.165.154.98]) by orviesa005.jf.intel.com with ESMTP; 05 Sep 2025 11:29:29 -0700 From: Tim Chen To: Peter Zijlstra , Ingo Molnar Cc: Tim Chen , Juri Lelli , Dietmar Eggemann , Ben Segall , Mel Gorman , Valentin Schneider , Tim Chen , Vincent Guittot , Libo Chen , Abel Wu , Len Brown , linux-kernel@vger.kernel.org, Chen Yu , K Prateek Nayak , "Gautham R . Shenoy" , Zhao Liu , Vinicius Costa Gomes , Arjan Van De Ven Subject: [PATCH v2 1/2] sched: Create architecture specific sched domain distances Date: Fri, 5 Sep 2025 11:36:24 -0700 Message-Id: <61a6adbb845c148361101e16737307c8aa7ee362.1757097030.git.tim.c.chen@linux.intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: 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 Content-Type: text/plain; charset="utf-8" Allow architecture specific sched domain NUMA distances that can be modified from NUMA node distances for the purpose of building NUMA sched domains. The actual NUMA distances are kept separately. This allows for NUMA domain levels modification when building sched domains for specific architectures. Consolidate the recording of unique NUMA distances in an array to sched_record_numa_dist() so the function can be reused to record NUMA distances when the NUMA distance metric is changed. No functional change if there's no arch specific NUMA distances are being defined. Co-developed-by: Vinicius Costa Gomes Signed-off-by: Tim Chen --- include/linux/sched/topology.h | 2 + kernel/sched/topology.c | 118 ++++++++++++++++++++++++++++----- 2 files changed, 103 insertions(+), 17 deletions(-) diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 5263746b63e8..4f58e78ca52e 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -59,6 +59,8 @@ static inline int cpu_numa_flags(void) #endif =20 extern int arch_asym_cpu_priority(int cpu); +extern int arch_sched_node_distance(int from, int to); +extern int sched_avg_remote_numa_distance; =20 struct sched_domain_attr { int relax_domain_level; diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 977e133bb8a4..1f08dfef2ea5 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1591,10 +1591,13 @@ static void claim_allocations(int cpu, struct sched= _domain *sd) enum numa_topology_type sched_numa_topology_type; =20 static int sched_domains_numa_levels; +static int sched_numa_node_levels; static int sched_domains_curr_level; =20 int sched_max_numa_distance; +int sched_avg_remote_numa_distance; static int *sched_domains_numa_distance; +static int *sched_numa_node_distance; static struct cpumask ***sched_domains_numa_masks; #endif /* CONFIG_NUMA */ =20 @@ -1808,10 +1811,10 @@ bool find_numa_distance(int distance) return true; =20 rcu_read_lock(); - distances =3D rcu_dereference(sched_domains_numa_distance); + distances =3D rcu_dereference(sched_numa_node_distance); if (!distances) goto unlock; - for (i =3D 0; i < sched_domains_numa_levels; i++) { + for (i =3D 0; i < sched_numa_node_levels; i++) { if (distances[i] =3D=3D distance) { found =3D true; break; @@ -1887,14 +1890,29 @@ static void init_numa_topology_type(int offline_nod= e) =20 #define NR_DISTANCE_VALUES (1 << DISTANCE_BITS) =20 -void sched_init_numa(int offline_node) +/* + * Architecture could simplify NUMA distance, to avoid + * creating too many NUMA levels. + */ +int __weak arch_sched_node_distance(int from, int to) +{ + return node_distance(from, to); +} + +static int numa_node_dist(int i, int j) +{ + return node_distance(i, j); +} + +static int sched_record_numa_dist(int offline_node, int (*n_dist)(int, int= ), + int **dist, int *maximum_dist, int *levels) + { - struct sched_domain_topology_level *tl; unsigned long *distance_map; int nr_levels =3D 0; int i, j; int *distances; - struct cpumask ***masks; + int max_dist =3D 0; =20 /* * O(nr_nodes^2) de-duplicating selection sort -- in order to find the @@ -1902,17 +1920,20 @@ void sched_init_numa(int offline_node) */ distance_map =3D bitmap_alloc(NR_DISTANCE_VALUES, GFP_KERNEL); if (!distance_map) - return; + return -ENOMEM; =20 bitmap_zero(distance_map, NR_DISTANCE_VALUES); for_each_cpu_node_but(i, offline_node) { for_each_cpu_node_but(j, offline_node) { - int distance =3D node_distance(i, j); + int distance =3D n_dist(i, j); + + if (distance > max_dist) + max_dist =3D distance; =20 if (distance < LOCAL_DISTANCE || distance >=3D NR_DISTANCE_VALUES) { sched_numa_warn("Invalid distance value range"); bitmap_free(distance_map); - return; + return -EINVAL; } =20 bitmap_set(distance_map, distance, 1); @@ -1927,17 +1948,70 @@ void sched_init_numa(int offline_node) distances =3D kcalloc(nr_levels, sizeof(int), GFP_KERNEL); if (!distances) { bitmap_free(distance_map); - return; + return -ENOMEM; } - for (i =3D 0, j =3D 0; i < nr_levels; i++, j++) { j =3D find_next_bit(distance_map, NR_DISTANCE_VALUES, j); distances[i] =3D j; } - rcu_assign_pointer(sched_domains_numa_distance, distances); + *dist =3D distances; + if (levels) + *levels =3D nr_levels; + + if (maximum_dist) + *maximum_dist =3D max_dist; =20 bitmap_free(distance_map); =20 + return 0; +} + +static int avg_remote_numa_distance(int offline_node) +{ + int i, j; + int distance, nr_remote =3D 0, total_distance =3D 0; + + for_each_cpu_node_but(i, offline_node) { + for_each_cpu_node_but(j, offline_node) { + distance =3D node_distance(i, j); + + if (distance >=3D REMOTE_DISTANCE) { + nr_remote++; + total_distance +=3D distance; + } + } + } + if (nr_remote) + return total_distance / nr_remote; + else + return REMOTE_DISTANCE; +} + +void sched_init_numa(int offline_node) +{ + struct sched_domain_topology_level *tl; + int nr_levels, nr_node_levels; + int i, j; + int *distances, *domain_distances; + int max_dist; + struct cpumask ***masks; + + if (sched_record_numa_dist(offline_node, numa_node_dist, &distances, + &max_dist, &nr_node_levels)) + return; + + WRITE_ONCE(sched_avg_remote_numa_distance, + avg_remote_numa_distance(offline_node)); + + if (sched_record_numa_dist(offline_node, + arch_sched_node_distance, &domain_distances, + NULL, &nr_levels)) { + kfree(distances); + return; + } + rcu_assign_pointer(sched_numa_node_distance, distances); + WRITE_ONCE(sched_numa_node_levels, nr_node_levels); + /* * 'nr_levels' contains the number of unique distances * @@ -1954,6 +2028,8 @@ void sched_init_numa(int offline_node) * * We reset it to 'nr_levels' at the end of this function. */ + rcu_assign_pointer(sched_domains_numa_distance, domain_distances); + sched_domains_numa_levels =3D 0; =20 masks =3D kzalloc(sizeof(void *) * nr_levels, GFP_KERNEL); @@ -1979,10 +2055,13 @@ void sched_init_numa(int offline_node) masks[i][j] =3D mask; =20 for_each_cpu_node_but(k, offline_node) { - if (sched_debug() && (node_distance(j, k) !=3D node_distance(k, j))) + if (sched_debug() && + (arch_sched_node_distance(j, k) !=3D + arch_sched_node_distance(k, j))) sched_numa_warn("Node-distance not symmetric"); =20 - if (node_distance(j, k) > sched_domains_numa_distance[i]) + if (arch_sched_node_distance(j, k) > + sched_domains_numa_distance[i]) continue; =20 cpumask_or(mask, mask, cpumask_of_node(k)); @@ -2022,7 +2101,7 @@ void sched_init_numa(int offline_node) sched_domain_topology =3D tl; =20 sched_domains_numa_levels =3D nr_levels; - WRITE_ONCE(sched_max_numa_distance, sched_domains_numa_distance[nr_levels= - 1]); + WRITE_ONCE(sched_max_numa_distance, max_dist); =20 init_numa_topology_type(offline_node); } @@ -2030,14 +2109,18 @@ void sched_init_numa(int offline_node) =20 static void sched_reset_numa(void) { - int nr_levels, *distances; + int nr_levels, *distances, *dom_distances; struct cpumask ***masks; =20 nr_levels =3D sched_domains_numa_levels; + sched_numa_node_levels =3D 0; sched_domains_numa_levels =3D 0; sched_max_numa_distance =3D 0; + sched_avg_remote_numa_distance =3D 0; sched_numa_topology_type =3D NUMA_DIRECT; - distances =3D sched_domains_numa_distance; + distances =3D sched_numa_node_distance; + dom_distances =3D sched_domains_numa_distance; + rcu_assign_pointer(sched_numa_node_distance, NULL); rcu_assign_pointer(sched_domains_numa_distance, NULL); masks =3D sched_domains_numa_masks; rcu_assign_pointer(sched_domains_numa_masks, NULL); @@ -2054,6 +2137,7 @@ static void sched_reset_numa(void) kfree(masks[i]); } kfree(masks); + kfree(dom_distances); } if (sched_domain_topology_saved) { kfree(sched_domain_topology); @@ -2092,7 +2176,7 @@ void sched_domains_numa_masks_set(unsigned int cpu) continue; =20 /* Set ourselves in the remote node's masks */ - if (node_distance(j, node) <=3D sched_domains_numa_distance[i]) + if (arch_sched_node_distance(j, node) <=3D sched_domains_numa_distance[= i]) cpumask_set_cpu(cpu, sched_domains_numa_masks[i][j]); } } --=20 2.32.0