Thread (19 messages) flat view 19 messages, 3 authors, 2021-08-12
STALE1867d

[kvm-unit-tests PATCH 06/12] nSVM: Stop forcing EFER.NX=1 for all tests

From: Sean Christopherson <seanjc@google.com>
Date: 2021-06-22 21:01:08
Subsystem: the rest · Maintainer: Linus Torvalds

Don't force EFER.NX=1 for SVM tests now that the one NPT test that needs
EFER.NX=1 does its own housekeeping.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 x86/svm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/x86/svm.c b/x86/svm.c
index 6e5872d..0959189 100644
--- a/x86/svm.c
+++ b/x86/svm.c
@@ -295,7 +295,7 @@ static void set_additional_vcpu_msr(void *msr_efer)
 	void *hsave = alloc_page();
 
 	wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave));
-	wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME | EFER_NX);
+	wrmsr(MSR_EFER, (ulong)msr_efer | EFER_SVME);
 }
 
 static void setup_svm(void)
@@ -306,7 +306,6 @@ static void setup_svm(void)
 
 	wrmsr(MSR_VM_HSAVE_PA, virt_to_phys(hsave));
 	wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_SVME);
-	wrmsr(MSR_EFER, rdmsr(MSR_EFER) | EFER_NX);
 
 	io_bitmap = (void *) ALIGN((ulong)io_bitmap_area, PAGE_SIZE);
 
-- 
2.32.0.288.g62a8d224e6-goog
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help