x86: Make ACCEL_PROPS work
v2 cover x86: Make ACCEL_PROPS work
The goal of this series is to make ACCEL_PROPS work, which needs to use separate "-accel" parameter to configure the accelerator instead of "-machine accel=xxx".
Changes in v2:
- Add patch 1 to resolve the incompatibility between "-enable-kvm" and separate "-accel".
Xiaoyao Li (2):
x86: Make cet and lam tests KVM-only
x86/run: Use separate "-accel" option to configure the accelerator
x86/run | 2 +- x86/unittests.cfg | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/2 x86: Make cet and lam tests KVM-only
Passing "-enable-kvm" in qemu_params forces tests to run with kvm accelerator. This leads cet and lam tests to run with kvm accelerator silently without any warning even when "ACCEL=tcg" is passed. Change to require "accel = kvm" for cet and lam tests so that they can be skipped:
SKIP cet (kvm only, but ACCEL=tcg)
SKIP lam (kvm only, but ACCEL=tcg)
when "ACCEL=tcg" is passed.
As a bouns, removing the use of "-enable-kvm" will allow pass $ACCEL and $ACCEL_PROPS to the standalone "-accel" QEMU parameter, since QEMU translates "-enable-kvm" to "-machine accel=kvm", which is not compatbile with "-accel" parameter:
qemu: The -accel and "-machine accel=" options are incompatible
--- x86/unittests.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
x86/unittests.cfg +4 -2
@@ -535,9 +535,11 @@ groups = tsx-ctrl file = cet.flat arch = x86_64 smp = 2 -qemu_params = -enable-kvm -m 2048 -cpu host +accel = kvm +qemu_params = -m 2048 -cpu host [lam] file = lam.flat arch = x86_64 -qemu_params = -enable-kvm -cpu max +accel = kvm +qemu_params = -cpu max
Signature · 1 line
2.53.0
PATCH v2 2/2 x86/run: Use separate "-accel" option to configure the accelerator
In reply to Xiaoyao LiWhen configuring accelerator via machine's "accel" property, it cannot pass additional ACCEL_PROPS. For example, it hits following error when configuring KVM with "notify-vmexit":
# ACCEL="kvm,notify-vmexit=internal-error" ./x86-run x86/apic.c
# qemu-system-x86_64: Property 'pc-i440fx-11.1-machine.notify-vmexit' not found
Switch to use separate "-accel" option to configure the accelerator.
--- x86/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
x86/run +1 -1
@@ -43,7 +43,7 @@ fi pit="-global kvm-pit.lost_tick_policy=discard" command="${qemu} --no-reboot -nodefaults $pit $pc_testdev -display none -serial stdio $pci_testdev" -command+=" -machine accel=$ACCEL$ACCEL_PROPS" +command+=" -accel $ACCEL$ACCEL_PROPS" if [ "${CONFIG_EFI}" != y ]; then command+=" -kernel" fi
Signature · 1 line
2.53.0
Sean Christopherson
reviewerRe: [kvm-unit-tests PATCH v2 2/2] x86/run: Use separate "-accel" option to configure the accelerator
Quoted 8 lines · Xiaoyao Li
When configuring accelerator via machine's "accel" property, it cannot pass additional
ACCEL_PROPS. For example, it hits following error when configuring KVM with "notify-vmexit":# ACCEL="kvm,notify-vmexit=internal-error" ./x86-run
x86/apic.c
# qemu-system-x86_64: Property 'pc-i440fx-11.1-machine.notify-vmexit' not foundSwitch to use separate "-accel" option to configure the accelerator.
FYI, this breaks the intel_iommu test when running with ACCEL="kvm,kernel-irqchip=on" because that's a split-only test:
qemu_params = -M q35,kernel-irqchip=split -device intel-iommu,intremap=on,eim=off -device edu
and QEMU doesn't munge things together:
qemu: -device intel-iommu,intremap=on,eim=off: Interrupt Remapping cannot work with kernel-irqchip=on, please use 'split|off'.
Given that I'm pretty sure I'm literally the only person the world that runs KUT with ACCEL="kvm,kernel-irqchip=on", I'm going to apply this as-is. I can filter out the failures very easily, and unlike the CET/LAM issue, this doesn't cause problems for ACCEL="kvm,kernel-irqchip=split", i.e. there's no loss in coverage.
If this impacts someone else, or someone really wants to figure out how to splice all of this together, I'm happy to revisit things. For now, I just want to unblock the notify-vmexit stuff.
Quoted 22 lines
Signed-off-by Xiaoyao Li <[email protected]>--- x86/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)x86/run +1
-1@@ -43,7 +43,7 @@ fi pit="-global kvm-pit.lost_tick_policy=discard" command="${qemu} --no-reboot -nodefaults $pit $pc_testdev -display none -serial stdio $pci_testdev" -command+=" -machine accel=$ACCEL$ACCEL_PROPS" +command+=" -accel $ACCEL$ACCEL_PROPS" if [ "${CONFIG_EFI}" != y ]; then command+=" -kernel" fiSignature · 1 line
2.53.0
Re: [kvm-unit-tests PATCH v2 2/2] x86/run: Use separate "-accel" option to configure the accelerator
Quoted 10 lines · Sean Christopherson
Quoted 8 lines · Xiaoyao Li
When configuring accelerator via machine's "accel" property, it cannot pass additional
ACCEL_PROPS. For example, it hits following error when configuring KVM with "notify-vmexit":# ACCEL="kvm,notify-vmexit=internal-error" ./x86-run
x86/apic.c
# qemu-system-x86_64: Property 'pc-i440fx-11.1-machine.notify-vmexit' not foundSwitch to use separate "-accel" option to configure the accelerator.
Quoted 8 lines
FYI, this breaks the
intel_iommutest when running with ACCEL="kvm,kernel-irqchip=on" because that's a split-only test:
qemu_params= -M q35,kernel-irqchip=split -device intel-iommu,intremap=on,eim=off -device eduand QEMU doesn't munge things together:
qemu: -device intel-iommu,intremap=on,eim=off: Interrupt Remapping cannot work with kernel-irqchip=on, please use 'split|off'.
Because before this patch, the final QEMU command with ACCEL="kvm,kernel-irqchip=on" is
... -machine accel=kvm,kernel-irqchip=on -kernel x86/intel-iommu.flat -smp 4
-M q35,kernel-irqchip=split -device intel-iommu,intremap=on,eim=off -device edu
ACCEL="kvm,kernel-irqchip=on" is made into the first "-machine accel=kvm,kernel-irqchip=on" and qemu_params is put at the end, which has "-M q35,kernel-irqchip=split". So the later "-M q35,kernel-irqchip=split" overrides the earlier "kernel-irqchip=on" and it actually runs with kenrnel-irqchip=split.
But after this patch, the QEMU command becomes
... -accel kvm,kernel-irqchip=on -kernel x86/intel-iommu.flat -smp 4 -M
q35,kernel-irqchip=split -device intel-iommu,intremap=on,eim=off -device edu
though "-M q35,kernel-irqchip=split" is put behind "-accel kvm,kernel-irqchip=on", QEMU applies "-accel" after "machine's kernel-irqchip". So the final kernel-irqchip=on, which leads to the failure of Interrupt Remapping.
Quoted 31 lines
Given that I'm pretty sure I'm literally the only person the world that runs KUT with ACCEL="kvm,kernel-irqchip=on", I'm going to apply this as-is. I can filter out the failures very easily, and unlike the CET/LAM issue, this doesn't cause problems for ACCEL="kvm,kernel-irqchip=split", i.e. there's no loss in coverage.
If this impacts someone else, or someone really wants to figure out how to splice all of this together, I'm happy to revisit things. For now, I just want to unblock the notify-vmexit stuff.
Quoted 22 lines
Signed-off-by Xiaoyao Li <[email protected]>--- x86/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)x86/run +1
-1@@ -43,7 +43,7 @@ fi pit="-global kvm-pit.lost_tick_policy=discard" command="${qemu} --no-reboot -nodefaults $pit $pc_testdev -display none -serial stdio $pci_testdev" -command+=" -machine accel=$ACCEL$ACCEL_PROPS" +command+=" -accel $ACCEL$ACCEL_PROPS" if [ "${CONFIG_EFI}" != y ]; then command+=" -kernel" fiSignature · 1 line
2.53.0
Quoted 9 lines · Xiaoyao Li
The goal of this series is to make
ACCEL_PROPSwork, which needs to use separate "-accel" parameter to configure the accelerator instead of "-machine accel=xxx".Changes in v2:
- Add patch 1 to resolve the incompatibility between "-enable-kvm" and separate "-accel".[...]
Applied to kvm-x86 next, with massaged changelogs (typos, and calling out the kernel_irqchip => kernel-irqchip quirk). Thanks!
[1/2] x86: Make cet and lam tests KVM-only
https://github.com/kvm-x86/kvm-unit-tests/commit/efb3e010b96a [2/2] x86/run: Use separate "-accel" option to configure the accelerator https://github.com/kvm-x86/kvm-unit-tests/commit/69ab2df8fa28