x86/apic: Use byte array apic_version[], not int array. Saves up to 96k
PATCH 1/1 x86/apic: Use byte array apic_version[], not int array. Saves up to 96k
This array is [MAX_LOCAL_APIC], and MAX_LOCAL_APIC can easily be up to 32k.
This patch changes apic_version[] array elements from int to u8 - APIC version values as of year 2016 are no larger than 0x1f on all known CPUs. Version field in the APIC register is 8 bit wide - not likely
to overflow byte range in foreseeable future.
The "ver" argument of generic_processor_info(id,ver), which goes into apic_version[id], is also changed from int to u8: make it obvious that assignment can't overflow.
generic_processor_info() has four callsites, none of them can put an out-of-range value into this argument.
--- arch/x86/include/asm/mpspec.h | 4 ++-- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/apic/apic.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/mpspec.h +2 -2
@@ -6,7 +6,7 @@#include <asm/x86_init.h> #include <asm/apicdef.h> -extern int apic_version[]; +extern u8 apic_version[];extern int pic_mode;#ifdef CONFIG_X86_32
@@ -85,7 +85,7 @@ static inline void early_reserve_e820_mpc_new(void) { }#define default_get_smp_config x86_init_uint_noop#endif -int generic_processor_info (int apicid,int version); +int generic_processor_info (int apicid,u8 version);#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC)
arch/x86/kernel/acpi/boot.c +1 -1
@@ -168,7 +168,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)*/ static int acpi_register_lapic (int id,u32 acpiid,u8 enabled) { -unsigned int ver =0 ; +u8 ver =0 ;int cpu;if (id >=MAX_LOCAL_APIC ) {
arch/x86/kernel/apic/apic.c +2 -2
@@ -1837,7 +1837,7 @@ void __init register_lapic_address(unsigned long address) } } -int apic_version[MAX_LOCAL_APIC ]; +u8 apic_version[MAX_LOCAL_APIC ];/* * Local APIC interrupts
@@ -2027,7 +2027,7 @@ void disconnect_bsp_APIC(int virt_wire_setup)apic_write (APIC_LVT1 , value); } -int generic_processor_info (int apicid,int version) +int generic_processor_info (int apicid,u8 version) {int cpu, max = nr_cpu_ids; bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
Signature · 1 line
2.9.2
Borislav Petkov
maintainerQuoted 7 lines · Denys Vlasenko
This array is [
MAX_LOCAL_APIC], andMAX_LOCAL_APICcan easily be up to 32k.This patch changes apic_version[] array elements from int to u8 - APIC version values as of year 2016 are no larger than
0x1fon all known CPUs. Version field in the APIC register is 8 bit wide - not likely
to overflow byte range in foreseeable future.
Quoted 5 lines
The "ver" argument of
generic_processor_info(id,ver), which goes into apic_version[id], is also changed from int to u8: make it obvious that assignment can't overflow.
generic_processor_info()has four callsites, none of them can put an out-of-range value into this argument.
Right, so I dug a bit into this and found:
http://marc.info/?l=linux-kernel&m=123230551709711
and
b2b815d80a5c ("x86: put trigger in to detect mismatched apic versions")
It is from 2009 and I don't know how relevant 16-bit APIC IDs are anymore... I guess you probably want to run this by SGI folk first.
Otherwise I was going to propose to kill that apic_version array altogether and cache only the version of the previous CPU and compare it to the current one to catch mismatches...
Adding Mike to CC and leaving in the rest for reference.
Quoted 72 lines
Signed-off-by Denys Vlasenko <[email protected]>CC Ingo Molnar <[email protected]>CC Andy Lutomirski <[email protected]>CC "H. Peter Anvin" <[email protected]>CC Borislav Petkov <[email protected]>CC Brian Gerst <[email protected]>--- arch/x86/include/asm/mpspec.h | 4 ++-- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/apic/apic.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)arch/x86/include/asm/mpspec.h +2
-2@@ -6,7 +6,7 @@#include <asm/x86_init.h> #include <asm/apicdef.h> -extern int apic_version[]; +extern u8 apic_version[];extern int pic_mode;#ifdef CONFIG_X86_32 @@ -85,7 +85,7 @@ static inline void early_reserve_e820_mpc_new(void) { }#define default_get_smp_config x86_init_uint_noop#endif -int generic_processor_info (int apicid,int version); +int generic_processor_info (int apicid,u8 version);#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC)arch/x86/kernel/acpi/boot.c +1
-1@@ -168,7 +168,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)*/ static int acpi_register_lapic (int id,u32 acpiid,u8 enabled) { -unsigned int ver =0 ; +u8 ver =0 ;int cpu;if (id >=MAX_LOCAL_APIC ) {arch/x86/kernel/apic/apic.c +2
-2@@ -1837,7 +1837,7 @@ void __init register_lapic_address(unsigned long address) } } -int apic_version[MAX_LOCAL_APIC ]; +u8 apic_version[MAX_LOCAL_APIC ];/* * Local APIC interrupts @@ -2027,7 +2027,7 @@ void disconnect_bsp_APIC(int virt_wire_setup)apic_write (APIC_LVT1 , value); } -int generic_processor_info (int apicid,int version) +int generic_processor_info (int apicid,u8 version) {int cpu, max = nr_cpu_ids; bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
Signature · 4 lines
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.Quoted 20 lines · Borislav Petkov
Quoted 7 lines · Denys Vlasenko
This array is [
MAX_LOCAL_APIC], andMAX_LOCAL_APICcan easily be up to 32k.This patch changes apic_version[] array elements from int to u8 - APIC version values as of year 2016 are no larger than
0x1fon all known CPUs. Version field in the APIC register is 8 bit wide - not likely
to overflow byte range in foreseeable future.Quoted 5 lines
The "ver" argument of
generic_processor_info(id,ver), which goes into apic_version[id], is also changed from int to u8: make it obvious that assignment can't overflow.
generic_processor_info()has four callsites, none of them can put an out-of-range value into this argument.Right, so I dug a bit into this and found:
http://marc.info/?l=linux-kernel&m=123230551709711
and
Quoted 8 lines
b2b815d80a5c("x86: put trigger in to detect mismatched apic versions")It is from 2009 and I don't know how relevant 16-bit APIC IDs are anymore... I guess you probably want to run this by SGI folk first.
Otherwise I was going to propose to kill that
apic_versionarray altogether and cache only the version of the previous CPU and compare it to the current one to catch mismatches...
Yeah, the idea was back then to eliminate the array, but we wanted to make sure that we don't have systems out in the wild which have different apic versions. I really doubt that we can deal with that proper, so having a single version entry and yelling loudly when we detect a mismatch is good enough.
Thanks,
tglx
Quoted 30 lines · Thomas Gleixner
Quoted 20 lines · Borislav Petkov
Quoted 7 lines · Denys Vlasenko
This array is [
MAX_LOCAL_APIC], andMAX_LOCAL_APICcan easily be up to 32k.This patch changes apic_version[] array elements from int to u8 - APIC version values as of year 2016 are no larger than
0x1fon all known CPUs. Version field in the APIC register is 8 bit wide - not likely
to overflow byte range in foreseeable future.Quoted 5 lines
The "ver" argument of
generic_processor_info(id,ver), which goes into apic_version[id], is also changed from int to u8: make it obvious that assignment can't overflow.
generic_processor_info()has four callsites, none of them can put an out-of-range value into this argument.Right, so I dug a bit into this and found:
http://marc.info/?l=linux-kernel&m=123230551709711
and
Quoted 8 lines
b2b815d80a5c("x86: put trigger in to detect mismatched apic versions")It is from 2009 and I don't know how relevant 16-bit APIC IDs are anymore... I guess you probably want to run this by SGI folk first.
Otherwise I was going to propose to kill that
apic_versionarray altogether and cache only the version of the previous CPU and compare it to the current one to catch mismatches...
Quoted 5 lines
Yeah, the idea was back then to eliminate the array, but we wanted to make sure that we don't have systems out in the wild which have different apic versions. I really doubt that we can deal with that proper, so having a single version entry and yelling loudly when we detect a mismatch is good enough.
Makes sense. I'll send a patch