Skip to content

Commit d097553

Browse files
author
Michael Tokarev
committed
i386/cpu: Fix cpu number overflow in CPUID.01H.EBX[23:16]
The legacy topology enumerated by CPUID.1.EBX[23:16] is defined in SDM Vol2: Bits 23-16: Maximum number of addressable IDs for logical processors in this physical package. When threads_per_socket > 255, it will 1) overwrite bits[31:24] which is apic_id, 2) bits [23:16] get truncated. Specifically, if launching the VM with -smp 256, the value written to EBX[23:16] is 0 because of data overflow. If the guest only supports legacy topology, without V2 Extended Topology enumerated by CPUID.0x1f or Extended Topology enumerated by CPUID.0x0b to support over 255 CPUs, the return of the kernel invoking cpu_smt_allowed() is false and APs (application processors) will fail to bring up. Then only CPU 0 is online, and others are offline. For example, launch VM via: qemu-system-x86_64 -M q35,accel=kvm,kernel-irqchip=split \ -cpu qemu64,cpuid-0xb=off -smp 256 -m 32G \ -drive file=guest.img,if=none,id=virtio-disk0,format=raw \ -device virtio-blk-pci,drive=virtio-disk0,bootindex=1 --nographic The guest shows: CPU(s): 256 On-line CPU(s) list: 0 Off-line CPU(s) list: 1-255 To avoid this issue caused by overflow, limit the max value written to EBX[23:16] to 255 as the HW does. Cc: [email protected] Reviewed-by: Xiaoyao Li <[email protected]> Signed-off-by: Qian Wen <[email protected]> Signed-off-by: Zhao Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> (cherry picked from commit a62fef58299562aae6667b8d8552247423e886b3) (Mjt: fixup for 10.0.x series due to missing v10.0.0-2217-gf985a1195b "i386/cpu: Fix number of addressable IDs field for CPUID.01H.EBX[23:16]") Signed-off-by: Michael Tokarev <[email protected]>
1 parent 2df7954 commit d097553

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

target/i386/cpu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6828,7 +6828,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
68286828
}
68296829
*edx = env->features[FEAT_1_EDX];
68306830
if (threads_per_pkg > 1) {
6831-
*ebx |= threads_per_pkg << 16;
6831+
/* Fixup overflow: max value for bits 23-16 is 255. */
6832+
*ebx |= MIN(threads_per_pkg, 255) << 16;
68326833
}
68336834
if (!cpu->enable_pmu) {
68346835
*ecx &= ~CPUID_EXT_PDCM;

0 commit comments

Comments
 (0)