Skip to contentSkip to conversation

s390x: firq: fix running in PV

PATCH In review Claudio Imbrenda 3 participants 3 messages Feb 3, 2022 – Feb 4, 2022 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x: firq: fix running in PV

If using the qemu CPU type, Protected Virtualization is not available, and the test will fail to start when run in PV. If specifying the host CPU type, the test will fail to start with TCG because the host CPU type requires KVM. In both cases the test will show up as failed.

This patch adds a copy of the firq test definitions for KVM, using the host CPU type, and specifying that KVM is to be used. The existing firq tests are then fixed by specifying that TCG is to be used.

When running the tests normally, both variants will be run. If an accelerator is specified explicitly when running the tests, only one variant will run and the other will be skipped (and not fail).

Fixes 8b98745d ("s390x: firq: floating interrupt test")
---
 s390x/unittests.cfg | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
s390x/unittests.cfg +16 -2
index 054560c2..1600e714 100644
@@ -113,12 +113,26 @@ file = mvpg-sie.elf
 [spec_ex-sie]
 file = spec_ex-sie.elf
 
-[firq-linear-cpu-ids]
+[firq-linear-cpu-ids-kvm]
+file = firq.elf
+timeout = 20
+extra_params = -smp 1,maxcpus=3 -device host-s390x-cpu,core-id=1 -device host-s390x-cpu,core-id=2
+accel = kvm
+
+[firq-nonlinear-cpu-ids-kvm]
+file = firq.elf
+timeout = 20
+extra_params = -smp 1,maxcpus=3 -device host-s390x-cpu,core-id=2 -device host-s390x-cpu,core-id=1
+accel = kvm
+
+[firq-linear-cpu-ids-tcg]
 file = firq.elf
 timeout = 20
 extra_params = -smp 1,maxcpus=3 -cpu qemu -device qemu-s390x-cpu,core-id=1 -device qemu-s390x-cpu,core-id=2
+accel = tcg
 
-[firq-nonlinear-cpu-ids]
+[firq-nonlinear-cpu-ids-tcg]
 file = firq.elf
 timeout = 20
 extra_params = -smp 1,maxcpus=3 -cpu qemu -device qemu-s390x-cpu,core-id=2 -device qemu-s390x-cpu,core-id=1
+accel = tcg
Signature · 1 line
2.34.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Claudio Imbrenda

If using the qemu CPU type, Protected Virtualization is not available, and the test will fail to start when run in PV. If specifying the host CPU type, the test will fail to start with TCG because the host CPU type requires KVM. In both cases the test will show up as failed.

This patch adds a copy of the firq test definitions for KVM, using the host CPU type, and specifying that KVM is to be used. The existing firq tests are then fixed by specifying that TCG is to be used.

Quoted 6 lines

When running the tests normally, both variants will be run. If an accelerator is specified explicitly when running the tests, only one variant will run and the other will be skipped (and not fail).

Fixes 8b98745d ("s390x: firq: floating interrupt test")

If only I would have hardware to run PV and it would be easy to setup for development purposes .... :)

Signature · 3 lines
Thanks,

David / dhildenb
Acked-by on v1 1/1
#2 lore raw
In reply to Claudio Imbrenda
Quoted 9 lines · Claudio Imbrenda

If using the qemu CPU type, Protected Virtualization is not available, and the test will fail to start when run in PV. If specifying the host CPU type, the test will fail to start with TCG because the host CPU type requires KVM. In both cases the test will show up as failed.

This patch adds a copy of the firq test definitions for KVM, using the host CPU type, and specifying that KVM is to be used. The existing firq tests are then fixed by specifying that TCG is to be used.

Quoted 7 lines

When running the tests normally, both variants will be run. If an accelerator is specified explicitly when running the tests, only one variant will run and the other will be skipped (and not fail).

Fixes 8b98745d ("s390x: firq: floating interrupt test")

---

That would indeed explain what went wrong :)

Quoted 37 lines
  s390x/unittests.cfg | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
s390x/unittests.cfg +16 -2
index 054560c2..1600e714 100644
@@ -113,12 +113,26 @@ file = mvpg-sie.elf
  [spec_ex-sie]
  file = spec_ex-sie.elf
 
-[firq-linear-cpu-ids]
+[firq-linear-cpu-ids-kvm]
+file = firq.elf
+timeout = 20
+extra_params = -smp 1,maxcpus=3 -device host-s390x-cpu,core-id=1 -device host-s390x-cpu,core-id=2
+accel = kvm
+
+[firq-nonlinear-cpu-ids-kvm]
+file = firq.elf
+timeout = 20
+extra_params = -smp 1,maxcpus=3 -device host-s390x-cpu,core-id=2 -device host-s390x-cpu,core-id=1
+accel = kvm
+
+[firq-linear-cpu-ids-tcg]
  file = firq.elf
  timeout = 20
  extra_params = -smp 1,maxcpus=3 -cpu qemu -device qemu-s390x-cpu,core-id=1 -device qemu-s390x-cpu,core-id=2
+accel = tcg
 
-[firq-nonlinear-cpu-ids]
+[firq-nonlinear-cpu-ids-tcg]
  file = firq.elf
  timeout = 20
  extra_params = -smp 1,maxcpus=3 -cpu qemu -device qemu-s390x-cpu,core-id=2 -device qemu-s390x-cpu,core-id=1
+accel = tcg