genapic: always use physical delivery mode on > 8 CPUs
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Review
Quoted 2 lines · Ingo Molnar
(quoted diff) +1
-1- if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) + if (max_apic < 8)
Patch mostly looks good. Instead of checking for max_apic, can we use
cpus_weight(cpu_possible_map) <= 8
This will help where initially system booted with <= 8 cpus and hotplug potentially can bringup more cpus later..
thanks,
suresh
Quoted 5 lines
(quoted diff) +2
-1genapic = &apic_flat; else - genapic = &apic_cluster; +force_physflat: + genapic = &apic_physflat;
PATCH 1/1 genapic: default to physical mode on hotplug CPU kernels
Quoted 6 lines · Siddha, Suresh B
Review
Quoted 2 lines · Ingo Molnar
(quoted diff) +1
-1- if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) + if (max_apic < 8)Patch mostly looks good. Instead of checking for
max_apic, can we use
cpus_weight(cpu_possible_map)<= 8
ok - but i think it's still possible the BIOS tells us APIC IDs that are larger than 7, even if there are fewer CPUs. So i think the patch below should cover it. Agreed?
Ingo
-------------------->
From: Ingo Molnar <[email protected]>
Subject: [patch] genapic: default to physical mode on hotplug CPU kernels
default to physical mode on hotplug CPU kernels.
arch/x86_64/kernel/genapic.c +1 -1
@@ -51,7 +51,7 @@ void __init clustered_apic_check(void) max_apic = id; } -if (max_apic <8 ) +if (max_apic <8 &&cpus_weight (cpu_possible_map) <=8 ) genapic = &apic_flat;else genapic = &apic_physflat;
Re: [patch] genapic: default to physical mode on hotplug CPU kernels
Quoted 10 lines · Ingo Molnar
Quoted 6 lines · Siddha, Suresh B
Review
Quoted 2 lines · Ingo Molnar
(quoted diff) +1
-1- if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) + if (max_apic < 8)Patch mostly looks good. Instead of checking for
max_apic, can we use
cpus_weight(cpu_possible_map)<= 8
Quoted 4 lines
ok - but i think it's still possible the BIOS tells us APIC IDs that are larger than 7, even if there are fewer CPUs. So i think the patch below should cover it. Agreed?
I think it is ok to use flat mode even when APIC IDs are larger than 7, as we rely on LDR's which are programmed using smp_processor_id().
IMO, cpus_weight check should be fine.
thanks,
suresh
Quoted 23 lines
Ingo
-------------------->
From: Ingo Molnar <[email protected]>
Subject: [patch] genapic: default to physical mode on hotplug CPU kernelsdefault to physical mode on hotplug CPU kernels.
Signed-off-by Ingo Molnar <[email protected]>Index:
linux/arch/x86_64/kernel/genapic.c
===================================================================arch/x86_64/kernel/genapic.c +1
-1@@ -51,7 +51,7 @@ void __init clustered_apic_check(void) max_apic = id; } -if (max_apic <8 ) +if (max_apic <8 &&cpus_weight (cpu_possible_map) <=8 ) genapic = &apic_flat;else genapic = &apic_physflat;
Re: [patch] genapic: default to physical mode on hotplug CPU kernels
Quoted 16 lines · Siddha, Suresh B
Quoted 10 lines · Ingo Molnar
Quoted 6 lines · Siddha, Suresh B
Review
Quoted 2 lines · Ingo Molnar
(quoted diff) +1
-1- if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) + if (max_apic < 8)Patch mostly looks good. Instead of checking for
max_apic, can we use
cpus_weight(cpu_possible_map)<= 8Quoted 4 lines
ok - but i think it's still possible the BIOS tells us APIC IDs that are larger than 7, even if there are fewer CPUs. So i think the patch below should cover it. Agreed?
Quoted 4 lines
I think it is ok to use flat mode even when APIC IDs are larger than 7, as we rely on LDR's which are programmed using
smp_processor_id().IMO,
cpus_weightcheck should be fine.
hm - indeed. Then we can indeed do the patch below. Nice simplification!
Ingo
-------------------->
From: Ingo Molnar <[email protected]>
Subject: [patch] genapic: default to physical mode on hotplug CPU kernels
default to physical mode on hotplug CPU kernels. Furher simplify and clean up the APIC initialization code.
--- arch/x86_64/kernel/genapic.c | 20 +++----------------- arch/x86_64/kernel/mpparse.c | 2 +- include/asm-x86_64/apic.h | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-)
arch/x86_64/kernel/genapic.c +3 -17
@@ -33,25 +33,11 @@ u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0struct genapic __read_mostly *genapic = &apic_flat;/* -* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. +* Choose the APIC routing mode: */ -void __init clustered_apic_check (void ) +void __init setup_apic_routing (void ) { -unsigned int i, max_apic =0 ; -u8 id; - -/* -* Determine the maximum APIC ID in use: -*/ -for (i =0 ; i <NR_CPUS ; i++) { - id = bios_cpu_apicid[i]; -if (id ==BAD_APICID ) -continue ; -if (id > max_apic) - max_apic = id; - } - -if (max_apic <8 ) +if (cpus_weight (cpu_possible_map) <=8 ) genapic = &apic_flat;else genapic = &apic_physflat;
arch/x86_64/kernel/mpparse.c +1 -1
@@ -302,7 +302,7 @@ static int __init smp_read_mpc(struct mp } } } -clustered_apic_check (); +setup_apic_routing ();if (!num_processors)printk (KERN_ERR "MPTABLE: no processors registered!\n" );return num_processors;
include/asm-x86_64/apic.h +1 -1
@@ -82,7 +82,7 @@ extern void setup_secondary_APIC_clock (extern int APIC_init_uniprocessor (void );extern void disable_APIC_timer (void );extern void enable_APIC_timer (void ); -extern void clustered_apic_check (void ); +extern void setup_apic_routing (void );static inline void lapic_timer_idle_broadcast (int broadcast) { } extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
Re: [patch] genapic: default to physical mode on hotplug CPU kernels
Quoted 1 line · Ingo Molnar
hm - indeed. Then we can indeed do the patch below. Nice simplification!
forgot to convert a few more places - full patch below.
Ingo
----------------->
From: Ingo Molnar <[email protected]>
Subject: [patch] genapic: default to physical mode on hotplug CPU kernels
default to physical mode on hotplug CPU kernels. Furher simplify and clean up the APIC initialization code.
--- arch/i386/kernel/acpi/boot.c | 2 +- arch/i386/kernel/mpparse.c | 2 +- arch/x86_64/kernel/genapic.c | 20 +++----------------- arch/x86_64/kernel/mpparse.c | 2 +- include/asm-i386/genapic.h | 4 ++-- include/asm-i386/mach-bigsmp/mach_apic.h | 2 +- include/asm-i386/mach-default/mach_apic.h | 2 +- include/asm-i386/mach-es7000/mach_apic.h | 2 +- include/asm-i386/mach-generic/mach_apic.h | 2 +- include/asm-i386/mach-numaq/mach_apic.h | 2 +- include/asm-i386/mach-summit/mach_apic.h | 2 +- include/asm-i386/mach-visws/mach_apic.h | 2 +- include/asm-x86_64/apic.h | 2 +- 13 files changed, 16 insertions(+), 30 deletions(-)
arch/i386/kernel/acpi/boot.c +1 -1
@@ -921,7 +921,7 @@ static void __init acpi_process_madt(voi acpi_ioapic =1 ; smp_found_config =1 ; -clustered_apic_check (); +setup_apic_routing (); } }if (error == -EINVAL ) {
arch/i386/kernel/mpparse.c +1 -1
@@ -479,7 +479,7 @@ static int __init smp_read_mpc(struct mp } ++mpc_record; } -clustered_apic_check (); +setup_apic_routing ();if (!num_processors)printk (KERN_ERR "SMP mptable: no processors registered!\n" );return num_processors;
arch/x86_64/kernel/genapic.c +3 -17
@@ -33,25 +33,11 @@ u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0struct genapic __read_mostly *genapic = &apic_flat;/* -* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. +* Choose the APIC routing mode: */ -void __init clustered_apic_check (void ) +void __init setup_apic_routing (void ) { -unsigned int i, max_apic =0 ; -u8 id; - -/* -* Determine the maximum APIC ID in use: -*/ -for (i =0 ; i <NR_CPUS ; i++) { - id = bios_cpu_apicid[i]; -if (id ==BAD_APICID ) -continue ; -if (id > max_apic) - max_apic = id; - } - -if (max_apic <8 ) +if (cpus_weight (cpu_possible_map) <=8 ) genapic = &apic_flat;else genapic = &apic_physflat;
arch/x86_64/kernel/mpparse.c +1 -1
@@ -302,7 +302,7 @@ static int __init smp_read_mpc(struct mp } } } -clustered_apic_check (); +setup_apic_routing ();if (!num_processors)printk (KERN_ERR "MPTABLE: no processors registered!\n" );return num_processors;
include/asm-i386/genapic.h +2 -2
@@ -36,7 +36,7 @@ struct genapic {void (*init_apic_ldr)(void );physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map); -void (*clustered_apic_check)(void ); +void (*setup_apic_routing)(void );int (*multi_timer_check)(int apic,int irq);int (*apicid_to_node)(int logical_apicid);int (*cpu_to_logical_apicid)(int cpu);
@@ -99,7 +99,7 @@ struct genapic { APICFUNC(check_apicid_present) \ APICFUNC(init_apic_ldr) \ APICFUNC(ioapic_phys_id_map) \ - APICFUNC(clustered_apic_check) \ + APICFUNC(setup_apic_routing) \ APICFUNC(multi_timer_check) \ APICFUNC(apicid_to_node) \ APICFUNC(cpu_to_logical_apicid) \
include/asm-i386/mach-bigsmp/mach_apic.h +1 -1
@@ -71,7 +71,7 @@ static inline void init_apic_ldr(void)apic_write_around (APIC_LDR , val); } -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) {printk ("Enabling APIC mode: %s. Using %d I/O APICs\n" ,"Physflat" , nr_ioapics);
include/asm-i386/mach-default/mach_apic.h +1 -1
@@ -54,7 +54,7 @@ static inline physid_mask_t ioapic_phys_return phys_map; } -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) {printk ("Enabling APIC mode: %s. Using %d I/O APICs\n" ,"Flat" , nr_ioapics);
include/asm-i386/mach-es7000/mach_apic.h +1 -1
@@ -81,7 +81,7 @@ static inline void enable_apic_mode(void }extern int apic_version [MAX_APICS ]; -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) {int apic = bios_cpu_apicid[smp_processor_id ()]; printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n",
include/asm-i386/mach-generic/mach_apic.h +1 -1
@@ -13,7 +13,7 @@#define apic_id_registered (genapic->apic_id_registered)#define init_apic_ldr (genapic->init_apic_ldr)#define ioapic_phys_id_map (genapic->ioapic_phys_id_map) -#define clustered_apic_check (genapic->clustered_apic_check) +#define setup_apic_routing (genapic->setup_apic_routing)#define multi_timer_check (genapic->multi_timer_check)#define apicid_to_node (genapic->apicid_to_node)#define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid)
include/asm-i386/mach-numaq/mach_apic.h +1 -1
@@ -34,7 +34,7 @@ static inline void init_apic_ldr(void)/* Already done in NUMA-Q firmware */ } -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) {printk ("Enabling APIC mode: %s. Using %d I/O APICs\n" ,"NUMA-Q" , nr_ioapics);
include/asm-i386/mach-summit/mach_apic.h +1 -1
@@ -80,7 +80,7 @@ static inline int apic_id_registered(voireturn 1 ; } -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) {printk ("Enabling APIC mode: Summit. Using %d I/O APICs\n" , nr_ioapics);
include/asm-i386/mach-visws/mach_apic.h +1 -1
@@ -47,7 +47,7 @@ static inline void summit_check(char *oe { } -static inline void clustered_apic_check (void ) +static inline void setup_apic_routing (void ) { }
include/asm-x86_64/apic.h +1 -1
@@ -82,7 +82,7 @@ extern void setup_secondary_APIC_clock (extern int APIC_init_uniprocessor (void );extern void disable_APIC_timer (void );extern void enable_APIC_timer (void ); -extern void clustered_apic_check (void ); +extern void setup_apic_routing (void );static inline void lapic_timer_idle_broadcast (int broadcast) { } extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
Siddha, Suresh B
Acked-byRe: [patch] genapic: default to physical mode on hotplug CPU kernels
Quoted 6 lines · Ingo Molnar
Quoted 1 line · Ingo Molnar
hm - indeed. Then we can indeed do the patch below. Nice simplification!
forgot to convert a few more places - full patch below.