diff mbox series

[kvm-unit-tests] x86: Skip EPT tests that involve unrestricted guest when URG is disabled

Message ID 20190822234746.3379-1-sean.j.christopherson@intel.com (mailing list archive)
State New, archived
Headers show
Series [kvm-unit-tests] x86: Skip EPT tests that involve unrestricted guest when URG is disabled | expand

Commit Message

Sean Christopherson Aug. 22, 2019, 11:47 p.m. UTC 
Cc: Krish Sadhukhan <krish.sadhukhan@oracle.com>
Fixes: f749ddc19bb2d ("nVMX x86: Check enable-EPT on vmentry of L2 guests")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
 x86/vmx_tests.c | 4 ++++
 1 file changed, 4 insertions(+)
diff mbox series

Patch

diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 9078665..f035f24 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -4797,6 +4797,9 @@  static void test_ept_eptp(void)
 	test_vmx_valid_controls(false);
 	report_prefix_pop();
 
+	if (!(ctrl_cpu_rev[1].clr & CPU_URG))
+		goto skip_unrestricted_guest;
+
 	secondary |= CPU_URG;
 	vmcs_write(CPU_EXEC_CTRL1, secondary);
 	report_prefix_pushf("Enable-EPT disabled, unrestricted-guest enabled");
@@ -4809,6 +4812,7 @@  static void test_ept_eptp(void)
 	test_vmx_valid_controls(false);
 	report_prefix_pop();
 
+skip_unrestricted_guest:
 	secondary &= ~CPU_URG;
 	vmcs_write(CPU_EXEC_CTRL1, secondary);
 	report_prefix_pushf("Enable-EPT enabled, unrestricted-guest disabled");