Skip to contentSkip to conversation

x86,cpu-hotplug: assign same CPU number to readded CPU

PATCH Superseded Yasuaki Ishimatsu 3 participants 5 messages Jul 10, 2014 – Jul 15, 2014 x86

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86,cpu-hotplug: assign same CPU number to readded CPU

llc_shared_map is not cleared even if CPU is offline or hot removed. So when hot-plugging CPU and assigning new CPU number to hot-added CPU, the mask has wrong value. The mask is used by CSF schduler to create sched_domain. So it breaks CFS scheduler.

Here is a example on my system.
My system has 4 sockets and each socket has 15 cores and HT is enabled. In this case, each core of sockes is numbered as follows:

         | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-44, 90-104
Socket#3 | 45-59, 105-119

Then llc_shared_mask of CPU#30 has 0x3fff80000001fffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-44 and 90-104.

When hot-removing socket#2 and #3, each core of sockets is numbered as follows:

         | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89

But llc_shared_mask is not cleared. So llc_shared_mask of CPU#30 remains having 0x3fff80000001fffc0000000.

After that, when hot-adding socket#2 and #3, each core of sockets is numbered as follows:

         | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-59
Socket#3 | 90-119

Then llc_shared_mask of CPU#30 becomes 0x3fff8000fffffffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-59 and 90-104. So the mask has wrong value.

At first, I cleared hot-removed CPU number's bit from llc_shared_map when hot removing CPU. But Borislav suggested that the problem will disappear if readded CPU is assigned same CPU number. And llc_shared_map must not be changed.

So the patch assigns same CPU number to readded CPU by linking CPU number to APIC ID. And by the patch, the problem disappers.

---
 arch/x86/kernel/apic/apic.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +31 -1
index ad28db7..1cc715b 100644
@@ -220,6 +220,22 @@ static void apic_pm_activate(void);
 static unsigned long apic_phys;
 
 /*
+ * Bind ACPI ID to CPU ID
+ * CPU ID to APIC ID does not change by this array even if CPU is
+ * hotplugged. So don't clear the array even if CPU is hot-removed
+ */
+static int apicid_to_cpuid[MAX_LOCAL_APIC] = {
+	[0 ... MAX_LOCAL_APIC-1] = -1,
+};
+
+/*
+ * Represent CPU ID bound to APIC
+ * Don't clear a bit even if CPU is hot-removed
+ */
+static DECLARE_BITMAP(cpu_used_bits, CONFIG_NR_CPUS);
+static struct cpumask *const cpu_used_mask = to_cpumask(cpu_used_bits);
+
+/*
  * Get the LAPIC version
  */
 static inline int lapic_get_version(void)
@@ -2122,6 +2138,17 @@ void disconnect_bsp_APIC(int virt_wire_setup)
 	apic_write(APIC_LVT1, value);
 }
 
+static int get_cpuid(int apicid)
+{
+	int cpuid;
+
+	cpuid = apicid_to_cpuid[apicid];
+	if (cpuid < 0)
+		cpuid = cpumask_next_zero(-1, cpu_used_mask);
+
+	return cpuid;
+}
+
 int generic_processor_info(int apicid, int version)
 {
 	int cpu, max = nr_cpu_ids;
@@ -2199,7 +2226,9 @@ int generic_processor_info(int apicid, int version)
 		 */
 		cpu = 0;
 	} else
