[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9223081f54e3dc5045fe41a475165d9003c9a779@git.kernel.org>
Date: Thu, 18 Nov 2010 14:07:20 GMT
From: tip-bot for Yinghai Lu <yinghai@...nel.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, torvalds@...ux-foundation.org,
shaohua.li@...el.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/urgent] x86: Use online node real index in calulate_tbl_offset()
Commit-ID: 9223081f54e3dc5045fe41a475165d9003c9a779
Gitweb: http://git.kernel.org/tip/9223081f54e3dc5045fe41a475165d9003c9a779
Author: Yinghai Lu <yinghai@...nel.org>
AuthorDate: Sat, 13 Nov 2010 10:52:09 -0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 18 Nov 2010 10:10:50 +0100
x86: Use online node real index in calulate_tbl_offset()
Found a NUMA system that doesn't have RAM installed at the first
socket which hangs while executing init scripts.
bisected it to:
| commit 932967202182743c01a2eee4bdfa2c42697bc586
| Author: Shaohua Li <shaohua.li@...el.com>
| Date: Wed Oct 20 11:07:03 2010 +0800
|
| x86: Spread tlb flush vector between nodes
It turns out when first socket is not online it could have cpus on
node1 tlb_offset set to bigger than NUM_INVALIDATE_TLB_VECTORS.
That could affect systems like 4 sockets, but socket 2 doesn't
have installed, sockets 3 will get too big tlb_offset.
Need to use real online node idx.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Acked-by: Shaohua Li <shaohua.li@...el.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
LKML-Reference: <4CDEDE59.40603@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/mm/tlb.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 12cdbb1..6acc724 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -223,7 +223,7 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
static void __cpuinit calculate_tlb_offset(void)
{
- int cpu, node, nr_node_vecs;
+ int cpu, node, nr_node_vecs, idx = 0;
/*
* we are changing tlb_vector_offset for each CPU in runtime, but this
* will not cause inconsistency, as the write is atomic under X86. we
@@ -239,7 +239,7 @@ static void __cpuinit calculate_tlb_offset(void)
nr_node_vecs = NUM_INVALIDATE_TLB_VECTORS/nr_online_nodes;
for_each_online_node(node) {
- int node_offset = (node % NUM_INVALIDATE_TLB_VECTORS) *
+ int node_offset = (idx % NUM_INVALIDATE_TLB_VECTORS) *
nr_node_vecs;
int cpu_offset = 0;
for_each_cpu(cpu, cpumask_of_node(node)) {
@@ -248,6 +248,7 @@ static void __cpuinit calculate_tlb_offset(void)
cpu_offset++;
cpu_offset = cpu_offset % nr_node_vecs;
}
+ idx++;
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists