Skip to contentSkip to conversation

KVM: selftests: Add a test for nested virtual NMI support

PATCH Superseded Hemanth Selam 2 participants 3 messages Sep 11 – Sep 15

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM: selftests: Add a test for nested virtual NMI support

KVM's virtual NMI support for nested guests has no test coverage; "V_NMI" doesn't appear anywhere under tools/testing/selftests/kvm/.

Add a test that covers the vNMI controls L1 provides in vmcb12:

- With vNMI enabled but no NMI requested, L2 runs without taking an NMI, and neither V_NMI_PENDING nor V_NMI_BLOCKING is set on exit.

- With V_NMI_PENDING set, L2 takes the NMI on VMRUN. Exiting to L1 from the NMI handler, i.e. before its IRET, shows the bits hardware wrote:
V_NMI_PENDING cleared and V_NMI_BLOCKING set. Once the handler IRETs, V_NMI_BLOCKING is cleared. Repeat to verify NMIs can be delivered back to back.

- Enabling vNMI without intercepting NMIs fails VMRUN with SVM_EXIT_ERR, per the consistency check in nested_vmcb_check_controls().

Add the V_NMI_{PENDING,BLOCKING,ENABLE} masks and X86_FEATURE_VNMI to the selftest headers, which didn't define them.

---

Tested on an AMD EPYC system with vNMI supported and enabled. The test passes consistently (50 consecutive runs, no failures).

The int_ctl values L1 observes across a delivered virtual NMI are:

before VMRUN V_NMI_ENABLE | V_NMI_PENDING
exit from the NMI handler V_NMI_ENABLE | V_NMI_BLOCKING
after the handler IRETs V_NMI_ENABLE

To check the assertions aren't vacuous, each was inverted in turn and confirmed to fail against actual behaviour:

- Not requesting V_NMI_PENDING, so no NMI is delivered:

      nmi_fired == i
      0x0 != 0x1 (nmi_fired != i)

- Asserting V_NMI_BLOCKING is clear while the NMI is in service:

      !(vmcb->control.int_ctl & (1 << 12))

- Expecting VMRUN to succeed with V_NMI_ENABLE set and INTERCEPT_NMI

    cleared:
      vmcb->control.exit_code == SVM_EXIT_VMMCALL
      0xffffffffffffffff != 0x81

Where vNMI isn't available the test exits KSFT_SKIP rather than failing. No regressions in the other nested SVM selftests.

 tools/testing/selftests/kvm/Makefile.kvm      |   1 +
 .../selftests/kvm/include/x86/processor.h     |   1 +
 tools/testing/selftests/kvm/include/x86/svm.h |   9 ++
 .../selftests/kvm/x86/svm_nested_vnmi_test.c  | 129 ++++++++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
index 96bab7002d39..92e1018e9c8a 100644
@@ -121,6 +121,7 @@ TEST_GEN_PROGS_x86 += x86/svm_nested_clear_efer_svme
 TEST_GEN_PROGS_x86 += x86/svm_nested_shutdown_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_soft_inject_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_vmcb12_gpa
+TEST_GEN_PROGS_x86 += x86/svm_nested_vnmi_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_pat_test
 TEST_GEN_PROGS_x86 += x86/svm_lbr_nested_state
 TEST_GEN_PROGS_x86 += x86/svm_pmu_host_guest_test
