[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <48F852FD.7070108@cn.fujitsu.com>
Date: Fri, 17 Oct 2008 16:55:25 +0800
From: Lai Jiangshan <laijs@...fujitsu.com>
To: Ingo Molnar <mingo@...e.hu>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86/proc: fix /proc/cpuinfo cpu offline bug
In my test, I found that if a cpu has been offline,
the next cpus may not be shown in the /proc/cpuinfo.
trivially reproduce this bug:
1) add these lines in the end of show_cpuinfo()
if (m->size - m->count - 20 > 0)
seq_printf(m, "%*s", (int)(m->size - m->count - 20), "show bug\n");
2) rebuilt kernel & reboot
3) offline cpu#1
4) cat /proc/cpuinfo
cpu#2 and cpu#3 .... cannot be shown in /proc/cpuinfo
Signed-off-by: Lai Jiangshan <laijs@...fujitsu.com>
---
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index a26c480..01b1244 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -160,14 +160,16 @@ static void *c_start(struct seq_file *m, loff_t *pos)
{
if (*pos == 0) /* just in case, cpu 0 is not the first */
*pos = first_cpu(cpu_online_map);
- if ((*pos) < nr_cpu_ids && cpu_online(*pos))
+ else
+ *pos = next_cpu_nr(*pos - 1, cpu_online_map);
+ if ((*pos) < nr_cpu_ids)
return &cpu_data(*pos);
return NULL;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
{
- *pos = next_cpu(*pos, cpu_online_map);
+ (*pos)++;
return c_start(m, pos);
}
--
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