Count disabled cpus as potential hot-pluggable CPUs
PATCH 2/2 Count disabled cpus as potential hot-pluggable CPUs
Have a facility to account for potentially hot-pluggable CPUs. ACPI doesnt give a determinstic method to find hot-pluggable CPUs. Hence we use 2 methods to assist.
- BIOS can mark potentially hot-pluggable CPUs as disabled in the MADT tables.
- User can specify the number of hot-pluggable CPUs via parameter additional_cpus=X
The option is enabled only if ACPI_CONFIG_HOTPLUG_CPU=y which enables the physical hotplug option. Without which user can still use logical onlining and offlining of CPUs by enabling CONFIG_HOTPLUG_CPU=y
Adds more bits to cpu_possible_map for potentially hot-pluggable cpus.
------------------------------------------------------
arch/ia64/kernel/acpi.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/setup.c | 4 +++ include/asm-ia64/acpi.h | 2 + 3 files changed, 62 insertions(+)
Index: linux-2.6.16-rc3-mm1/arch/ia64/kernel/acpi.c =================================--- linux-2.6.16-rc3-mm1.orig/arch/ia64/kernel/acpi.c +++ linux-2.6.16-rc3-mm1/arch/ia64/kernel/acpi.c
@@ -760,6 +760,62 @@ int acpi_map_cpu2node(acpi_handle handle
return (0);
}
+int additional_cpus __initdata = -1;
+
+static __init int setup_additional_cpus(char *s)
+{
+ if (s)
+ additional_cpus = simple_strtol(s, NULL, 0);
+
+ return 0;
+}
+
+early_param("additional_cpus", setup_additional_cpus);
+
+/*
+ * cpu_possible_map should be static, it cannot change as cpu's
+ * are onlined, or offlined. The reason is per-cpu data-structures
+ * are allocated by some modules at init time, and dont expect to
+ * do this dynamically on cpu arrival/departure.
+ * cpu_present_map on the other hand can change dynamically.
+ * In case when cpu_hotplug is not compiled, then we resort to current
+ * behaviour, which is cpu_possible = cpu_present.
+ * - Ashok Raj
+ *
+ * Three ways to find out the number of additional hotplug CPUs:
+ * - If the BIOS specified disabled CPUs in ACPI/mptables use that.
+ * - The user can overwrite it with additional_cpus=NUM
+ * - Otherwise don't reserve additional CPUs.
+ */
+__init void prefill_possible_map(void)
+{
+ int i;
+ int possible, disabled_cpus;
+
+ disabled_cpus = total_cpus - available_cpus;
+ if (additional_cpus = -1) {
+ if (disabled_cpus > 0) {
+ possible = total_cpus;
+ additional_cpus = disabled_cpus;
+ }
+ else {
+ possible = available_cpus;
+ additional_cpus = 0;
+ }
+ } else {
+ possible = available_cpus + additional_cpus;
+ }
+ if (possible > NR_CPUS)
+ possible = NR_CPUS;
+
+ printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",
+ possible,
+ max_t(int, additional_cpus, 0));
+
+ for (i = 0; i < possible; i++)
+ cpu_set(i, cpu_possible_map);
+}
+
int acpi_map_lsapic(acpi_handle handle, int *pcpu)
{
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
Index: linux-2.6.16-rc3-mm1/include/asm-ia64/acpi.h =================================--- linux-2.6.16-rc3-mm1.orig/include/asm-ia64/acpi.h +++ linux-2.6.16-rc3-mm1/include/asm-ia64/acpi.h
@@ -106,6 +106,8 @@ extern unsigned int can_cpei_retarget(vo
extern unsigned int is_cpu_cpei_target(unsigned int cpu);
extern void set_cpei_target_cpu(unsigned int cpu);
extern unsigned int get_cpei_target_cpu(void);
+extern void prefill_possible_map(void);
+extern int additional_cpus;
extern u16 ia64_acpiid_to_sapicid[];
Index: linux-2.6.16-rc3-mm1/arch/ia64/kernel/setup.c =================================--- linux-2.6.16-rc3-mm1.orig/arch/ia64/kernel/setup.c +++ linux-2.6.16-rc3-mm1/arch/ia64/kernel/setup.c
@@ -430,6 +430,7 @@ setup_arch (char **cmdline_p)
if (early_console_setup(*cmdline_p) = 0)
mark_bsp_online();
+ parse_early_param();
#ifdef CONFIG_ACPI
/* Initialize the ACPI boot-time table parser */ acpi_table_init();
@@ -688,6 +689,9 @@ void
setup_per_cpu_areas (void)
{
/* start_kernel() requires this... */
+#ifdef CONFIG_ACPI_HOTPLUG_CPU
+ prefill_possible_map();
+#endif
}
/*
--
Review
Quoted 4 lines · Ashok Raj
(quoted diff) +1
-0+ printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", + possible, + max_t(int, additional_cpus, 0));
I think a plain old max() would suffice here?
Quoted 7 lines · Andrew Morton
Review
Quoted 4 lines · Ashok Raj
(quoted diff) +1
-0+ printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", + possible, + max_t(int, additional_cpus, 0));I think a plain old
max()would suffice here?
I think so.. i just cut/paste from the x86_64 implementation changing just very minimally. Here is the updated patch, could you use this instead of the earlier one i sent? I also forgot to add to the Documentation file which i did now.
the filename in queued -mm is (Phew!)
ia64-dont-set-nr-cpus-for-cpu_possible_map-when-cpu-hotplug-is-enabled.patch
Signature · 148 lines
Cheers, Ashok Raj - Open Source Technology Center Have a facility to account for potentially hot-pluggable CPUs. ACPI doesnt give a determinstic method to find hot-pluggable CPUs. Hence we use 2 methods to assist. - BIOS can mark potentially hot-pluggable CPUs as disabled in the MADT tables. - User can specify the number of hot-pluggable CPUs via parameter additional_cpus=X The option is enabled only if ACPI_CONFIG_HOTPLUG_CPU=y which enables the physical hotplug option. Without which user can still use logical onlining and offlining of CPUs by enabling CONFIG_HOTPLUG_CPU=y Adds more bits to cpu_possible_map for potentially hot-pluggable cpus. Signed-off-by: Ashok Raj <[email protected]> ------------------------------------------------------ Documentation/cpu-hotplug.txt | 14 +++++++++-- arch/ia64/kernel/acpi.c | 53 ++++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/setup.c | 4 +++ include/asm-ia64/acpi.h | 2 + 4 files changed, 71 insertions(+), 2 deletions(-) Index: linux-2.6.16-rc3-mm1/arch/ia64/kernel/acpi.c =================================--- linux-2.6.16-rc3-mm1.orig/arch/ia64/kernel/acpi.c +++ linux-2.6.16-rc3-mm1/arch/ia64/kernel/acpi.c @@ -760,6 +760,59 @@ int acpi_map_cpu2node(acpi_handle handle return (0); } +int additional_cpus __initdata = -1; + +static __init int setup_additional_cpus(char *s) +{ + if (s) + additional_cpus = simple_strtol(s, NULL, 0); + + return 0; +} + +early_param("additional_cpus", setup_additional_cpus); + +/* + * cpu_possible_map should be static, it cannot change as cpu's + * are onlined, or offlined. The reason is per-cpu data-structures + * are allocated by some modules at init time, and dont expect to + * do this dynamically on cpu arrival/departure. + * cpu_present_map on the other hand can change dynamically. + * In case when cpu_hotplug is not compiled, then we resort to current + * behaviour, which is cpu_possible = cpu_present. + * - Ashok Raj + * + * Three ways to find out the number of additional hotplug CPUs: + * - If the BIOS specified disabled CPUs in ACPI/mptables use that. + * - The user can overwrite it with additional_cpus=NUM + * - Otherwise don't reserve additional CPUs. + */ +__init void prefill_possible_map(void) +{ + int i; + int possible, disabled_cpus; + + disabled_cpus = total_cpus - available_cpus; + + if (additional_cpus = -1) { + if (disabled_cpus > 0) + additional_cpus = disabled_cpus; + else + additional_cpus = 0; + } + + possible = available_cpus + additional_cpus; + + if (possible > NR_CPUS) + possible = NR_CPUS; + + printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", + possible, max((possible - available_cpus), 0)); + + for (i = 0; i < possible; i++) + cpu_set(i, cpu_possible_map); +} + int acpi_map_lsapic(acpi_handle handle, int *pcpu) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; Index: linux-2.6.16-rc3-mm1/include/asm-ia64/acpi.h =================================--- linux-2.6.16-rc3-mm1.orig/include/asm-ia64/acpi.h +++ linux-2.6.16-rc3-mm1/include/asm-ia64/acpi.h @@ -106,6 +106,8 @@ extern unsigned int can_cpei_retarget(vo extern unsigned int is_cpu_cpei_target(unsigned int cpu); extern void set_cpei_target_cpu(unsigned int cpu); extern unsigned int get_cpei_target_cpu(void); +extern void prefill_possible_map(void); +extern int additional_cpus; extern u16 ia64_acpiid_to_sapicid[]; Index: linux-2.6.16-rc3-mm1/arch/ia64/kernel/setup.c =================================--- linux-2.6.16-rc3-mm1.orig/arch/ia64/kernel/setup.c +++ linux-2.6.16-rc3-mm1/arch/ia64/kernel/setup.c @@ -430,6 +430,7 @@ setup_arch (char **cmdline_p) if (early_console_setup(*cmdline_p) = 0) mark_bsp_online(); + parse_early_param(); #ifdef CONFIG_ACPI /* Initialize the ACPI boot-time table parser */ acpi_table_init(); @@ -688,6 +689,9 @@ void setup_per_cpu_areas (void) { /* start_kernel() requires this... */ +#ifdef CONFIG_ACPI_HOTPLUG_CPU + prefill_possible_map(); +#endif } /* Index: linux-2.6.16-rc3-mm1/Documentation/cpu-hotplug.txt =================================--- linux-2.6.16-rc3-mm1.orig/Documentation/cpu-hotplug.txt +++ linux-2.6.16-rc3-mm1/Documentation/cpu-hotplug.txt @@ -44,10 +44,20 @@ maxcpus=n Restrict boot time cpus to maxcpus=2 will only boot 2. You can choose to bring the other cpus later online, read FAQ's for more info. -additional_cpus=n [x86_64 only] use this to limit hotpluggable cpus. - This option sets +additional_cpus*=n use this to limit hotpluggable cpus. This option sets cpu_possible_map = cpu_present_map + additional_cpus +(*) Option valid only for following architectures +- x86_64, ia64 + +ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT +to determine the number of potentially hot-pluggable cpus. The implementation +should only rely on this to count the #of cpus, but must not rely on the +apicid values in those tables for disabled apics. In the event BIOS doesnt +mark such hot-pluggable cpus as disabled entries, one could use this +parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map. + + CPU maps and such ----------------- [More on cpumaps and primitive to manipulate, please check