Skip to contentSkip to conversation

x86: Fix goofs in FEP access configs

PATCH Applied Sean Christopherson 1 participant 4 messages Apr 4, 2023 – Apr 5, 2023 KVM

lore
Share & tools
lore

Sean Christopherson

author reviewer
#0 lore raw

cover x86: Fix goofs in FEP access configs

Fix goofs in the config from the FEP access changes. I tested the changes manually before posting, but only did the standard "run everything" after the fact.

Sean Christopherson (2):
x86: Set forced emulation access timeouts to 240
x86: Exclude forced emulation #PF access test from base "vmx" test

 x86/unittests.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

base-commit: 723a5703848d91f7aea8bc01d12fe8b1a6fc2391

Signature · 1 line
2.40.0.348.gf938b09366-goog
author reviewer
#1 lore raw

PATCH 1/2 x86: Set forced emulation access timeouts to 240

Set the timeout for the forced emulation variants of the access test to 240 seconds, which is the (very) rough expected upper limit established by the VPID-focused variants when KVM is forced to emulate something on every individual testcase.

Fixes 76ffc801 ("x86/access: Add forced emulation support")
Fixes 723a5703 ("nVMX: Add forced emulation variant of #PF access test")
---
 x86/unittests.cfg | 2 ++
 1 file changed, 2 insertions(+)
x86/unittests.cfg +2 -0
index 0971bb3f..9c70562d 100644
@@ -148,6 +148,7 @@ file = access_test.flat
 arch = x86_64
 extra_params = -cpu max -append force_emulation
 groups = nodefault
+timeout = 240
 
 [access-reduced-maxphyaddr]
 file = access_test.flat
@@ -414,6 +415,7 @@ file = vmx.flat
 extra_params = -cpu max,+vmx -append "vmx_pf_exception_forced_emulation_test"
 arch = x86_64
 groups = vmx nested_exception nodefault
+timeout = 240
 
 [vmx_pf_vpid_test]
 file = vmx.flat
Signature · 1 line
2.40.0.348.gf938b09366-goog
author reviewer
#2 lore raw

PATCH 2/2 x86: Exclude forced emulation #PF access test from base "vmx" test

In reply to Sean Christopherson

Filter out vmx_pf_exception_forced_emulation_test from the base "vmx" as intended, someone just forgot how the nVMX megatest works. The runtime of the forced emulation test can easily exceed 200 seconds and thus has its own dedicated test.

Fixes 723a5703 ("nVMX: Add forced emulation variant of #PF access test")
---
 x86/unittests.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
x86/unittests.cfg +1 -1
index 9c70562d..b7676c28 100644
@@ -336,7 +336,7 @@ arch = i386
 
 [vmx]
 file = vmx.flat
-extra_params = -cpu max,+vmx -append "-exit_monitor_from_l2_test -ept_access* -vmx_smp* -vmx_vmcs_shadow_test -atomic_switch_overflow_msrs_test -vmx_init_signal_test -vmx_apic_passthrough_tpr_threshold_test -apic_reg_virt_test -virt_x2apic_mode_test -vmx_pf_exception_test -vmx_pf_no_vpid_test -vmx_pf_invvpid_test -vmx_pf_vpid_test"
+extra_params = -cpu max,+vmx -append "-exit_monitor_from_l2_test -ept_access* -vmx_smp* -vmx_vmcs_shadow_test -atomic_switch_overflow_msrs_test -vmx_init_signal_test -vmx_apic_passthrough_tpr_threshold_test -apic_reg_virt_test -virt_x2apic_mode_test -vmx_pf_exception_test -vmx_pf_exception_forced_emulation_test -vmx_pf_no_vpid_test -vmx_pf_invvpid_test -vmx_pf_vpid_test"
 arch = x86_64
 groups = vmx
 
Signature · 1 line
2.40.0.348.gf938b09366-goog
author reviewer Applied
#3 lore raw
In reply to Sean Christopherson
Quoted 9 lines · Sean Christopherson

Fix goofs in the config from the FEP access changes. I tested the changes manually before posting, but only did the standard "run everything" after the fact.

Sean Christopherson (2):
x86: Set forced emulation access timeouts to 240
x86: Exclude forced emulation #PF access test from base "vmx" test

[...]

Applied to kvm-x86 next (PULL request finally incoming).

[1/2] x86: Set forced emulation access timeouts to 240

      https://github.com/kvm-x86/kvm-unit-tests/commit/a1fae402cbc2
[2/2] x86: Exclude forced emulation #PF access test from base "vmx" test
      https://github.com/kvm-x86/kvm-unit-tests/commit/32b8b88e7eb0

--
https://github.com/kvm-x86/kvm-unit-tests/tree/next