-		cpu = cpumask_next_zero(-1, cpu_present_mask);
+		cpu = get_cpuid(apicid);
+
+	apicid_to_cpuid[apicid] = cpu;
 
 	/*
 	 * Validate version
@@ -2228,6 +2257,7 @@ int generic_processor_info(int apicid, int version)
 	early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
 		apic->x86_32_early_logical_apicid(cpu);
 #endif
+	cpumask_set_cpu(cpu, cpu_used_mask);
 	set_cpu_possible(cpu, true);
 	set_cpu_present(cpu, true);
 
#1 lore raw
Quoted 84 lines · On Thu, 10 Jul 2014 17:41:50 +0900 Yasuaki Ishimatsu…

llc_shared_map is not cleared even if CPU is offline or hot removed. So when hot-plugging CPU and assigning new CPU number to hot-added CPU, the mask has wrong value. The mask is used by CSF schduler to create sched_domain. So it breaks CFS scheduler.

Here is a example on my system.
My system has 4 sockets and each socket has 15 cores and HT is enabled. In this case, each core of sockes is numbered as follows:

          | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-44, 90-104
Socket#3 | 45-59, 105-119

Then llc_shared_mask of CPU#30 has 0x3fff80000001fffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-44 and 90-104.

When hot-removing socket#2 and #3, each core of sockets is numbered as follows:

          | CPU#

Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89

But llc_shared_mask is not cleared. So llc_shared_mask of CPU#30 remains having 0x3fff80000001fffc0000000.

After that, when hot-adding socket#2 and #3, each core of sockets is numbered as follows:

          | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-59
Socket#3 | 90-119

Then llc_shared_mask of CPU#30 becomes 0x3fff8000fffffffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-59 and 90-104. So the mask has wrong value.

At first, I cleared hot-removed CPU number's bit from llc_shared_map when hot removing CPU. But Borislav suggested that the problem will disappear if readded CPU is assigned same CPU number. And llc_shared_map must not be changed.

So the patch assigns same CPU number to readded CPU by linking CPU number to APIC ID. And by the patch, the problem disappers.

---
  arch/x86/kernel/apic/apic.c | 32 +++++++++++++++++++++++++++++++-
  1 file changed, 31 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +16 -0
index ad28db7..1cc715b 100644
@@ -220,6 +220,22 @@ static void apic_pm_activate(void);
  static unsigned long apic_phys;
 
  /*
+ * Bind ACPI ID to CPU ID
+ * CPU ID to APIC ID does not change by this array even if CPU is
+ * hotplugged. So don't clear the array even if CPU is hot-removed
+ */
+static int apicid_to_cpuid[MAX_LOCAL_APIC] = {
+	[0 ... MAX_LOCAL_APIC-1] = -1,
+};
+
+/*
+ * Represent CPU ID bound to APIC
+ * Don't clear a bit even if CPU is hot-removed
+ */
+static DECLARE_BITMAP(cpu_used_bits, CONFIG_NR_CPUS);
+static struct cpumask *const cpu_used_mask = to_cpumask(cpu_used_bits);
+
+/*
   * Get the LAPIC version
   */
  static inline int lapic_get_version(void)

arch/x86/kernel/apic/apic.c void disconnect_bsp_APIC(int virt_wire_setup) · line 2147

Quoted 10 lines
arch/x86/kernel/apic/apic.c +7 -0
@@ -2122,6 +2138,17 @@ void disconnect_bsp_APIC(int virt_wire_setup)
  	apic_write(APIC_LVT1, value);
  }
 
+static int get_cpuid(int apicid)
+{
+	int cpuid;
+
+	cpuid = apicid_to_cpuid[apicid];
+	if (cpuid < 0)
+		cpuid = cpumask_next_zero(-1, cpu_used_mask);

Why do you need additional cpu bitmask?
How about just finding the first apicid_to_cpuid[apicid] < 0 and dropping not needed anymore bitmask.

Quoted 27 lines
arch/x86/kernel/apic/apic.c +8 -1
+
+	return cpuid;
+}
+
  int generic_processor_info(int apicid, int version)
  {
  	int cpu, max = nr_cpu_ids;
@@ -2199,7 +2226,9 @@ int generic_processor_info(int apicid, int version)
  		 */
  		cpu = 0;
  	} else
-		cpu = cpumask_next_zero(-1, cpu_present_mask);
+		cpu = get_cpuid(apicid);
+
+	apicid_to_cpuid[apicid] = cpu;
 
  	/*
  	 * Validate version
@@ -2228,6 +2257,7 @@ int generic_processor_info(int apicid, int version)
  	early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
  		apic->x86_32_early_logical_apicid(cpu);
  #endif
+	cpumask_set_cpu(cpu, cpu_used_mask);
  	set_cpu_possible(cpu, true);
  	set_cpu_present(cpu, true);
 
#2 lore raw
Quoted 91 lines · Igor Mammedov
Quoted 87 lines · On Thu, 10 Jul 2014 17:41:50 +0900 Yasuaki Ishimatsu…

llc_shared_map is not cleared even if CPU is offline or hot removed. So when hot-plugging CPU and assigning new CPU number to hot-added CPU, the mask has wrong value. The mask is used by CSF schduler to create sched_domain. So it breaks CFS scheduler.

Here is a example on my system.
My system has 4 sockets and each socket has 15 cores and HT is enabled. In this case, each core of sockes is numbered as follows:

           | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-44, 90-104
Socket#3 | 45-59, 105-119

Then llc_shared_mask of CPU#30 has 0x3fff80000001fffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-44 and 90-104.

When hot-removing socket#2 and #3, each core of sockets is numbered as follows:

           | CPU#

Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89

But llc_shared_mask is not cleared. So llc_shared_mask of CPU#30 remains having 0x3fff80000001fffc0000000.

After that, when hot-adding socket#2 and #3, each core of sockets is numbered as follows:

           | CPU#
Socket#0 | 0-14 , 60-74
Socket#1 | 15-29, 75-89
Socket#2 | 30-59
Socket#3 | 90-119

Then llc_shared_mask of CPU#30 becomes 0x3fff8000fffffffc0000000. It means that last level cache of Socket#2 is shared with CPU#30-59 and 90-104. So the mask has wrong value.

At first, I cleared hot-removed CPU number's bit from llc_shared_map when hot removing CPU. But Borislav suggested that the problem will disappear if readded CPU is assigned same CPU number. And llc_shared_map must not be changed.

So the patch assigns same CPU number to readded CPU by linking CPU number to APIC ID. And by the patch, the problem disappers.

---
   arch/x86/kernel/apic/apic.c | 32 +++++++++++++++++++++++++++++++-
   1 file changed, 31 insertions(+), 1 deletion(-)
arch/x86/kernel/apic/apic.c +16 -0
index ad28db7..1cc715b 100644
@@ -220,6 +220,22 @@ static void apic_pm_activate(void);
   static unsigned long apic_phys;
 
   /*
+ * Bind ACPI ID to CPU ID
+ * CPU ID to APIC ID does not change by this array even if CPU is
+ * hotplugged. So don't clear the array even if CPU is hot-removed
+ */
+static int apicid_to_cpuid[MAX_LOCAL_APIC] = {
+	[0 ... MAX_LOCAL_APIC-1] = -1,
+};
+
+/*
+ * Represent CPU ID bound to APIC
+ * Don't clear a bit even if CPU is hot-removed
+ */
+static DECLARE_BITMAP(cpu_used_bits, CONFIG_NR_CPUS);
+static struct cpumask *const cpu_used_mask = to_cpumask(cpu_used_bits);
+
+/*
    * Get the LAPIC version
    */
   static inline int lapic_get_version(void)
