Re: [patch 0/4] CPU Hotplug support for X86_64

Shaohua Li
2005-05-24T10:52:21Z

On Tue, 2005-05-24 at 01:11 -0700, Ashok Raj wrote:
> TBD:
>
> 1. Track down CONFIG_SCHED_SMT Oops with both cpu up/down.
> 2. Test on real NUMA hw.
>
With below patch, cpu hotplug works with SCHED_SMT enabled in my test.
set_cpu_sibling_map is invoked before cpu is set to online.

Thanks,
Shaohua

--- a/arch/x86_64/kernel/smpboot.c.orig 2005-05-24 16:47:57.000000000 +0800
+++ b/arch/x86_64/kernel/smpboot.c 2005-05-24 16:48:31.000000000 +0800
@@ -443,7 +443,7 @@ set_cpu_sibling_map(int cpu)
int i;

if (smp_num_siblings > 1) {
- for_each_online_cpu(i) {
+ for (i = 0; i < NR_CPUS; i++) {
if (cpu_core_id[cpu] == cpu_core_id[i]) {
cpu_set(i, cpu_sibling_map[cpu]);
cpu_set(cpu, cpu_sibling_map[i]);
@@ -454,7 +454,7 @@ set_cpu_sibling_map(int cpu)
}

if (current_cpu_data.x86_num_cores > 1) {
- for_each_online_cpu(i) {
+ for (i = 0; i < NR_CPUS; i++) {
if (phys_proc_id[cpu] == phys_proc_id[i]) {
cpu_set(i, cpu_core_map[cpu]);
cpu_set(cpu, cpu_core_map[i]);