tools/testing/selftests/kvm/include/x86/processor.h +1 -0
index 6e6f70035508..71697a1d5b86 100644
@@ -224,6 +224,7 @@ struct kvm_x86_cpu_feature {
 #define X86_FEATURE_PFTHRESHOLD         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 12)
 #define	X86_FEATURE_V_VMSAVE_VMLOAD	KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 15)
 #define	X86_FEATURE_VGIF		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16)
+#define X86_FEATURE_VNMI		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 25)
 #define X86_FEATURE_IDLE_HLT		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 30)
 #define X86_FEATURE_SEV			KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1)
 #define X86_FEATURE_SEV_ES		KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3)
tools/testing/selftests/kvm/include/x86/svm.h +9 -0
index c8539166270e..5779fb285d79 100644
@@ -140,6 +140,12 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_GIF_SHIFT 9
 #define V_GIF_MASK (1 << V_GIF_SHIFT)
 
+#define V_NMI_PENDING_SHIFT 11
+#define V_NMI_PENDING_MASK (1 << V_NMI_PENDING_SHIFT)
+
+#define V_NMI_BLOCKING_SHIFT 12
+#define V_NMI_BLOCKING_MASK (1 << V_NMI_BLOCKING_SHIFT)
+
 #define V_INTR_PRIO_SHIFT 16
 #define V_INTR_PRIO_MASK (0x0f << V_INTR_PRIO_SHIFT)
 
@@ -152,6 +158,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_GIF_ENABLE_SHIFT 25
 #define V_GIF_ENABLE_MASK (1 << V_GIF_ENABLE_SHIFT)
 
+#define V_NMI_ENABLE_SHIFT 26
+#define V_NMI_ENABLE_MASK (1 << V_NMI_ENABLE_SHIFT)
+
 #define AVIC_ENABLE_SHIFT 31
 #define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT)
 
tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c new file +129 -0

129 lines not on this page · raw message

Signature · 1 line
2.48.1
#1 lore raw
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Missing memory barrier before VM-exit allows compiler to reorder global variable store, causing…

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Missing memory barrier before VM-exit allows compiler to reorder global variable store, causing test flakiness. --

commit 369b941892ff4fd633ee8a8bca1eef89e730d9a0
Author: Hemanth Selam <[email protected]>

KVM: selftests: Add a test for nested virtual NMI support

KVM's virtual NMI support for nested guests has no test coverage. This commit adds a test covering the vNMI controls L1 provides in vmcb12, including delivery of virtual NMIs to L2 and verifying the state of V_NMI_PENDING and V_NMI_BLOCKING flags.

Quoted 5 lines
tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c new file +0 -0
new file mode 100644
index 0000000000000..4e9916a837ddd

[ ... ]

tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c line 28

Quoted 12 lines
tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c new file +12 -0
+static unsigned int nmi_fired;
+
+static void guest_nmi_handler(struct ex_regs *regs)
+{
+	nmi_fired++;
+
+	/*
+	 * Exit to L1 from NMI context, i.e. before this handler's IRET, so
+	 * that L1 can observe V_NMI_BLOCKING while the NMI is in service.
+	 */
+	vmmcall();
+}

[Severity: Medium]
Could an optimizing compiler reorder the store to nmi_fired after the vmmcall()?

Since nmi_fired is a plain global variable and vmmcall() is implemented as an inline assembly block without a "memory" clobber, the C standard allows the compiler to reorder the memory store across the vmmcall() instruction.

If instruction scheduling places the memory store after the vmmcall(), L2 will execute the VM-exit before the store is committed, causing the host (L1) to read a stale value and making the GUEST_ASSERT_EQ(nmi_fired, i) assertion fail sporadically.

Would adding a compiler barrier or using WRITE_ONCE() before the vmmcall() help ensure the store is committed before exiting to the host?

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
#2 lore raw

PATCH v2 1/1 KVM: selftests: Add a test for nested virtual NMI support

In reply to Hemanth Selam

KVM's virtual NMI support for nested guests has no test coverage; "V_NMI" doesn't appear anywhere under tools/testing/selftests/kvm/.

Add a test that covers the vNMI controls L1 provides in vmcb12:

- With vNMI enabled but no NMI requested, L2 runs without taking an NMI, and neither V_NMI_PENDING nor V_NMI_BLOCKING is set on exit.

- With V_NMI_PENDING set, L2 takes the NMI on VMRUN. Exiting to L1 from the NMI handler, i.e. before its IRET, shows the bits hardware wrote:
V_NMI_PENDING cleared and V_NMI_BLOCKING set. Once the handler IRETs, V_NMI_BLOCKING is cleared. Repeat to verify NMIs can be delivered back to back.

- Enabling vNMI without intercepting NMIs fails VMRUN with SVM_EXIT_ERR, per the consistency check in nested_vmcb_check_controls().

Add the V_NMI_{PENDING,BLOCKING,ENABLE} masks and X86_FEATURE_VNMI to the selftest headers, which didn't define them.

---

v2:
- Keep the update to nmi_fired ahead of the exit to L1 with barrier(), as vmmcall() doesn't clobber memory and so nothing stops the compiler from sinking the store past the VM-Exit (Sashiko AI review). Note that vmmcall() not clobbering memory affects any test that hands data to L1 in a global; svm_nested_soft_inject_test.c works around it with atomics. Happy to fix the helper instead if that's preferred.

v1: https://lore.kernel.org/all/[email protected]/

Tested on an AMD EPYC system with vNMI supported and enabled. The test passes consistently (50 consecutive runs, no failures), and the other nested SVM selftests are unaffected.

The int_ctl values L1 observes across a delivered virtual NMI are:

before VMRUN V_NMI_ENABLE | V_NMI_PENDING
exit from the NMI handler V_NMI_ENABLE | V_NMI_BLOCKING
after the handler IRETs V_NMI_ENABLE

To check the assertions aren't vacuous, each was inverted in turn and confirmed to fail against actual behaviour:

- Not requesting V_NMI_PENDING, so no NMI is delivered:

      nmi_fired == i
      0x0 != 0x1 (nmi_fired != i)

- Asserting V_NMI_BLOCKING is clear while the NMI is in service:

      !(vmcb->control.int_ctl & (1 << 12))

- Expecting VMRUN to succeed with V_NMI_ENABLE set and INTERCEPT_NMI

    cleared:
      vmcb->control.exit_code == SVM_EXIT_VMMCALL
      0xffffffffffffffff != 0x81

Where vNMI isn't available the test exits KSFT_SKIP rather than failing.

 tools/testing/selftests/kvm/Makefile.kvm      |   1 +
 .../selftests/kvm/include/x86/processor.h     |   1 +
 tools/testing/selftests/kvm/include/x86/svm.h |   9 ++
 .../selftests/kvm/x86/svm_nested_vnmi_test.c  | 132 ++++++++++++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
index 96bab7002d39..92e1018e9c8a 100644
@@ -121,6 +121,7 @@ TEST_GEN_PROGS_x86 += x86/svm_nested_clear_efer_svme
 TEST_GEN_PROGS_x86 += x86/svm_nested_shutdown_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_soft_inject_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_vmcb12_gpa
+TEST_GEN_PROGS_x86 += x86/svm_nested_vnmi_test
 TEST_GEN_PROGS_x86 += x86/svm_nested_pat_test
 TEST_GEN_PROGS_x86 += x86/svm_lbr_nested_state
 TEST_GEN_PROGS_x86 += x86/svm_pmu_host_guest_test
tools/testing/selftests/kvm/include/x86/processor.h +1 -0
index 6e6f70035508..71697a1d5b86 100644
@@ -224,6 +224,7 @@ struct kvm_x86_cpu_feature {
 #define X86_FEATURE_PFTHRESHOLD         KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 12)
 #define	X86_FEATURE_V_VMSAVE_VMLOAD	KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 15)
 #define	X86_FEATURE_VGIF		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 16)
+#define X86_FEATURE_VNMI		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 25)
 #define X86_FEATURE_IDLE_HLT		KVM_X86_CPU_FEATURE(0x8000000A, 0, EDX, 30)
 #define X86_FEATURE_SEV			KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 1)
 #define X86_FEATURE_SEV_ES		KVM_X86_CPU_FEATURE(0x8000001F, 0, EAX, 3)
tools/testing/selftests/kvm/include/x86/svm.h +9 -0
index c8539166270e..5779fb285d79 100644
@@ -140,6 +140,12 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_GIF_SHIFT 9
 #define V_GIF_MASK (1 << V_GIF_SHIFT)
 
+#define V_NMI_PENDING_SHIFT 11
+#define V_NMI_PENDING_MASK (1 << V_NMI_PENDING_SHIFT)
+
+#define V_NMI_BLOCKING_SHIFT 12
+#define V_NMI_BLOCKING_MASK (1 << V_NMI_BLOCKING_SHIFT)
+
 #define V_INTR_PRIO_SHIFT 16
 #define V_INTR_PRIO_MASK (0x0f << V_INTR_PRIO_SHIFT)
 
@@ -152,6 +158,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define V_GIF_ENABLE_SHIFT 25
 #define V_GIF_ENABLE_MASK (1 << V_GIF_ENABLE_SHIFT)
 
+#define V_NMI_ENABLE_SHIFT 26
+#define V_NMI_ENABLE_MASK (1 << V_NMI_ENABLE_SHIFT)
+
 #define AVIC_ENABLE_SHIFT 31
 #define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT)
 
tools/testing/selftests/kvm/x86/svm_nested_vnmi_test.c new file +132 -0

132 lines not on this page · raw message

Signature · 1 line
2.48.1