| Message ID | 20230421214901.2053-1-eric.devolder@oracle.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ACPI: i386: bump MADT to revision 5 | expand |
Thoughts? eric On 4/21/23 16:48, Eric DeVolder wrote: > The following Linux kernel change broke CPU hotplug for MADT revision > less than 5. > > e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") > > Discussion on this topic can be located here: > > https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t > > which resulted in the following fixes Linux in 6.3-rc5: > > a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") > fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") > > However, as part of the investigation into resolving this breakage, I > learned that i386 QEMU reports revision 1, while technically it > generates revision 3. Aarch64 generates and reports revision 4. > > ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable > flag that the above Linux patch utilizes to denote hot pluggable CPUs. > > So in order to bump MADT to the current revision of 5, need to > validate that all MADT table changes between 1 and 5 are present > in QEMU. > > Below is a table summarizing the changes to the MADT. This information > gleamed from the ACPI specs on uefi.org. > > ACPI MADT What > Version Version > 1.0 MADT not present > 2.0 1 Section 5.2.10.4 > 3.0 2 Section 5.2.11.4 > 5.2.11.13 Local SAPIC Structure added two new fields: > ACPI Processor UID Value > ACPI Processor UID String > 5.2.10.14 Platform Interrupt Sources Structure: > Reserved changed to Platform Interrupt Sources Flags > 3.0b 2 Section 5.2.11.4 > Added a section describing guidelines for the ordering of > processors in the MADT to support proper boot processor > and multi-threaded logical processor operation. > 4.0 3 Section 5.2.12 > Adds Processor Local x2APIC structure type 9 > Adds Local x2APIC NMI structure type 0xA > 5.0 3 Section 5.2.12 > 6.0 3 Section 5.2.12 > 6.0a 4 Section 5.2.12 > Adds ARM GIC structure types 0xB-0xF > 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! > 6.2b 5 Section 5.2.12 > GIC ITS last Reserved offset changed to 16 from 20 (typo) > 6.3 5 Section 5.2.12 > Adds Local APIC Flags Online Capable! > Adds GICC SPE Overflow Interrupt field > 6.4 5 Section 5.2.12 > Adds Multiprocessor Wakeup Structure type 0x10 > (change notes says structure previously misplaced?) > 6.5 5 Section 5.2.12 > > For the MADT revision change 1 -> 2, the spec has a change to the > SAPIC structure. In general, QEMU does not generate/support SAPIC. > So the QEMU i386 MADT revision can safely be moved to 2. > > For the MADT revision change 2 -> 3, the spec adds Local x2APIC > structures. QEMU has long supported x2apic ACPI structures. A simple > search of x2apic within QEMU source and hw/i386/acpi-common.c > specifically reveals this. So the QEMU i386 MADT revision can safely > be moved to 3. > > For the MADT revision change 3 -> 4, the spec adds support for the ARM > GIC structures. QEMU ARM does in fact generate and report revision 4. > As these will not be used by i386 QEMU, so then the QEMU i386 MADT > revision can safely be moved to 4 as well. > > Now for the MADT revision change 4 -> 5, the spec adds the Online > Capable flag to the Local APIC structure, and the ARM GICC SPE > Overflow Interrupt field. > > For i386, the ARM SPE is not applicable. > > For the i386 Local APIC flag Online Capable, the spec has certain rules > about this value. And in particuar setting this value now explicitly > indicates a hotpluggable CPU. > > So this patch makes the needed changes to move i386 MADT to > revision 5. > > Without these changes, the information below shows "how" CPU hotplug > breaks with the current upstream Linux kernel 6.3. For example, a Linux > guest started with: > > qemu-system-x86_64 -smp 30,maxcpus=32 ... > > and then attempting to hotplug a CPU: > > (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 > > fails with the following: > > APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. > ACPI: Unable to map lapic to logical cpu number > acpi LNXCPU:1e: Enumeration failure > > # dmesg | grep smpboot > smpboot: Allowing 30 CPUs, 0 hotplug CPUs > smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) > smpboot: Max logical packages: 1 > smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > > # iasl -d /sys/firmware/tables/acpi/APIC > [000h 0000 4] Signature : "APIC" [Multiple APIC Descript > [004h 0004 4] Table Length : 00000170 > [008h 0008 1] Revision : 01 <===== > [009h 0009 1] Checksum : 9C > [00Ah 0010 6] Oem ID : "BOCHS " > [010h 0016 8] Oem Table ID : "BXPC " > [018h 0024 4] Oem Revision : 00000001 > [01Ch 0028 4] Asl Compiler ID : "BXPC" > [020h 0032 4] Asl Compiler Revision : 00000001 > > ... > > [114h 0276 1] Subtable Type : 00 [Processor Local APIC] > [115h 0277 1] Length : 08 > [116h 0278 1] Processor ID : 1D > [117h 0279 1] Local Apic ID : 1D > [118h 0280 4] Flags (decoded below) : 00000001 > Processor Enabled : 1 <===== > > [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] > [11Dh 0285 1] Length : 08 > [11Eh 0286 1] Processor ID : 1E > [11Fh 0287 1] Local Apic ID : 1E > [120h 0288 4] Flags (decoded below) : 00000000 > Processor Enabled : 0 <===== > > [124h 0292 1] Subtable Type : 00 [Processor Local APIC] > [125h 0293 1] Length : 08 > [126h 0294 1] Processor ID : 1F > [127h 0295 1] Local Apic ID : 1F > [128h 0296 4] Flags (decoded below) : 00000000 > Processor Enabled : 0 <===== > > The (latest upstream) Linux kernel sees 30 Enabled processors, and > does not consider processors 31 and 32 to be hotpluggable. > > With this patch series applied, by bumping MADT to revision 5, the > latest upstream Linux kernel correctly identifies 30 CPUs plus 2 > hotpluggable CPUS. > > CPU30 has been hot-added > smpboot: Booting Node 0 Processor 30 APIC 0x1e > Will online and init hotplugged CPU: 30 > > # dmesg | grep smpboot > smpboot: Allowing 32 CPUs, 2 hotplug CPUs > smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) > smpboot: Max logical packages: 2 > smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > > # iasl -d /sys/firmware/tables/acpi/APIC > [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript > [004h 0004 004h] Table Length : 00000170 > [008h 0008 001h] Revision : 05 <===== > [009h 0009 001h] Checksum : 94 > [00Ah 0010 006h] Oem ID : "BOCHS " > [010h 0016 008h] Oem Table ID : "BXPC " > [018h 0024 004h] Oem Revision : 00000001 > [01Ch 0028 004h] Asl Compiler ID : "BXPC" > [020h 0032 004h] Asl Compiler Revision : 00000001 > > ... > > [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] > [115h 0277 001h] Length : 08 > [116h 0278 001h] Processor ID : 1D > [117h 0279 001h] Local Apic ID : 1D > [118h 0280 004h] Flags (decoded below) : 00000001 > Processor Enabled : 1 <===== > Runtime Online Capable : 0 <===== > > [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] > [11Dh 0285 001h] Length : 08 > [11Eh 0286 001h] Processor ID : 1E > [11Fh 0287 001h] Local Apic ID : 1E > [120h 0288 004h] Flags (decoded below) : 00000002 > Processor Enabled : 0 <===== > Runtime Online Capable : 1 <===== > > [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] > [125h 0293 001h] Length : 08 > [126h 0294 001h] Processor ID : 1F > [127h 0295 001h] Local Apic ID : 1F > [128h 0296 004h] Flags (decoded below) : 00000002 > Processor Enabled : 0 <===== > Runtime Online Capable : 1 <===== > > In terms of testing older operating systems, I did: > > - Windows Server 2008. > By opening Device Manager -> Processors, and watching/counting > the listed CPUs before and after hot un/plug operations. > When hot plugging a CPU, the new processor shows in the list; > one more processor is available after the hotplug. > When hot unplugging a CPU, Windows refuses, with the message: > > The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not > removable and cannot be ejected or unplugged. > > This is expected as hot unplug did not work in Windows 2008. > > - RHEL 6.9 > Kernel 2.6.32-696.el6.x86_64 > Build Feb 21 2017 > From dmesg: > ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) > SMP: Allowing 16 CPUs, 8 hotplug CPUs > > # cat /sys/devices/system/cpu/online > 0-7 > > (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 > > CPU 8 got hotplugged > Booting Node 0 Processor 8 APIC 0x8 > kvm-clock: cpu 8, msr 2830ed00 > Will online and init hotplugged CPU: 8 > microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c > platform microcode: firmware: requesting intel-ucode/06-56-03 > > # cat /sys/devices/system/cpu/online > 0-8 > > (QEMU) device_del id=cpu8 > > Broke affinity for irq 24 > CPU 8 is now offline > > # cat /sys/devices/system/cpu/online > 0-7 > > RHEL 6.9 > kernel 2.6.32-696.el6.x86_64 > build Feb 21 2017 > > Both of the above 'legacy' operating systems behaved as expected. > > Regards, > Eric > > --- > v3: 21apr2023 > - Dropped ARM patch as there is no compelling need to move to > MADT revision 5, per Michael Tsirkin. > - Recoded the flags to be simpler, per Michael, Ani Sinha and > Miguel Luis. > - Regenerated the binary tables, as per bios-tables-test.c > instructions. > > v2: 18apr2023 > https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html > - Code formatting changes per Igor Mammedov > - Included the steps in bios-tables-test. > > v1: 28mar2023 > https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html > - Initial series for ARM and i386 MADT revision bump to 5. > Eric DeVolder (3): > ACPI: bios-tables-test.c step 2 (allowed-diff entries) > hw/acpi: i386: bump MADT to revision 5 > ACPI: bios-tables-test.c step 5 (updated expected table binaries) > > hw/i386/acpi-common.c | 4 ++-- > tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes > tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes > tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes > tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes > tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes > tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes > tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes > tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes > tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes > tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes > tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes > tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes > tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes > tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes > 15 files changed, 2 insertions(+), 2 deletions(-) >
On Fri, 5 May 2023 16:53:22 -0500 Eric DeVolder <eric.devolder@oracle.com> wrote: > Thoughts? I still don't think we need to bump x86 to rev 5 in QEMU. > eric > > On 4/21/23 16:48, Eric DeVolder wrote: > > The following Linux kernel change broke CPU hotplug for MADT revision > > less than 5. > > > > e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") > > > > Discussion on this topic can be located here: > > > > https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t have your kernel fix landed up upstream? > > > > which resulted in the following fixes Linux in 6.3-rc5: > > > > a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") > > fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") > > > > However, as part of the investigation into resolving this breakage, I > > learned that i386 QEMU reports revision 1, while technically it > > generates revision 3. Aarch64 generates and reports revision 4. > > > > ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable > > flag that the above Linux patch utilizes to denote hot pluggable CPUs. > > > > So in order to bump MADT to the current revision of 5, need to > > validate that all MADT table changes between 1 and 5 are present > > in QEMU. > > > > Below is a table summarizing the changes to the MADT. This information > > gleamed from the ACPI specs on uefi.org. > > > > ACPI MADT What > > Version Version > > 1.0 MADT not present > > 2.0 1 Section 5.2.10.4 > > 3.0 2 Section 5.2.11.4 > > 5.2.11.13 Local SAPIC Structure added two new fields: > > ACPI Processor UID Value > > ACPI Processor UID String > > 5.2.10.14 Platform Interrupt Sources Structure: > > Reserved changed to Platform Interrupt Sources Flags > > 3.0b 2 Section 5.2.11.4 > > Added a section describing guidelines for the ordering of > > processors in the MADT to support proper boot processor > > and multi-threaded logical processor operation. > > 4.0 3 Section 5.2.12 > > Adds Processor Local x2APIC structure type 9 > > Adds Local x2APIC NMI structure type 0xA > > 5.0 3 Section 5.2.12 > > 6.0 3 Section 5.2.12 > > 6.0a 4 Section 5.2.12 > > Adds ARM GIC structure types 0xB-0xF > > 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! > > 6.2b 5 Section 5.2.12 > > GIC ITS last Reserved offset changed to 16 from 20 (typo) > > 6.3 5 Section 5.2.12 > > Adds Local APIC Flags Online Capable! > > Adds GICC SPE Overflow Interrupt field > > 6.4 5 Section 5.2.12 > > Adds Multiprocessor Wakeup Structure type 0x10 > > (change notes says structure previously misplaced?) > > 6.5 5 Section 5.2.12 > > > > For the MADT revision change 1 -> 2, the spec has a change to the > > SAPIC structure. In general, QEMU does not generate/support SAPIC. > > So the QEMU i386 MADT revision can safely be moved to 2. > > > > For the MADT revision change 2 -> 3, the spec adds Local x2APIC > > structures. QEMU has long supported x2apic ACPI structures. A simple > > search of x2apic within QEMU source and hw/i386/acpi-common.c > > specifically reveals this. So the QEMU i386 MADT revision can safely > > be moved to 3. > > > > For the MADT revision change 3 -> 4, the spec adds support for the ARM > > GIC structures. QEMU ARM does in fact generate and report revision 4. > > As these will not be used by i386 QEMU, so then the QEMU i386 MADT > > revision can safely be moved to 4 as well. > > > > Now for the MADT revision change 4 -> 5, the spec adds the Online > > Capable flag to the Local APIC structure, and the ARM GICC SPE > > Overflow Interrupt field. All ARM stuff is irrelevant in x86 patch > > For i386, the ARM SPE is not applicable. > > > > For the i386 Local APIC flag Online Capable, the spec has certain rules > > about this value. And in particuar setting this value now explicitly > > indicates a hotpluggable CPU. > > > > So this patch makes the needed changes to move i386 MADT to > > revision 5. > > > > Without these changes, the information below shows "how" CPU hotplug > > breaks with the current upstream Linux kernel 6.3. For example, a Linux > > guest started with: what's the status wrt current upstream kernel? > > qemu-system-x86_64 -smp 30,maxcpus=32 ... > > > > and then attempting to hotplug a CPU: > > > > (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 > > > > fails with the following: > > > > APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. > > ACPI: Unable to map lapic to logical cpu number > > acpi LNXCPU:1e: Enumeration failure > > > > # dmesg | grep smpboot > > smpboot: Allowing 30 CPUs, 0 hotplug CPUs > > smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) > > smpboot: Max logical packages: 1 > > smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > > > > # iasl -d /sys/firmware/tables/acpi/APIC > > [000h 0000 4] Signature : "APIC" [Multiple APIC Descript > > [004h 0004 4] Table Length : 00000170 > > [008h 0008 1] Revision : 01 <===== > > [009h 0009 1] Checksum : 9C > > [00Ah 0010 6] Oem ID : "BOCHS " > > [010h 0016 8] Oem Table ID : "BXPC " > > [018h 0024 4] Oem Revision : 00000001 > > [01Ch 0028 4] Asl Compiler ID : "BXPC" > > [020h 0032 4] Asl Compiler Revision : 00000001 > > > > ... > > > > [114h 0276 1] Subtable Type : 00 [Processor Local APIC] > > [115h 0277 1] Length : 08 > > [116h 0278 1] Processor ID : 1D > > [117h 0279 1] Local Apic ID : 1D > > [118h 0280 4] Flags (decoded below) : 00000001 > > Processor Enabled : 1 <===== > > > > [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] > > [11Dh 0285 1] Length : 08 > > [11Eh 0286 1] Processor ID : 1E > > [11Fh 0287 1] Local Apic ID : 1E > > [120h 0288 4] Flags (decoded below) : 00000000 > > Processor Enabled : 0 <===== > > > > [124h 0292 1] Subtable Type : 00 [Processor Local APIC] > > [125h 0293 1] Length : 08 > > [126h 0294 1] Processor ID : 1F > > [127h 0295 1] Local Apic ID : 1F > > [128h 0296 4] Flags (decoded below) : 00000000 > > Processor Enabled : 0 <===== > > > > The (latest upstream) Linux kernel sees 30 Enabled processors, and > > does not consider processors 31 and 32 to be hotpluggable. > > > > With this patch series applied, by bumping MADT to revision 5, the > > latest upstream Linux kernel correctly identifies 30 CPUs plus 2 > > hotpluggable CPUS. > > > > CPU30 has been hot-added > > smpboot: Booting Node 0 Processor 30 APIC 0x1e > > Will online and init hotplugged CPU: 30 > > > > # dmesg | grep smpboot > > smpboot: Allowing 32 CPUs, 2 hotplug CPUs > > smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) > > smpboot: Max logical packages: 2 > > smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > > > > # iasl -d /sys/firmware/tables/acpi/APIC > > [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript > > [004h 0004 004h] Table Length : 00000170 > > [008h 0008 001h] Revision : 05 <===== > > [009h 0009 001h] Checksum : 94 > > [00Ah 0010 006h] Oem ID : "BOCHS " > > [010h 0016 008h] Oem Table ID : "BXPC " > > [018h 0024 004h] Oem Revision : 00000001 > > [01Ch 0028 004h] Asl Compiler ID : "BXPC" > > [020h 0032 004h] Asl Compiler Revision : 00000001 > > > > ... > > > > [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] > > [115h 0277 001h] Length : 08 > > [116h 0278 001h] Processor ID : 1D > > [117h 0279 001h] Local Apic ID : 1D > > [118h 0280 004h] Flags (decoded below) : 00000001 > > Processor Enabled : 1 <===== > > Runtime Online Capable : 0 <===== > > > > [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] > > [11Dh 0285 001h] Length : 08 > > [11Eh 0286 001h] Processor ID : 1E > > [11Fh 0287 001h] Local Apic ID : 1E > > [120h 0288 004h] Flags (decoded below) : 00000002 > > Processor Enabled : 0 <===== > > Runtime Online Capable : 1 <===== > > > > [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] > > [125h 0293 001h] Length : 08 > > [126h 0294 001h] Processor ID : 1F > > [127h 0295 001h] Local Apic ID : 1F > > [128h 0296 004h] Flags (decoded below) : 00000002 > > Processor Enabled : 0 <===== > > Runtime Online Capable : 1 <===== > > > > In terms of testing older operating systems, I did: > > > > - Windows Server 2008. > > By opening Device Manager -> Processors, and watching/counting > > the listed CPUs before and after hot un/plug operations. > > When hot plugging a CPU, the new processor shows in the list; > > one more processor is available after the hotplug. > > When hot unplugging a CPU, Windows refuses, with the message: > > > > The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not > > removable and cannot be ejected or unplugged. > > > > This is expected as hot unplug did not work in Windows 2008. > > > > - RHEL 6.9 > > Kernel 2.6.32-696.el6.x86_64 > > Build Feb 21 2017 > > From dmesg: > > ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) > > SMP: Allowing 16 CPUs, 8 hotplug CPUs > > > > # cat /sys/devices/system/cpu/online > > 0-7 > > > > (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 > > > > CPU 8 got hotplugged > > Booting Node 0 Processor 8 APIC 0x8 > > kvm-clock: cpu 8, msr 2830ed00 > > Will online and init hotplugged CPU: 8 > > microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c > > platform microcode: firmware: requesting intel-ucode/06-56-03 > > > > # cat /sys/devices/system/cpu/online > > 0-8 > > > > (QEMU) device_del id=cpu8 > > > > Broke affinity for irq 24 > > CPU 8 is now offline > > > > # cat /sys/devices/system/cpu/online > > 0-7 > > > > RHEL 6.9 > > kernel 2.6.32-696.el6.x86_64 > > build Feb 21 2017 > > > > Both of the above 'legacy' operating systems behaved as expected. > > > > Regards, > > Eric > > > > --- > > v3: 21apr2023 > > - Dropped ARM patch as there is no compelling need to move to > > MADT revision 5, per Michael Tsirkin. > > - Recoded the flags to be simpler, per Michael, Ani Sinha and > > Miguel Luis. > > - Regenerated the binary tables, as per bios-tables-test.c > > instructions. > > > > v2: 18apr2023 > > https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html > > - Code formatting changes per Igor Mammedov > > - Included the steps in bios-tables-test. > > > > v1: 28mar2023 > > https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html > > - Initial series for ARM and i386 MADT revision bump to 5. > > Eric DeVolder (3): > > ACPI: bios-tables-test.c step 2 (allowed-diff entries) > > hw/acpi: i386: bump MADT to revision 5 > > ACPI: bios-tables-test.c step 5 (updated expected table binaries) > > > > hw/i386/acpi-common.c | 4 ++-- > > tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes > > tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes > > tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes > > tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes > > tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes > > tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes > > tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes > > tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes > > tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes > > tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes > > tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes > > tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes > > tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes > > tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes > > 15 files changed, 2 insertions(+), 2 deletions(-) > > >
On 5/10/23 03:14, Igor Mammedov wrote: > On Fri, 5 May 2023 16:53:22 -0500 > Eric DeVolder <eric.devolder@oracle.com> wrote: > >> Thoughts? > > I still don't think we need to bump x86 to rev 5 in QEMU. Linux v6.3 has the fix merged (so crisis averted 8). The investigation allowed me to opportunistically provide this patch. I think this should receive serious consideration for merging, more so because generating MADT .revision 3 and reporting .revision 1 seems wrong to me. This patch seems really straight forward, and low risk, now. > >> eric >> >> On 4/21/23 16:48, Eric DeVolder wrote: >>> The following Linux kernel change broke CPU hotplug for MADT revision >>> less than 5. >>> >>> e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") >>> >>> Discussion on this topic can be located here: >>> >>> https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t > > have your kernel fix landed up upstream? > Yes, merged and available in v6.3. >>> >>> which resulted in the following fixes Linux in 6.3-rc5: >>> >>> a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") >>> fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") >>> >>> However, as part of the investigation into resolving this breakage, I >>> learned that i386 QEMU reports revision 1, while technically it >>> generates revision 3. Aarch64 generates and reports revision 4. >>> >>> ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable >>> flag that the above Linux patch utilizes to denote hot pluggable CPUs. >>> >>> So in order to bump MADT to the current revision of 5, need to >>> validate that all MADT table changes between 1 and 5 are present >>> in QEMU. >>> >>> Below is a table summarizing the changes to the MADT. This information >>> gleamed from the ACPI specs on uefi.org. >>> >>> ACPI MADT What >>> Version Version >>> 1.0 MADT not present >>> 2.0 1 Section 5.2.10.4 >>> 3.0 2 Section 5.2.11.4 >>> 5.2.11.13 Local SAPIC Structure added two new fields: >>> ACPI Processor UID Value >>> ACPI Processor UID String >>> 5.2.10.14 Platform Interrupt Sources Structure: >>> Reserved changed to Platform Interrupt Sources Flags >>> 3.0b 2 Section 5.2.11.4 >>> Added a section describing guidelines for the ordering of >>> processors in the MADT to support proper boot processor >>> and multi-threaded logical processor operation. >>> 4.0 3 Section 5.2.12 >>> Adds Processor Local x2APIC structure type 9 >>> Adds Local x2APIC NMI structure type 0xA >>> 5.0 3 Section 5.2.12 >>> 6.0 3 Section 5.2.12 >>> 6.0a 4 Section 5.2.12 >>> Adds ARM GIC structure types 0xB-0xF >>> 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! >>> 6.2b 5 Section 5.2.12 >>> GIC ITS last Reserved offset changed to 16 from 20 (typo) >>> 6.3 5 Section 5.2.12 >>> Adds Local APIC Flags Online Capable! >>> Adds GICC SPE Overflow Interrupt field >>> 6.4 5 Section 5.2.12 >>> Adds Multiprocessor Wakeup Structure type 0x10 >>> (change notes says structure previously misplaced?) >>> 6.5 5 Section 5.2.12 >>> >>> For the MADT revision change 1 -> 2, the spec has a change to the >>> SAPIC structure. In general, QEMU does not generate/support SAPIC. >>> So the QEMU i386 MADT revision can safely be moved to 2. >>> >>> For the MADT revision change 2 -> 3, the spec adds Local x2APIC >>> structures. QEMU has long supported x2apic ACPI structures. A simple >>> search of x2apic within QEMU source and hw/i386/acpi-common.c >>> specifically reveals this. So the QEMU i386 MADT revision can safely >>> be moved to 3. >>> >>> For the MADT revision change 3 -> 4, the spec adds support for the ARM >>> GIC structures. QEMU ARM does in fact generate and report revision 4. >>> As these will not be used by i386 QEMU, so then the QEMU i386 MADT >>> revision can safely be moved to 4 as well. >>> >>> Now for the MADT revision change 4 -> 5, the spec adds the Online >>> Capable flag to the Local APIC structure, and the ARM GICC SPE >>> Overflow Interrupt field. > > All ARM stuff is irrelevant in x86 patch > sure >>> For i386, the ARM SPE is not applicable. >>> >>> For the i386 Local APIC flag Online Capable, the spec has certain rules >>> about this value. And in particuar setting this value now explicitly >>> indicates a hotpluggable CPU. >>> >>> So this patch makes the needed changes to move i386 MADT to >>> revision 5. >>> >>> Without these changes, the information below shows "how" CPU hotplug >>> breaks with the current upstream Linux kernel 6.3. For example, a Linux >>> guest started with: > > what's the status wrt current upstream kernel? > qemu cpu hotplug works with upstream kernel ( >= v6.3) but only because the kernel fix allows the legacy fallback assumption that the non Enabled cpus specified in MADT are online capable. with this patch applied to qemu, the kernel honors the Online Capable bit for cpus not Enabled at boot. >>> qemu-system-x86_64 -smp 30,maxcpus=32 ... >>> >>> and then attempting to hotplug a CPU: >>> >>> (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 >>> >>> fails with the following: >>> >>> APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. >>> ACPI: Unable to map lapic to logical cpu number >>> acpi LNXCPU:1e: Enumeration failure >>> >>> # dmesg | grep smpboot >>> smpboot: Allowing 30 CPUs, 0 hotplug CPUs >>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) >>> smpboot: Max logical packages: 1 >>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) >>> >>> # iasl -d /sys/firmware/tables/acpi/APIC >>> [000h 0000 4] Signature : "APIC" [Multiple APIC Descript >>> [004h 0004 4] Table Length : 00000170 >>> [008h 0008 1] Revision : 01 <===== >>> [009h 0009 1] Checksum : 9C >>> [00Ah 0010 6] Oem ID : "BOCHS " >>> [010h 0016 8] Oem Table ID : "BXPC " >>> [018h 0024 4] Oem Revision : 00000001 >>> [01Ch 0028 4] Asl Compiler ID : "BXPC" >>> [020h 0032 4] Asl Compiler Revision : 00000001 >>> >>> ... >>> >>> [114h 0276 1] Subtable Type : 00 [Processor Local APIC] >>> [115h 0277 1] Length : 08 >>> [116h 0278 1] Processor ID : 1D >>> [117h 0279 1] Local Apic ID : 1D >>> [118h 0280 4] Flags (decoded below) : 00000001 >>> Processor Enabled : 1 <===== >>> >>> [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] >>> [11Dh 0285 1] Length : 08 >>> [11Eh 0286 1] Processor ID : 1E >>> [11Fh 0287 1] Local Apic ID : 1E >>> [120h 0288 4] Flags (decoded below) : 00000000 >>> Processor Enabled : 0 <===== >>> >>> [124h 0292 1] Subtable Type : 00 [Processor Local APIC] >>> [125h 0293 1] Length : 08 >>> [126h 0294 1] Processor ID : 1F >>> [127h 0295 1] Local Apic ID : 1F >>> [128h 0296 4] Flags (decoded below) : 00000000 >>> Processor Enabled : 0 <===== >>> >>> The (latest upstream) Linux kernel sees 30 Enabled processors, and >>> does not consider processors 31 and 32 to be hotpluggable. >>> >>> With this patch series applied, by bumping MADT to revision 5, the >>> latest upstream Linux kernel correctly identifies 30 CPUs plus 2 >>> hotpluggable CPUS. >>> >>> CPU30 has been hot-added >>> smpboot: Booting Node 0 Processor 30 APIC 0x1e >>> Will online and init hotplugged CPU: 30 >>> >>> # dmesg | grep smpboot >>> smpboot: Allowing 32 CPUs, 2 hotplug CPUs >>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) >>> smpboot: Max logical packages: 2 >>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) >>> >>> # iasl -d /sys/firmware/tables/acpi/APIC >>> [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript >>> [004h 0004 004h] Table Length : 00000170 >>> [008h 0008 001h] Revision : 05 <===== >>> [009h 0009 001h] Checksum : 94 >>> [00Ah 0010 006h] Oem ID : "BOCHS " >>> [010h 0016 008h] Oem Table ID : "BXPC " >>> [018h 0024 004h] Oem Revision : 00000001 >>> [01Ch 0028 004h] Asl Compiler ID : "BXPC" >>> [020h 0032 004h] Asl Compiler Revision : 00000001 >>> >>> ... >>> >>> [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] >>> [115h 0277 001h] Length : 08 >>> [116h 0278 001h] Processor ID : 1D >>> [117h 0279 001h] Local Apic ID : 1D >>> [118h 0280 004h] Flags (decoded below) : 00000001 >>> Processor Enabled : 1 <===== >>> Runtime Online Capable : 0 <===== >>> >>> [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] >>> [11Dh 0285 001h] Length : 08 >>> [11Eh 0286 001h] Processor ID : 1E >>> [11Fh 0287 001h] Local Apic ID : 1E >>> [120h 0288 004h] Flags (decoded below) : 00000002 >>> Processor Enabled : 0 <===== >>> Runtime Online Capable : 1 <===== >>> >>> [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] >>> [125h 0293 001h] Length : 08 >>> [126h 0294 001h] Processor ID : 1F >>> [127h 0295 001h] Local Apic ID : 1F >>> [128h 0296 004h] Flags (decoded below) : 00000002 >>> Processor Enabled : 0 <===== >>> Runtime Online Capable : 1 <===== >>> >>> In terms of testing older operating systems, I did: >>> >>> - Windows Server 2008. >>> By opening Device Manager -> Processors, and watching/counting >>> the listed CPUs before and after hot un/plug operations. >>> When hot plugging a CPU, the new processor shows in the list; >>> one more processor is available after the hotplug. >>> When hot unplugging a CPU, Windows refuses, with the message: >>> >>> The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not >>> removable and cannot be ejected or unplugged. >>> >>> This is expected as hot unplug did not work in Windows 2008. >>> >>> - RHEL 6.9 >>> Kernel 2.6.32-696.el6.x86_64 >>> Build Feb 21 2017 >>> From dmesg: >>> ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) >>> SMP: Allowing 16 CPUs, 8 hotplug CPUs >>> >>> # cat /sys/devices/system/cpu/online >>> 0-7 >>> >>> (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 >>> >>> CPU 8 got hotplugged >>> Booting Node 0 Processor 8 APIC 0x8 >>> kvm-clock: cpu 8, msr 2830ed00 >>> Will online and init hotplugged CPU: 8 >>> microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c >>> platform microcode: firmware: requesting intel-ucode/06-56-03 >>> >>> # cat /sys/devices/system/cpu/online >>> 0-8 >>> >>> (QEMU) device_del id=cpu8 >>> >>> Broke affinity for irq 24 >>> CPU 8 is now offline >>> >>> # cat /sys/devices/system/cpu/online >>> 0-7 >>> >>> RHEL 6.9 >>> kernel 2.6.32-696.el6.x86_64 >>> build Feb 21 2017 >>> >>> Both of the above 'legacy' operating systems behaved as expected. >>> >>> Regards, >>> Eric >>> >>> --- >>> v3: 21apr2023 >>> - Dropped ARM patch as there is no compelling need to move to >>> MADT revision 5, per Michael Tsirkin. >>> - Recoded the flags to be simpler, per Michael, Ani Sinha and >>> Miguel Luis. >>> - Regenerated the binary tables, as per bios-tables-test.c >>> instructions. >>> >>> v2: 18apr2023 >>> https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html >>> - Code formatting changes per Igor Mammedov >>> - Included the steps in bios-tables-test. >>> >>> v1: 28mar2023 >>> https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html >>> - Initial series for ARM and i386 MADT revision bump to 5. >>> Eric DeVolder (3): >>> ACPI: bios-tables-test.c step 2 (allowed-diff entries) >>> hw/acpi: i386: bump MADT to revision 5 >>> ACPI: bios-tables-test.c step 5 (updated expected table binaries) >>> >>> hw/i386/acpi-common.c | 4 ++-- >>> tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes >>> tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes >>> tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes >>> tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes >>> tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes >>> tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes >>> tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes >>> tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes >>> tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes >>> tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes >>> tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes >>> tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes >>> tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes >>> tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes >>> 15 files changed, 2 insertions(+), 2 deletions(-) >>> >> >
On Wed, 10 May 2023 10:08:50 -0500 Eric DeVolder <eric.devolder@oracle.com> wrote: > On 5/10/23 03:14, Igor Mammedov wrote: > > On Fri, 5 May 2023 16:53:22 -0500 > > Eric DeVolder <eric.devolder@oracle.com> wrote: > > > >> Thoughts? > > > > I still don't think we need to bump x86 to rev 5 in QEMU. > > Linux v6.3 has the fix merged (so crisis averted 8). > The investigation allowed me to opportunistically provide this patch. > I think this should receive serious consideration for merging, > more so because generating MADT .revision 3 and reporting .revision 1 > seems wrong to me. It's a way much simpler to bump revision to 3 without introducing OnlineCapable handling. So if you post rev3 patch, I'll gladly ack it. (+include kernel commit ids of kernel side fix, so if someone stumbles upon it, one can easily find what to backport) > This patch seems really straight forward, and low risk, now. > > > > >> eric > >> > >> On 4/21/23 16:48, Eric DeVolder wrote: > >>> The following Linux kernel change broke CPU hotplug for MADT revision > >>> less than 5. > >>> > >>> e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") > >>> > >>> Discussion on this topic can be located here: > >>> > >>> https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t > > > > have your kernel fix landed up upstream? > > > Yes, merged and available in v6.3. > > >>> > >>> which resulted in the following fixes Linux in 6.3-rc5: > >>> > >>> a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") > >>> fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") > >>> > >>> However, as part of the investigation into resolving this breakage, I > >>> learned that i386 QEMU reports revision 1, while technically it > >>> generates revision 3. Aarch64 generates and reports revision 4. > >>> > >>> ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable > >>> flag that the above Linux patch utilizes to denote hot pluggable CPUs. > >>> > >>> So in order to bump MADT to the current revision of 5, need to > >>> validate that all MADT table changes between 1 and 5 are present > >>> in QEMU. > >>> > >>> Below is a table summarizing the changes to the MADT. This information > >>> gleamed from the ACPI specs on uefi.org. > >>> > >>> ACPI MADT What > >>> Version Version > >>> 1.0 MADT not present > >>> 2.0 1 Section 5.2.10.4 > >>> 3.0 2 Section 5.2.11.4 > >>> 5.2.11.13 Local SAPIC Structure added two new fields: > >>> ACPI Processor UID Value > >>> ACPI Processor UID String > >>> 5.2.10.14 Platform Interrupt Sources Structure: > >>> Reserved changed to Platform Interrupt Sources Flags > >>> 3.0b 2 Section 5.2.11.4 > >>> Added a section describing guidelines for the ordering of > >>> processors in the MADT to support proper boot processor > >>> and multi-threaded logical processor operation. > >>> 4.0 3 Section 5.2.12 > >>> Adds Processor Local x2APIC structure type 9 > >>> Adds Local x2APIC NMI structure type 0xA > >>> 5.0 3 Section 5.2.12 > >>> 6.0 3 Section 5.2.12 > >>> 6.0a 4 Section 5.2.12 > >>> Adds ARM GIC structure types 0xB-0xF > >>> 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! > >>> 6.2b 5 Section 5.2.12 > >>> GIC ITS last Reserved offset changed to 16 from 20 (typo) > >>> 6.3 5 Section 5.2.12 > >>> Adds Local APIC Flags Online Capable! > >>> Adds GICC SPE Overflow Interrupt field > >>> 6.4 5 Section 5.2.12 > >>> Adds Multiprocessor Wakeup Structure type 0x10 > >>> (change notes says structure previously misplaced?) > >>> 6.5 5 Section 5.2.12 > >>> > >>> For the MADT revision change 1 -> 2, the spec has a change to the > >>> SAPIC structure. In general, QEMU does not generate/support SAPIC. > >>> So the QEMU i386 MADT revision can safely be moved to 2. > >>> > >>> For the MADT revision change 2 -> 3, the spec adds Local x2APIC > >>> structures. QEMU has long supported x2apic ACPI structures. A simple > >>> search of x2apic within QEMU source and hw/i386/acpi-common.c > >>> specifically reveals this. So the QEMU i386 MADT revision can safely > >>> be moved to 3. > >>> > >>> For the MADT revision change 3 -> 4, the spec adds support for the ARM > >>> GIC structures. QEMU ARM does in fact generate and report revision 4. > >>> As these will not be used by i386 QEMU, so then the QEMU i386 MADT > >>> revision can safely be moved to 4 as well. > >>> > >>> Now for the MADT revision change 4 -> 5, the spec adds the Online > >>> Capable flag to the Local APIC structure, and the ARM GICC SPE > >>> Overflow Interrupt field. > > > > All ARM stuff is irrelevant in x86 patch > > > sure > > >>> For i386, the ARM SPE is not applicable. > >>> > >>> For the i386 Local APIC flag Online Capable, the spec has certain rules > >>> about this value. And in particuar setting this value now explicitly > >>> indicates a hotpluggable CPU. > >>> > >>> So this patch makes the needed changes to move i386 MADT to > >>> revision 5. > >>> > >>> Without these changes, the information below shows "how" CPU hotplug > >>> breaks with the current upstream Linux kernel 6.3. For example, a Linux > >>> guest started with: > > > > what's the status wrt current upstream kernel? > > > qemu cpu hotplug works with upstream kernel ( >= v6.3) but only because the > kernel fix allows the legacy fallback assumption that the non Enabled > cpus specified in MADT are online capable. Kernel should be able to handle MADT revisions below 5 correctly as well, so frankly speaking it's a kernel regression that's been fixed. (affected distros should pull in your kernel patch[es] if they are interested in cpu hotplug) It's great that you dug through all the mess they made in spec and found/fixed a bug in kernel. But that doesn't justify complicating QEMU [1] just to make recently broken kernel work or just because patch is already written. And no, all effort you put into figuring it out is not wasted, since the bug was fixed at the place of regression (kernel) and all involved have learned from it and grateful to you fixing it up. > with this patch applied to qemu, the kernel honors the Online Capable bit > for cpus not Enabled at boot. This is not really applicable/interesting to QEMU, I read this bit in spec as a workaround for hardware vendors that might simplify their life. 1) But it is useless for QEMU (see my reply in v2 or v1 review thread with analysis as to why). So I'd rather avoid adding 'Online Capable bit' to QEMU unless we have to do so (i.e. we would need MADTr5 for some other feature). > > > >>> qemu-system-x86_64 -smp 30,maxcpus=32 ... > >>> > >>> and then attempting to hotplug a CPU: > >>> > >>> (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 > >>> > >>> fails with the following: > >>> > >>> APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. > >>> ACPI: Unable to map lapic to logical cpu number > >>> acpi LNXCPU:1e: Enumeration failure > >>> > >>> # dmesg | grep smpboot > >>> smpboot: Allowing 30 CPUs, 0 hotplug CPUs > >>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) > >>> smpboot: Max logical packages: 1 > >>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > >>> > >>> # iasl -d /sys/firmware/tables/acpi/APIC > >>> [000h 0000 4] Signature : "APIC" [Multiple APIC Descript > >>> [004h 0004 4] Table Length : 00000170 > >>> [008h 0008 1] Revision : 01 <===== > >>> [009h 0009 1] Checksum : 9C > >>> [00Ah 0010 6] Oem ID : "BOCHS " > >>> [010h 0016 8] Oem Table ID : "BXPC " > >>> [018h 0024 4] Oem Revision : 00000001 > >>> [01Ch 0028 4] Asl Compiler ID : "BXPC" > >>> [020h 0032 4] Asl Compiler Revision : 00000001 > >>> > >>> ... > >>> > >>> [114h 0276 1] Subtable Type : 00 [Processor Local APIC] > >>> [115h 0277 1] Length : 08 > >>> [116h 0278 1] Processor ID : 1D > >>> [117h 0279 1] Local Apic ID : 1D > >>> [118h 0280 4] Flags (decoded below) : 00000001 > >>> Processor Enabled : 1 <===== > >>> > >>> [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] > >>> [11Dh 0285 1] Length : 08 > >>> [11Eh 0286 1] Processor ID : 1E > >>> [11Fh 0287 1] Local Apic ID : 1E > >>> [120h 0288 4] Flags (decoded below) : 00000000 > >>> Processor Enabled : 0 <===== > >>> > >>> [124h 0292 1] Subtable Type : 00 [Processor Local APIC] > >>> [125h 0293 1] Length : 08 > >>> [126h 0294 1] Processor ID : 1F > >>> [127h 0295 1] Local Apic ID : 1F > >>> [128h 0296 4] Flags (decoded below) : 00000000 > >>> Processor Enabled : 0 <===== > >>> > >>> The (latest upstream) Linux kernel sees 30 Enabled processors, and > >>> does not consider processors 31 and 32 to be hotpluggable. > >>> > >>> With this patch series applied, by bumping MADT to revision 5, the > >>> latest upstream Linux kernel correctly identifies 30 CPUs plus 2 > >>> hotpluggable CPUS. > >>> > >>> CPU30 has been hot-added > >>> smpboot: Booting Node 0 Processor 30 APIC 0x1e > >>> Will online and init hotplugged CPU: 30 > >>> > >>> # dmesg | grep smpboot > >>> smpboot: Allowing 32 CPUs, 2 hotplug CPUs > >>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) > >>> smpboot: Max logical packages: 2 > >>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) > >>> > >>> # iasl -d /sys/firmware/tables/acpi/APIC > >>> [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript > >>> [004h 0004 004h] Table Length : 00000170 > >>> [008h 0008 001h] Revision : 05 <===== > >>> [009h 0009 001h] Checksum : 94 > >>> [00Ah 0010 006h] Oem ID : "BOCHS " > >>> [010h 0016 008h] Oem Table ID : "BXPC " > >>> [018h 0024 004h] Oem Revision : 00000001 > >>> [01Ch 0028 004h] Asl Compiler ID : "BXPC" > >>> [020h 0032 004h] Asl Compiler Revision : 00000001 > >>> > >>> ... > >>> > >>> [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] > >>> [115h 0277 001h] Length : 08 > >>> [116h 0278 001h] Processor ID : 1D > >>> [117h 0279 001h] Local Apic ID : 1D > >>> [118h 0280 004h] Flags (decoded below) : 00000001 > >>> Processor Enabled : 1 <===== > >>> Runtime Online Capable : 0 <===== > >>> > >>> [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] > >>> [11Dh 0285 001h] Length : 08 > >>> [11Eh 0286 001h] Processor ID : 1E > >>> [11Fh 0287 001h] Local Apic ID : 1E > >>> [120h 0288 004h] Flags (decoded below) : 00000002 > >>> Processor Enabled : 0 <===== > >>> Runtime Online Capable : 1 <===== > >>> > >>> [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] > >>> [125h 0293 001h] Length : 08 > >>> [126h 0294 001h] Processor ID : 1F > >>> [127h 0295 001h] Local Apic ID : 1F > >>> [128h 0296 004h] Flags (decoded below) : 00000002 > >>> Processor Enabled : 0 <===== > >>> Runtime Online Capable : 1 <===== > >>> > >>> In terms of testing older operating systems, I did: > >>> > >>> - Windows Server 2008. > >>> By opening Device Manager -> Processors, and watching/counting > >>> the listed CPUs before and after hot un/plug operations. > >>> When hot plugging a CPU, the new processor shows in the list; > >>> one more processor is available after the hotplug. > >>> When hot unplugging a CPU, Windows refuses, with the message: > >>> > >>> The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not > >>> removable and cannot be ejected or unplugged. > >>> > >>> This is expected as hot unplug did not work in Windows 2008. > >>> > >>> - RHEL 6.9 > >>> Kernel 2.6.32-696.el6.x86_64 > >>> Build Feb 21 2017 > >>> From dmesg: > >>> ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) > >>> SMP: Allowing 16 CPUs, 8 hotplug CPUs > >>> > >>> # cat /sys/devices/system/cpu/online > >>> 0-7 > >>> > >>> (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 > >>> > >>> CPU 8 got hotplugged > >>> Booting Node 0 Processor 8 APIC 0x8 > >>> kvm-clock: cpu 8, msr 2830ed00 > >>> Will online and init hotplugged CPU: 8 > >>> microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c > >>> platform microcode: firmware: requesting intel-ucode/06-56-03 > >>> > >>> # cat /sys/devices/system/cpu/online > >>> 0-8 > >>> > >>> (QEMU) device_del id=cpu8 > >>> > >>> Broke affinity for irq 24 > >>> CPU 8 is now offline > >>> > >>> # cat /sys/devices/system/cpu/online > >>> 0-7 > >>> > >>> RHEL 6.9 > >>> kernel 2.6.32-696.el6.x86_64 > >>> build Feb 21 2017 > >>> > >>> Both of the above 'legacy' operating systems behaved as expected. > >>> > >>> Regards, > >>> Eric > >>> > >>> --- > >>> v3: 21apr2023 > >>> - Dropped ARM patch as there is no compelling need to move to > >>> MADT revision 5, per Michael Tsirkin. > >>> - Recoded the flags to be simpler, per Michael, Ani Sinha and > >>> Miguel Luis. > >>> - Regenerated the binary tables, as per bios-tables-test.c > >>> instructions. > >>> > >>> v2: 18apr2023 > >>> https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html > >>> - Code formatting changes per Igor Mammedov > >>> - Included the steps in bios-tables-test. > >>> > >>> v1: 28mar2023 > >>> https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html > >>> - Initial series for ARM and i386 MADT revision bump to 5. > >>> Eric DeVolder (3): > >>> ACPI: bios-tables-test.c step 2 (allowed-diff entries) > >>> hw/acpi: i386: bump MADT to revision 5 > >>> ACPI: bios-tables-test.c step 5 (updated expected table binaries) > >>> > >>> hw/i386/acpi-common.c | 4 ++-- > >>> tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes > >>> tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes > >>> tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes > >>> tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes > >>> tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes > >>> tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes > >>> tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes > >>> tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes > >>> tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes > >>> tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes > >>> tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes > >>> tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes > >>> tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes > >>> tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes > >>> 15 files changed, 2 insertions(+), 2 deletions(-) > >>> > >> > > >
On 5/10/23 10:45, Igor Mammedov wrote: > On Wed, 10 May 2023 10:08:50 -0500 > Eric DeVolder <eric.devolder@oracle.com> wrote: > >> On 5/10/23 03:14, Igor Mammedov wrote: >>> On Fri, 5 May 2023 16:53:22 -0500 >>> Eric DeVolder <eric.devolder@oracle.com> wrote: >>> >>>> Thoughts? >>> >>> I still don't think we need to bump x86 to rev 5 in QEMU. >> >> Linux v6.3 has the fix merged (so crisis averted 8). >> The investigation allowed me to opportunistically provide this patch. >> I think this should receive serious consideration for merging, >> more so because generating MADT .revision 3 and reporting .revision 1 >> seems wrong to me. > > It's a way much simpler to bump revision to 3 without introducing > OnlineCapable handling. So if you post rev3 patch, I'll gladly > ack it. > (+include kernel commit ids of kernel side fix, so if someone > stumbles upon it, one can easily find what to backport) > OK, I'll do that. It'll be next week as I'm on a short week this week. >> This patch seems really straight forward, and low risk, now. >> >>> >>>> eric >>>> >>>> On 4/21/23 16:48, Eric DeVolder wrote: >>>>> The following Linux kernel change broke CPU hotplug for MADT revision >>>>> less than 5. >>>>> >>>>> e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") >>>>> >>>>> Discussion on this topic can be located here: >>>>> >>>>> https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t >>> >>> have your kernel fix landed up upstream? >>> >> Yes, merged and available in v6.3. >> >>>>> >>>>> which resulted in the following fixes Linux in 6.3-rc5: >>>>> >>>>> a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") >>>>> fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") >>>>> >>>>> However, as part of the investigation into resolving this breakage, I >>>>> learned that i386 QEMU reports revision 1, while technically it >>>>> generates revision 3. Aarch64 generates and reports revision 4. >>>>> >>>>> ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable >>>>> flag that the above Linux patch utilizes to denote hot pluggable CPUs. >>>>> >>>>> So in order to bump MADT to the current revision of 5, need to >>>>> validate that all MADT table changes between 1 and 5 are present >>>>> in QEMU. >>>>> >>>>> Below is a table summarizing the changes to the MADT. This information >>>>> gleamed from the ACPI specs on uefi.org. >>>>> >>>>> ACPI MADT What >>>>> Version Version >>>>> 1.0 MADT not present >>>>> 2.0 1 Section 5.2.10.4 >>>>> 3.0 2 Section 5.2.11.4 >>>>> 5.2.11.13 Local SAPIC Structure added two new fields: >>>>> ACPI Processor UID Value >>>>> ACPI Processor UID String >>>>> 5.2.10.14 Platform Interrupt Sources Structure: >>>>> Reserved changed to Platform Interrupt Sources Flags >>>>> 3.0b 2 Section 5.2.11.4 >>>>> Added a section describing guidelines for the ordering of >>>>> processors in the MADT to support proper boot processor >>>>> and multi-threaded logical processor operation. >>>>> 4.0 3 Section 5.2.12 >>>>> Adds Processor Local x2APIC structure type 9 >>>>> Adds Local x2APIC NMI structure type 0xA >>>>> 5.0 3 Section 5.2.12 >>>>> 6.0 3 Section 5.2.12 >>>>> 6.0a 4 Section 5.2.12 >>>>> Adds ARM GIC structure types 0xB-0xF >>>>> 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! >>>>> 6.2b 5 Section 5.2.12 >>>>> GIC ITS last Reserved offset changed to 16 from 20 (typo) >>>>> 6.3 5 Section 5.2.12 >>>>> Adds Local APIC Flags Online Capable! >>>>> Adds GICC SPE Overflow Interrupt field >>>>> 6.4 5 Section 5.2.12 >>>>> Adds Multiprocessor Wakeup Structure type 0x10 >>>>> (change notes says structure previously misplaced?) >>>>> 6.5 5 Section 5.2.12 >>>>> >>>>> For the MADT revision change 1 -> 2, the spec has a change to the >>>>> SAPIC structure. In general, QEMU does not generate/support SAPIC. >>>>> So the QEMU i386 MADT revision can safely be moved to 2. >>>>> >>>>> For the MADT revision change 2 -> 3, the spec adds Local x2APIC >>>>> structures. QEMU has long supported x2apic ACPI structures. A simple >>>>> search of x2apic within QEMU source and hw/i386/acpi-common.c >>>>> specifically reveals this. So the QEMU i386 MADT revision can safely >>>>> be moved to 3. >>>>> >>>>> For the MADT revision change 3 -> 4, the spec adds support for the ARM >>>>> GIC structures. QEMU ARM does in fact generate and report revision 4. >>>>> As these will not be used by i386 QEMU, so then the QEMU i386 MADT >>>>> revision can safely be moved to 4 as well. >>>>> >>>>> Now for the MADT revision change 4 -> 5, the spec adds the Online >>>>> Capable flag to the Local APIC structure, and the ARM GICC SPE >>>>> Overflow Interrupt field. >>> >>> All ARM stuff is irrelevant in x86 patch >>> >> sure >> >>>>> For i386, the ARM SPE is not applicable. >>>>> >>>>> For the i386 Local APIC flag Online Capable, the spec has certain rules >>>>> about this value. And in particuar setting this value now explicitly >>>>> indicates a hotpluggable CPU. >>>>> >>>>> So this patch makes the needed changes to move i386 MADT to >>>>> revision 5. >>>>> >>>>> Without these changes, the information below shows "how" CPU hotplug >>>>> breaks with the current upstream Linux kernel 6.3. For example, a Linux >>>>> guest started with: >>> >>> what's the status wrt current upstream kernel? >>> >> qemu cpu hotplug works with upstream kernel ( >= v6.3) but only because the >> kernel fix allows the legacy fallback assumption that the non Enabled >> cpus specified in MADT are online capable. > > Kernel should be able to handle MADT revisions below 5 correctly as well, > so frankly speaking it's a kernel regression that's been fixed. > (affected distros should pull in your kernel patch[es] if > they are interested in cpu hotplug) > > It's great that you dug through all the mess they made in > spec and found/fixed a bug in kernel. > But that doesn't justify complicating QEMU [1] just to make > recently broken kernel work or just because patch is already > written. > > And no, all effort you put into figuring it out is not wasted, > since the bug was fixed at the place of regression (kernel) > and all involved have learned from it and grateful to you > fixing it up. > Of course! >> with this patch applied to qemu, the kernel honors the Online Capable bit >> for cpus not Enabled at boot. > > This is not really applicable/interesting to QEMU, > I read this bit in spec as a workaround for hardware vendors > that might simplify their life. True, but it is in the spec. And not complicated. > > 1) But it is useless for QEMU (see my reply in v2 or v1 review thread > with analysis as to why). > So I'd rather avoid adding 'Online Capable bit' to QEMU unless > we have to do so (i.e. we would need MADTr5 for some other feature). Afaik, OnlineCapable is the only feature added in .revision 5 (other than that ARM feature). eric > >> >> >>>>> qemu-system-x86_64 -smp 30,maxcpus=32 ... >>>>> >>>>> and then attempting to hotplug a CPU: >>>>> >>>>> (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 >>>>> >>>>> fails with the following: >>>>> >>>>> APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. >>>>> ACPI: Unable to map lapic to logical cpu number >>>>> acpi LNXCPU:1e: Enumeration failure >>>>> >>>>> # dmesg | grep smpboot >>>>> smpboot: Allowing 30 CPUs, 0 hotplug CPUs >>>>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) >>>>> smpboot: Max logical packages: 1 >>>>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) >>>>> >>>>> # iasl -d /sys/firmware/tables/acpi/APIC >>>>> [000h 0000 4] Signature : "APIC" [Multiple APIC Descript >>>>> [004h 0004 4] Table Length : 00000170 >>>>> [008h 0008 1] Revision : 01 <===== >>>>> [009h 0009 1] Checksum : 9C >>>>> [00Ah 0010 6] Oem ID : "BOCHS " >>>>> [010h 0016 8] Oem Table ID : "BXPC " >>>>> [018h 0024 4] Oem Revision : 00000001 >>>>> [01Ch 0028 4] Asl Compiler ID : "BXPC" >>>>> [020h 0032 4] Asl Compiler Revision : 00000001 >>>>> >>>>> ... >>>>> >>>>> [114h 0276 1] Subtable Type : 00 [Processor Local APIC] >>>>> [115h 0277 1] Length : 08 >>>>> [116h 0278 1] Processor ID : 1D >>>>> [117h 0279 1] Local Apic ID : 1D >>>>> [118h 0280 4] Flags (decoded below) : 00000001 >>>>> Processor Enabled : 1 <===== >>>>> >>>>> [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] >>>>> [11Dh 0285 1] Length : 08 >>>>> [11Eh 0286 1] Processor ID : 1E >>>>> [11Fh 0287 1] Local Apic ID : 1E >>>>> [120h 0288 4] Flags (decoded below) : 00000000 >>>>> Processor Enabled : 0 <===== >>>>> >>>>> [124h 0292 1] Subtable Type : 00 [Processor Local APIC] >>>>> [125h 0293 1] Length : 08 >>>>> [126h 0294 1] Processor ID : 1F >>>>> [127h 0295 1] Local Apic ID : 1F >>>>> [128h 0296 4] Flags (decoded below) : 00000000 >>>>> Processor Enabled : 0 <===== >>>>> >>>>> The (latest upstream) Linux kernel sees 30 Enabled processors, and >>>>> does not consider processors 31 and 32 to be hotpluggable. >>>>> >>>>> With this patch series applied, by bumping MADT to revision 5, the >>>>> latest upstream Linux kernel correctly identifies 30 CPUs plus 2 >>>>> hotpluggable CPUS. >>>>> >>>>> CPU30 has been hot-added >>>>> smpboot: Booting Node 0 Processor 30 APIC 0x1e >>>>> Will online and init hotplugged CPU: 30 >>>>> >>>>> # dmesg | grep smpboot >>>>> smpboot: Allowing 32 CPUs, 2 hotplug CPUs >>>>> smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) >>>>> smpboot: Max logical packages: 2 >>>>> smpboot: Total of 30 processors activated (125708.76 BogoMIPS) >>>>> >>>>> # iasl -d /sys/firmware/tables/acpi/APIC >>>>> [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript >>>>> [004h 0004 004h] Table Length : 00000170 >>>>> [008h 0008 001h] Revision : 05 <===== >>>>> [009h 0009 001h] Checksum : 94 >>>>> [00Ah 0010 006h] Oem ID : "BOCHS " >>>>> [010h 0016 008h] Oem Table ID : "BXPC " >>>>> [018h 0024 004h] Oem Revision : 00000001 >>>>> [01Ch 0028 004h] Asl Compiler ID : "BXPC" >>>>> [020h 0032 004h] Asl Compiler Revision : 00000001 >>>>> >>>>> ... >>>>> >>>>> [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] >>>>> [115h 0277 001h] Length : 08 >>>>> [116h 0278 001h] Processor ID : 1D >>>>> [117h 0279 001h] Local Apic ID : 1D >>>>> [118h 0280 004h] Flags (decoded below) : 00000001 >>>>> Processor Enabled : 1 <===== >>>>> Runtime Online Capable : 0 <===== >>>>> >>>>> [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] >>>>> [11Dh 0285 001h] Length : 08 >>>>> [11Eh 0286 001h] Processor ID : 1E >>>>> [11Fh 0287 001h] Local Apic ID : 1E >>>>> [120h 0288 004h] Flags (decoded below) : 00000002 >>>>> Processor Enabled : 0 <===== >>>>> Runtime Online Capable : 1 <===== >>>>> >>>>> [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] >>>>> [125h 0293 001h] Length : 08 >>>>> [126h 0294 001h] Processor ID : 1F >>>>> [127h 0295 001h] Local Apic ID : 1F >>>>> [128h 0296 004h] Flags (decoded below) : 00000002 >>>>> Processor Enabled : 0 <===== >>>>> Runtime Online Capable : 1 <===== >>>>> >>>>> In terms of testing older operating systems, I did: >>>>> >>>>> - Windows Server 2008. >>>>> By opening Device Manager -> Processors, and watching/counting >>>>> the listed CPUs before and after hot un/plug operations. >>>>> When hot plugging a CPU, the new processor shows in the list; >>>>> one more processor is available after the hotplug. >>>>> When hot unplugging a CPU, Windows refuses, with the message: >>>>> >>>>> The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not >>>>> removable and cannot be ejected or unplugged. >>>>> >>>>> This is expected as hot unplug did not work in Windows 2008. >>>>> >>>>> - RHEL 6.9 >>>>> Kernel 2.6.32-696.el6.x86_64 >>>>> Build Feb 21 2017 >>>>> From dmesg: >>>>> ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) >>>>> SMP: Allowing 16 CPUs, 8 hotplug CPUs >>>>> >>>>> # cat /sys/devices/system/cpu/online >>>>> 0-7 >>>>> >>>>> (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 >>>>> >>>>> CPU 8 got hotplugged >>>>> Booting Node 0 Processor 8 APIC 0x8 >>>>> kvm-clock: cpu 8, msr 2830ed00 >>>>> Will online and init hotplugged CPU: 8 >>>>> microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c >>>>> platform microcode: firmware: requesting intel-ucode/06-56-03 >>>>> >>>>> # cat /sys/devices/system/cpu/online >>>>> 0-8 >>>>> >>>>> (QEMU) device_del id=cpu8 >>>>> >>>>> Broke affinity for irq 24 >>>>> CPU 8 is now offline >>>>> >>>>> # cat /sys/devices/system/cpu/online >>>>> 0-7 >>>>> >>>>> RHEL 6.9 >>>>> kernel 2.6.32-696.el6.x86_64 >>>>> build Feb 21 2017 >>>>> >>>>> Both of the above 'legacy' operating systems behaved as expected. >>>>> >>>>> Regards, >>>>> Eric >>>>> >>>>> --- >>>>> v3: 21apr2023 >>>>> - Dropped ARM patch as there is no compelling need to move to >>>>> MADT revision 5, per Michael Tsirkin. >>>>> - Recoded the flags to be simpler, per Michael, Ani Sinha and >>>>> Miguel Luis. >>>>> - Regenerated the binary tables, as per bios-tables-test.c >>>>> instructions. >>>>> >>>>> v2: 18apr2023 >>>>> https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html >>>>> - Code formatting changes per Igor Mammedov >>>>> - Included the steps in bios-tables-test. >>>>> >>>>> v1: 28mar2023 >>>>> https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html >>>>> - Initial series for ARM and i386 MADT revision bump to 5. >>>>> Eric DeVolder (3): >>>>> ACPI: bios-tables-test.c step 2 (allowed-diff entries) >>>>> hw/acpi: i386: bump MADT to revision 5 >>>>> ACPI: bios-tables-test.c step 5 (updated expected table binaries) >>>>> >>>>> hw/i386/acpi-common.c | 4 ++-- >>>>> tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes >>>>> tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes >>>>> tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes >>>>> tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes >>>>> tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes >>>>> tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes >>>>> tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes >>>>> tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes >>>>> tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes >>>>> tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes >>>>> tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes >>>>> tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes >>>>> tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes >>>>> tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes >>>>> 15 files changed, 2 insertions(+), 2 deletions(-) >>>>> >>>> >>> >> >
The following Linux kernel change broke CPU hotplug for MADT revision less than 5. e2869bd7af60 ("x86/acpi/boot: Do not register processors that cannot be onlined for x2APIC") Discussion on this topic can be located here: https://lore.kernel.org/linux-acpi/20230327191026.3454-1-eric.devolder@oracle.com/T/#t which resulted in the following fixes Linux in 6.3-rc5: a74fabfbd1b7: ("x86/ACPI/boot: Use FADT version to check support for online capable") fed8d8773b8e: ("x86/acpi/boot: Correct acpi_is_processor_usable() check") However, as part of the investigation into resolving this breakage, I learned that i386 QEMU reports revision 1, while technically it generates revision 3. Aarch64 generates and reports revision 4. ACPI 6.3 bumps MADT revision to 5 as it introduces an Online Capable flag that the above Linux patch utilizes to denote hot pluggable CPUs. So in order to bump MADT to the current revision of 5, need to validate that all MADT table changes between 1 and 5 are present in QEMU. Below is a table summarizing the changes to the MADT. This information gleamed from the ACPI specs on uefi.org. ACPI MADT What Version Version 1.0 MADT not present 2.0 1 Section 5.2.10.4 3.0 2 Section 5.2.11.4 5.2.11.13 Local SAPIC Structure added two new fields: ACPI Processor UID Value ACPI Processor UID String 5.2.10.14 Platform Interrupt Sources Structure: Reserved changed to Platform Interrupt Sources Flags 3.0b 2 Section 5.2.11.4 Added a section describing guidelines for the ordering of processors in the MADT to support proper boot processor and multi-threaded logical processor operation. 4.0 3 Section 5.2.12 Adds Processor Local x2APIC structure type 9 Adds Local x2APIC NMI structure type 0xA 5.0 3 Section 5.2.12 6.0 3 Section 5.2.12 6.0a 4 Section 5.2.12 Adds ARM GIC structure types 0xB-0xF 6.2a 45 Section 5.2.12 <--- version 45, is indeed accurate! 6.2b 5 Section 5.2.12 GIC ITS last Reserved offset changed to 16 from 20 (typo) 6.3 5 Section 5.2.12 Adds Local APIC Flags Online Capable! Adds GICC SPE Overflow Interrupt field 6.4 5 Section 5.2.12 Adds Multiprocessor Wakeup Structure type 0x10 (change notes says structure previously misplaced?) 6.5 5 Section 5.2.12 For the MADT revision change 1 -> 2, the spec has a change to the SAPIC structure. In general, QEMU does not generate/support SAPIC. So the QEMU i386 MADT revision can safely be moved to 2. For the MADT revision change 2 -> 3, the spec adds Local x2APIC structures. QEMU has long supported x2apic ACPI structures. A simple search of x2apic within QEMU source and hw/i386/acpi-common.c specifically reveals this. So the QEMU i386 MADT revision can safely be moved to 3. For the MADT revision change 3 -> 4, the spec adds support for the ARM GIC structures. QEMU ARM does in fact generate and report revision 4. As these will not be used by i386 QEMU, so then the QEMU i386 MADT revision can safely be moved to 4 as well. Now for the MADT revision change 4 -> 5, the spec adds the Online Capable flag to the Local APIC structure, and the ARM GICC SPE Overflow Interrupt field. For i386, the ARM SPE is not applicable. For the i386 Local APIC flag Online Capable, the spec has certain rules about this value. And in particuar setting this value now explicitly indicates a hotpluggable CPU. So this patch makes the needed changes to move i386 MADT to revision 5. Without these changes, the information below shows "how" CPU hotplug breaks with the current upstream Linux kernel 6.3. For example, a Linux guest started with: qemu-system-x86_64 -smp 30,maxcpus=32 ... and then attempting to hotplug a CPU: (QEMU) device_add id=cpu30 driver=host-x86_64-cpu socket-id=0 core-id=30 thread-id=0 fails with the following: APIC: NR_CPUS/possible_cpus limit of 30 reached. Processor 30/0x. ACPI: Unable to map lapic to logical cpu number acpi LNXCPU:1e: Enumeration failure # dmesg | grep smpboot smpboot: Allowing 30 CPUs, 0 hotplug CPUs smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x) smpboot: Max logical packages: 1 smpboot: Total of 30 processors activated (125708.76 BogoMIPS) # iasl -d /sys/firmware/tables/acpi/APIC [000h 0000 4] Signature : "APIC" [Multiple APIC Descript [004h 0004 4] Table Length : 00000170 [008h 0008 1] Revision : 01 <===== [009h 0009 1] Checksum : 9C [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001 ... [114h 0276 1] Subtable Type : 00 [Processor Local APIC] [115h 0277 1] Length : 08 [116h 0278 1] Processor ID : 1D [117h 0279 1] Local Apic ID : 1D [118h 0280 4] Flags (decoded below) : 00000001 Processor Enabled : 1 <===== [11Ch 0284 1] Subtable Type : 00 [Processor Local APIC] [11Dh 0285 1] Length : 08 [11Eh 0286 1] Processor ID : 1E [11Fh 0287 1] Local Apic ID : 1E [120h 0288 4] Flags (decoded below) : 00000000 Processor Enabled : 0 <===== [124h 0292 1] Subtable Type : 00 [Processor Local APIC] [125h 0293 1] Length : 08 [126h 0294 1] Processor ID : 1F [127h 0295 1] Local Apic ID : 1F [128h 0296 4] Flags (decoded below) : 00000000 Processor Enabled : 0 <===== The (latest upstream) Linux kernel sees 30 Enabled processors, and does not consider processors 31 and 32 to be hotpluggable. With this patch series applied, by bumping MADT to revision 5, the latest upstream Linux kernel correctly identifies 30 CPUs plus 2 hotpluggable CPUS. CPU30 has been hot-added smpboot: Booting Node 0 Processor 30 APIC 0x1e Will online and init hotplugged CPU: 30 # dmesg | grep smpboot smpboot: Allowing 32 CPUs, 2 hotplug CPUs smpboot: CPU0: Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz (family: 0x6, model: 0x56, stepping: 0x3) smpboot: Max logical packages: 2 smpboot: Total of 30 processors activated (125708.76 BogoMIPS) # iasl -d /sys/firmware/tables/acpi/APIC [000h 0000 004h] Signature : "APIC" [Multiple APIC Descript [004h 0004 004h] Table Length : 00000170 [008h 0008 001h] Revision : 05 <===== [009h 0009 001h] Checksum : 94 [00Ah 0010 006h] Oem ID : "BOCHS " [010h 0016 008h] Oem Table ID : "BXPC " [018h 0024 004h] Oem Revision : 00000001 [01Ch 0028 004h] Asl Compiler ID : "BXPC" [020h 0032 004h] Asl Compiler Revision : 00000001 ... [114h 0276 001h] Subtable Type : 00 [Processor Local APIC] [115h 0277 001h] Length : 08 [116h 0278 001h] Processor ID : 1D [117h 0279 001h] Local Apic ID : 1D [118h 0280 004h] Flags (decoded below) : 00000001 Processor Enabled : 1 <===== Runtime Online Capable : 0 <===== [11Ch 0284 001h] Subtable Type : 00 [Processor Local APIC] [11Dh 0285 001h] Length : 08 [11Eh 0286 001h] Processor ID : 1E [11Fh 0287 001h] Local Apic ID : 1E [120h 0288 004h] Flags (decoded below) : 00000002 Processor Enabled : 0 <===== Runtime Online Capable : 1 <===== [124h 0292 001h] Subtable Type : 00 [Processor Local APIC] [125h 0293 001h] Length : 08 [126h 0294 001h] Processor ID : 1F [127h 0295 001h] Local Apic ID : 1F [128h 0296 004h] Flags (decoded below) : 00000002 Processor Enabled : 0 <===== Runtime Online Capable : 1 <===== In terms of testing older operating systems, I did: - Windows Server 2008. By opening Device Manager -> Processors, and watching/counting the listed CPUs before and after hot un/plug operations. When hot plugging a CPU, the new processor shows in the list; one more processor is available after the hotplug. When hot unplugging a CPU, Windows refuses, with the message: The 'Intel(R) Xeon(R) CPU D-1533 @ 2.10GHz' device is not removable and cannot be ejected or unplugged. This is expected as hot unplug did not work in Windows 2008. - RHEL 6.9 Kernel 2.6.32-696.el6.x86_64 Build Feb 21 2017 From dmesg: ACPI: APIC 000000007ffe32f0 000F0 (v05 BOCHS BXPC 00000001 BXPC 00000001) SMP: Allowing 16 CPUs, 8 hotplug CPUs # cat /sys/devices/system/cpu/online 0-7 (QEMU) device_add id=cpu8 driver=host-x86_64-cpu socket-id=0 core-id=8 thread-id=0 CPU 8 got hotplugged Booting Node 0 Processor 8 APIC 0x8 kvm-clock: cpu 8, msr 2830ed00 Will online and init hotplugged CPU: 8 microcode: CPU8 sig=0x50663, pf=0x1, revision=0x700001c platform microcode: firmware: requesting intel-ucode/06-56-03 # cat /sys/devices/system/cpu/online 0-8 (QEMU) device_del id=cpu8 Broke affinity for irq 24 CPU 8 is now offline # cat /sys/devices/system/cpu/online 0-7 RHEL 6.9 kernel 2.6.32-696.el6.x86_64 build Feb 21 2017 Both of the above 'legacy' operating systems behaved as expected. Regards, Eric --- v3: 21apr2023 - Dropped ARM patch as there is no compelling need to move to MADT revision 5, per Michael Tsirkin. - Recoded the flags to be simpler, per Michael, Ani Sinha and Miguel Luis. - Regenerated the binary tables, as per bios-tables-test.c instructions. v2: 18apr2023 https://lists.gnu.org/archive/html/qemu-devel/2023-04/msg02576.html - Code formatting changes per Igor Mammedov - Included the steps in bios-tables-test. v1: 28mar2023 https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06705.html - Initial series for ARM and i386 MADT revision bump to 5. Eric DeVolder (3): ACPI: bios-tables-test.c step 2 (allowed-diff entries) hw/acpi: i386: bump MADT to revision 5 ACPI: bios-tables-test.c step 5 (updated expected table binaries) hw/i386/acpi-common.c | 4 ++-- tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes 15 files changed, 2 insertions(+), 2 deletions(-)