@@ -2122,6 +2138,17 @@ void disconnect_bsp_APIC(int virt_wire_setup)
   	apic_write(APIC_LVT1, value);
   }
 
Quoted 8 lines

arch/x86/kernel/apic/apic.c void disconnect_bsp_APIC(int virt_wire_setup) · line 2147

Quoted 7 lines
arch/x86/kernel/apic/apic.c +7 -0
+static int get_cpuid(int apicid)
+{
+	int cpuid;
+
+	cpuid = apicid_to_cpuid[apicid];
+	if (cpuid < 0)
+		cpuid = cpumask_next_zero(-1, cpu_used_mask);

Why do you need additional cpu bitmask?

To assing new CPU number, I prepared new cpu bitmask.

The following two steps are necessary to assign CPU number to APIC ID.
1. Check whether APIC ID has been assigned CPU number
2. Assign new CPU number if ACPI ID has not been assigned CPU number (it

    means apicid_to_cpuid[] returns -1)

Step 1. is checked by apicid_to_cpuid[]. And step 2. assigns new CPU number by using cpu_used_mask.

To keep cpu number, cpumask must not be cleared by hot removing CPU. If cpumask is cleared by hot removing CPU, the cpumask cannot be used to keep CPU number.

Currently, cpu_present_map is used to assign CPU number. But the cpumask is cleared by hot removing CPU since the mask is prepared to remember existed CPUs in the system. So the cpu_present_map must be cleared at CPU hot remove.

I confirmed whether present cpumasks (cpu_possible_map, cpu_online_map et al) is usable or not for this purpose. But there is no cpumask that can be used to keep CPU number. So I prepared new cpu bitmask.

Quoted 2 lines

How about just finding the first apicid_to_cpuid[apicid] < 0 and dropping not needed anymore bitmask.

When apicid_to_cpuid[] return -1, kernel assigns new CPU number. For this, the cpu_used_mask is necessary.

Thanks,
Yasuaki Ishimatsu

Quoted 29 lines
Quoted 28 lines
arch/x86/kernel/apic/apic.c +8 -1
+
+	return cpuid;
+}
+
   int generic_processor_info(int apicid, int version)
   {
   	int cpu, max = nr_cpu_ids;
@@ -2199,7 +2226,9 @@ int generic_processor_info(int apicid, int version)
   		 */
   		cpu = 0;
   	} else
