x86: Cleanup max test CPUs
cover x86: Cleanup max test CPUs
Fix a bug Evgeny reported where init_apic_map() can cause random corruption due accessing random bytes far beyond the bounds of online_cpus. Take the opportunity to bump the max number of test CPUs to a realistic maximum, i.e. what kvm-unit-tests can support without a major rework.
Sean Christopherson (3):
x86: Fix out of bounds access when processing online_cpus
x86: Declare online_cpus based on MAX_TEST_CPUS
x86: Bump max number of test CPUs to 255
lib/x86/apic-defs.h | 2 +- lib/x86/apic.c | 4 ++-- lib/x86/smp.c | 2 -- x86/cstart.S | 2 +- x86/cstart64.S | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-)
Signature · 1 line
2.22.0
PATCH 1/3 x86: Fix out of bounds access when processing online_cpus
online_cpus is misdeclared as a 64 *byte* variable instead of a 64 *bit* variable. This causes init_apic_map() to test random bytes when it iterates over online_cpus, which in turn can cause it to overflow id_map and corrupt rnadom memory, e.g. pg_base. Declare online_cpus using MAX_TEST_CPUS, which presumably is set explicitly to match the storage size of online_cpus (64-bit values == max of 64 CPUS).
--- lib/x86/apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
lib/x86/apic.c +2 -2
@@ -232,13 +232,13 @@ void mask_pic_interrupts(void)outb (0xff ,0xa1 ); } -extern unsigned char online_cpus[256 /8 ]; +extern unsigned char online_cpus[MAX_TEST_CPUS /8 ];void init_apic_map (void ) {unsigned int i, j =0 ; -for (i =0 ; i <sizeof (online_cpus) *8 ; i++) { +for (i =0 ; i <MAX_TEST_CPUS ; i++) {if ((1ul << (i %8 )) & (online_cpus[i /8 ])) id_map[j++] = i; }
Signature · 1 line
2.22.0
PATCH 2/3 x86: Declare online_cpus based on MAX_TEST_CPUS
In reply to Sean ChristophersonDeclare online_cpus so that it is properly sized to have MAX_TEST_CPUS bits. Currently, online_cpus is hardcoded to a u64, i.e. changing MAX_TEST_CPUS to be greater than 64 will result in a variety of out of bounds accesses.
--- lib/x86/smp.c | 2 -- x86/cstart.S | 2 +- x86/cstart64.S | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
lib/x86/smp.c +0 -2
@@ -113,8 +113,6 @@ int cpus_active(void)return atomic_read (&active_cpus); } -extern unsigned long long online_cpus; -void smp_init (void ) {int i;
x86/cstart.S +1 -1
@@ -208,7 +208,7 @@ smp_init_done: ret online_cpus: - .quad 0 + .fill max_cpus / 8, 1, 0 cpu_online_count: .word 1
x86/cstart64.S +1 -1
@@ -282,7 +282,7 @@ idt_descr: .quad boot_idt online_cpus: - .quad 0 + .fill max_cpus / 8, 1, 0 load_tss: lidtq idt_descr
Signature · 1 line
2.22.0
PATCH 3/3 x86: Bump max number of test CPUs to 255
In reply to Sean ChristophersonThe max number of CPUs is not actually enforced anywhere, e.g. manually setting '-smp 240' when running a unit test will cause random corruption and hangs during smp initialization. Increase the max number of test CPUs to 255, which is the true max kvm-unit-tests can support without significant changes, e.g. it would need to boot with x2APIC enabled, support interrupt remapping, etc...
There is no known use case for running with more than 64 CPUs, but the cost of supporting 255 is minimal, e.g. increases the size of each test binary by a few kbs and burns a few extra cycles in init_apic_map().
--- lib/x86/apic-defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/x86/apic-defs.h +1 -1
@@ -6,7 +6,7 @@* both in C and ASM */ -#define MAX_TEST_CPUS (64) +#define MAX_TEST_CPUS (255)/* * Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
Signature · 1 line
2.22.0
Paolo Bonzini
maintainerRe: [kvm-unit-tests PATCH 3/3] x86: Bump max number of test CPUs to 255
Quoted 22 lines · Sean Christopherson
The max number of CPUs is not actually enforced anywhere, e.g. manually setting '-smp 240' when running a unit test will cause random corruption and hangs during smp initialization. Increase the max number of test CPUs to 255, which is the true max kvm-unit-tests can support without significant changes, e.g. it would need to boot with x2APIC enabled, support interrupt remapping, etc...
There is no known use case for running with more than 64 CPUs, but the cost of supporting 255 is minimal, e.g. increases the size of each test binary by a few kbs and burns a few extra cycles in
init_apic_map().Signed-off-by Sean Christopherson <[email protected]>--- lib/x86/apic-defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/x86/apic-defs.h +0
-0
lib/x86/apic-defs.h line 12
Quoted 8 lines
lib/x86/apic-defs.h +1
-1@@ -6,7 +6,7 @@* both in C and ASM */ -#define MAX_TEST_CPUS (64) +#define MAX_TEST_CPUS (255)/* * Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
Since this is not a multiple of 8 anymore, the previous patch should have used (max_cpus + 7) / 8. Fixed that and queued.
Paolo
Quoted 10 lines · Sean Christopherson
Fix a bug Evgeny reported where
init_apic_map()can cause random corruption due accessing random bytes far beyond the bounds ofonline_cpus. Take the opportunity to bump the max number of test CPUs to a realistic maximum, i.e. what kvm-unit-tests can support without a major rework.Sean Christopherson (3):
x86: Fix out of bounds access when processingonline_cpus
x86: Declareonline_cpusbased onMAX_TEST_CPUS
x86: Bump max number of test CPUs to 255
Signature · 1 line
Peter Xu