Message ID | 1533920419-17410-1-git-send-email-srikar@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Rejected |
Headers | show |
Series | [1/2] sched/topology: Set correct numa topology type | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
* Srikar Dronamraju <srikar@linux.vnet.ibm.com> [2018-08-10 22:30:18]: > With commit 051f3ca02e46 ("sched/topology: Introduce NUMA identity node > sched domain") scheduler introduces an new numa level. However this > leads to numa topology on 2 node systems no more marked as NUMA_DIRECT. > After this commit, it gets reported as NUMA_BACKPLANE. This is because > sched_domains_numa_level is now 2 on 2 node systems. > > Fix this by allowing setting systems that have upto 2 numa levels as > NUMA_DIRECT. > > While here remove a code that assumes level can be 0. > > Fixes: 051f3ca02e46 "Introduce NUMA identity node sched domain" > Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> > --- Hey Peter, Did you look at these two patches?
On Tue, Aug 21, 2018 at 04:02:58AM -0700, Srikar Dronamraju wrote: > * Srikar Dronamraju <srikar@linux.vnet.ibm.com> [2018-08-10 22:30:18]: > > > With commit 051f3ca02e46 ("sched/topology: Introduce NUMA identity node > > sched domain") scheduler introduces an new numa level. However this > > leads to numa topology on 2 node systems no more marked as NUMA_DIRECT. > > After this commit, it gets reported as NUMA_BACKPLANE. This is because > > sched_domains_numa_level is now 2 on 2 node systems. > > > > Fix this by allowing setting systems that have upto 2 numa levels as > > NUMA_DIRECT. > > > > While here remove a code that assumes level can be 0. > > > > Fixes: 051f3ca02e46 "Introduce NUMA identity node sched domain" > > Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> > > --- > > Hey Peter, > > Did you look at these two patches? Nope, been on holidays and the inbox is an even bigger mess than normal. I'll get to it, eventually :/
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index a6e6b855ba81..cec3ee3ed320 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1315,7 +1315,7 @@ static void init_numa_topology_type(void) n = sched_max_numa_distance; - if (sched_domains_numa_levels <= 1) { + if (sched_domains_numa_levels <= 2) { sched_numa_topology_type = NUMA_DIRECT; return; } @@ -1400,9 +1400,6 @@ void sched_init_numa(void) break; } - if (!level) - return; - /* * 'level' contains the number of unique distances *
With commit 051f3ca02e46 ("sched/topology: Introduce NUMA identity node sched domain") scheduler introduces an new numa level. However this leads to numa topology on 2 node systems no more marked as NUMA_DIRECT. After this commit, it gets reported as NUMA_BACKPLANE. This is because sched_domains_numa_level is now 2 on 2 node systems. Fix this by allowing setting systems that have upto 2 numa levels as NUMA_DIRECT. While here remove a code that assumes level can be 0. Fixes: 051f3ca02e46 "Introduce NUMA identity node sched domain" Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> --- kernel/sched/topology.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)