From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
To: <mingo@redhat.com>, <peterz@infradead.org>, <linux-kernel@vger.kernel.org>
CC: <riel@redhat.com>
Subject: [PATCH] sched/numa: Fix NUMA_DIRECT topology identification
Date: Mon, 10 Aug 2015 20:20:48 -0500
Message-ID: <1439256048-3748-1-git-send-email-Aravind.Gopalakrishnan@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2015 01:03:03.6980
 (UTC)
X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1149
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1409
Lines: 47

Systems which have all nodes at a distance of at most
1 hop should be identified as 'NUMA_DIRECT'.

However, the scheduler incorrectly identifies it as
'NUMA_BACKPLANE'. This is because 'n' is assigned to
sched_max_numa_distance but the code (mis)interprets it
to mean 'number of hops'.

Rik had actually used sched_domains_numa_levels for detecting
a 'NUMA_DIRECT' topology-
http://marc.info/?l=linux-kernel&m=141279712429834&w=2

But that was changed when he removed the hops table in the
subsequent version-
http://marc.info/?l=linux-kernel&m=141353106106771&w=2

Fixing the issue here.

Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
---
 kernel/sched/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 655557d..e51739e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6442,8 +6442,10 @@ static void init_numa_topology_type(void)
 
 	n = sched_max_numa_distance;
 
-	if (n <= 1)
+	if (sched_domains_numa_levels <= 1) {
 		sched_numa_topology_type = NUMA_DIRECT;
+		return;
+	}
 
 	for_each_online_node(a) {
 		for_each_online_node(b) {
-- 
2.4.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/