-		cpu = cpumask_next_zero(-1, cpu_present_mask);
+		cpu = get_cpuid(apicid);
+
+	apicid_to_cpuid[apicid] = cpu;
 
   	/*
   	 * Validate version
@@ -2228,6 +2257,7 @@ int generic_processor_info(int apicid, int version)
   	early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
   		apic->x86_32_early_logical_apicid(cpu);
   #endif
+	cpumask_set_cpu(cpu, cpu_used_mask);
   	set_cpu_possible(cpu, true);
   	set_cpu_present(cpu, true);
 
maintainer
#3 lore raw
Quoted 1 line · Yasuaki Ishimatsu
Quoted 1 line
Quoted 1 line

+static int get_cpuid(int apicid)

Btw this "cpuid" is misleading. Call it "cpu_num" or so.

Quoted 31 lines
Quoted 7 lines

arch/x86/kernel/apic/apic.c void disconnect_bsp_APIC(int virt_wire_setup) · line 2147

Quoted 6 lines
arch/x86/kernel/apic/apic.c +6 -0
+{
+	int cpuid;
+
+	cpuid = apicid_to_cpuid[apicid];
+	if (cpuid < 0)
+		cpuid = cpumask_next_zero(-1, cpu_used_mask);

Why do you need additional cpu bitmask?

To assing new CPU number, I prepared new cpu bitmask.

The following two steps are necessary to assign CPU number to APIC ID.
1. Check whether APIC ID has been assigned CPU number
2. Assign new CPU number if ACPI ID has not been assigned CPU number (it

    means apicid_to_cpuid[] returns -1)

Step 1. is checked by apicid_to_cpuid[]. And step 2. assigns new CPU number by using cpu_used_mask.

To keep cpu number, cpumask must not be cleared by hot removing CPU. If cpumask is cleared by hot removing CPU, the cpumask cannot be used to keep CPU number.

Currently, cpu_present_map is used to assign CPU number. But the cpumask is cleared by hot removing CPU since the mask is prepared to remember existed CPUs in the system. So the cpu_present_map must be cleared at CPU hot remove.

I confirmed whether present cpumasks (cpu_possible_map, cpu_online_map et al) is usable or not for this purpose. But there is no cpumask that can be used to keep CPU number. So I prepared new cpu bitmask.

Quoted 5 lines
Quoted 2 lines

How about just finding the first apicid_to_cpuid[apicid] < 0 and dropping not needed anymore bitmask.

When apicid_to_cpuid[] return -1, kernel assigns new CPU number. For this, the cpu_used_mask is necessary.

And we can't have that - we cannot have cores which had number X get number Y after hotplug.

Can you send a full dmesg after you've done a physical node hotplug on a machine? Privately is fine too.

Boot with

"ignore_loglevel log_buf_len=10M debug apic=debug show_lapic=all"

please.

Thanks.

Signature · 5 lines
Regards/Gruss,
    Boris.

Sent from a fat crate under my desk. Formatting is fine.
--
#4 lore raw

Hi Borislav,

Quoted 4 lines · Borislav Petkov
Quoted 1 line · Yasuaki Ishimatsu
Quoted 1 line
Quoted 1 line

+static int get_cpuid(int apicid)

Btw this "cpuid" is misleading. Call it "cpu_num" or so.

O.K.
I'll update it.

Quoted 38 lines
Quoted 32 lines
Quoted 8 lines

arch/x86/kernel/apic/apic.c void disconnect_bsp_APIC(int virt_wire_setup) · line 2147

Quoted 7 lines
arch/x86/kernel/apic/apic.c +6 -0
+{
+	int cpuid;
+
+	cpuid = apicid_to_cpuid[apicid];
+	if (cpuid < 0)
+		cpuid = cpumask_next_zero(-1, cpu_used_mask);

Why do you need additional cpu bitmask?

To assing new CPU number, I prepared new cpu bitmask.

The following two steps are necessary to assign CPU number to APIC ID.
1. Check whether APIC ID has been assigned CPU number
2. Assign new CPU number if ACPI ID has not been assigned CPU number (it

     means apicid_to_cpuid[] returns -1)

Step 1. is checked by apicid_to_cpuid[]. And step 2. assigns new CPU number by using cpu_used_mask.

To keep cpu number, cpumask must not be cleared by hot removing CPU. If cpumask is cleared by hot removing CPU, the cpumask cannot be used to keep CPU number.

Currently, cpu_present_map is used to assign CPU number. But the cpumask is cleared by hot removing CPU since the mask is prepared to remember existed CPUs in the system. So the cpu_present_map must be cleared at CPU hot remove.

I confirmed whether present cpumasks (cpu_possible_map, cpu_online_map et al) is usable or not for this purpose. But there is no cpumask that can be used to keep CPU number. So I prepared new cpu bitmask.

Quoted 5 lines
Quoted 2 lines

How about just finding the first apicid_to_cpuid[apicid] < 0 and dropping not needed anymore bitmask.

When apicid_to_cpuid[] return -1, kernel assigns new CPU number. For this, the cpu_used_mask is necessary.

Quoted 6 lines

And we can't have that - we cannot have cores which had number X get number Y after hotplug.

Can you send a full dmesg after you've done a physical node hotplug on a machine? Privately is fine too.

O.K.
I'll send dmesg.

Thanks,
Yasuaki Ishimatsu

Quoted 9 lines

Boot with

"ignore_loglevel log_buf_len=10M debug apic=debug show_lapic=all"

please.

Thanks.