nSVM: vNMI testcase
Sean Christopherson
reviewerv4 cover nSVM: vNMI testcase
Santosh's vNMI test, plus a prep patch to dedup a pile of copy+paste code in the SVM test for handling fatal errors in the guest.
Santosh, can you check that I didn't break anything in the vNMI test? I don't have access to the necessary hardware.
Thanks!
Santosh Shukla (1):
x86: nSVM: Add support for VNMI test
Sean Christopherson (1):
nSVM: Add helper to report fatal errors in guest
lib/x86/processor.h | 1 + x86/svm.c | 5 ++ x86/svm.h | 8 ++ x86/svm_tests.c | 205 ++++++++++++++++++++++++++------------------ 4 files changed, 134 insertions(+), 85 deletions(-)
base-commit: 723a5703848d91f7aea8bc01d12fe8b1a6fc2391
Signature · 1 line
2.40.0.348.gf938b09366-goog
Sean Christopherson
reviewerPATCH v4 1/2 nSVM: Add helper to report fatal errors in guest
Add a helper macro to dedup nSVM test code that handles fatal errors by reporting the failure, setting the test stage to a magic number, and invoking VMMCALL to bail to the host and terminate.
Note, the V_TPR fails if report() is invoked. Punt on the issue for now as most users already report only failures, but leave a TODO for future developers.
--- x86/svm_tests.c | 127 ++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 85 deletions(-)
x86/svm_tests.c +42 -85
@@ -947,6 +947,21 @@ static bool lat_svm_insn_check(struct svm_test *test)return true; } +/* +* Report failures from SVM guest code, and on failure, set the stage to -1 and +* do VMMCALL to terminate the test (host side must treat -1 as "finished"). +* TODO: fix the tests that don't play nice with a straight report, e.g. the +* V_TPR test fails if report() is invoked. +*/ +#define report_svm_guest(cond, test, fmt, args...) \ +do { \ + if (!(cond)) { \ + report_fail("why didn't my format '" fmt "' format?", ##args);\ + set_test_stage(test, -1); \ + vmmcall(); \ + } \ +} while (0) +bool pending_event_ipi_fired;bool pending_event_guest_run;
@@ -1049,22 +1064,16 @@ static void pending_event_cli_prepare_gif_clear(struct svm_test *test)static void pending_event_cli_test (struct svm_test *test) { -if (pending_event_ipi_fired == true) { -set_test_stage (test,-1 ); -report_fail ("Interrupt preceeded guest" ); -vmmcall (); - } +report_svm_guest (!pending_event_ipi_fired, test, +"IRQ should NOT be delivered while IRQs disabled" );/* VINTR_MASKING is zero. This should cause the IPI to fire. */ irq_enable (); asmvolatile ("nop" );irq_disable (); -if (pending_event_ipi_fired != true) { -set_test_stage (test,-1 ); -report_fail ("Interrupt not triggered by guest" ); - } - +report_svm_guest (pending_event_ipi_fired, test, +"IRQ should be delivered after enabling IRQs" );vmmcall ();/*
@@ -1079,11 +1088,9 @@ static void pending_event_cli_test(struct svm_test *test)static bool pending_event_cli_finished (struct svm_test *test) { -if ( vmcb->control.exit_code !=SVM_EXIT_VMMCALL ) { -report_fail ("VM_EXIT return to host is not EXIT_VMMCALL exit reason 0x%x" , - vmcb->control.exit_code); -return true; - } +report_svm_guest (vmcb->control.exit_code ==SVM_EXIT_VMMCALL , test, +"Wanted VMMCALL VM-Exit, got ext reason 0x%x" , + vmcb->control.exit_code);switch (get_test_stage (test)) {case 0 :
@@ -1158,12 +1165,8 @@ static void interrupt_test(struct svm_test *test)for (loops =0 ; loops <10000000 && !timer_fired; loops++) asmvolatile ("nop" ); -report (timer_fired,"direct interrupt while running guest" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test, +"direct interrupt while running guest" );apic_write (APIC_TMICT ,0 );irq_disable ();
@@ -1174,12 +1177,8 @@ static void interrupt_test(struct svm_test *test)for (loops =0 ; loops <10000000 && !timer_fired; loops++) asmvolatile ("nop" ); -report (timer_fired,"intercepted interrupt while running guest" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test, +"intercepted interrupt while running guest" );irq_enable ();apic_write (APIC_TMICT ,0 );
@@ -1190,13 +1189,8 @@ static void interrupt_test(struct svm_test *test)apic_write (APIC_TMICT ,1000000 );safe_halt (); -report (rdtsc () - start >10000 && timer_fired, -"direct interrupt + hlt" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test,"direct interrupt + hlt" ); +report (rdtsc () - start >10000 ,"IRQ arrived after expected delay" );apic_write (APIC_TMICT ,0 );irq_disable ();
@@ -1207,13 +1201,8 @@ static void interrupt_test(struct svm_test *test)apic_write (APIC_TMICT ,1000000 ); asmvolatile ("hlt" ); -report (rdtsc () - start >10000 && timer_fired, -"intercepted interrupt + hlt" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test,"intercepted interrupt + hlt" ); +report (rdtsc () - start >10000 ,"IRQ arrived after expected delay" );apic_write (APIC_TMICT ,0 );irq_disable ();
@@ -1287,10 +1276,7 @@ static void nmi_test(struct svm_test *test) {apic_icr_write (APIC_DEST_SELF |APIC_DEST_PHYSICAL |APIC_DM_NMI |APIC_INT_ASSERT ,0 ); -report (nmi_fired,"direct NMI while running guest" ); - -if (!nmi_fired) -set_test_stage (test,-1 ); +report_svm_guest (nmi_fired, test,"direct NMI while running guest" );vmmcall ();
@@ -1298,11 +1284,7 @@ static void nmi_test(struct svm_test *test)apic_icr_write (APIC_DEST_SELF |APIC_DEST_PHYSICAL |APIC_DM_NMI |APIC_INT_ASSERT ,0 ); -if (!nmi_fired) { -report (nmi_fired,"intercepted pending NMI not dispatched" ); -set_test_stage (test,-1 ); - } - +report_svm_guest (nmi_fired, test,"intercepted pending NMI delivered to guest" ); }static bool nmi_finished (struct svm_test *test)
@@ -1379,11 +1361,8 @@ static void nmi_hlt_test(struct svm_test *test) asmvolatile ("hlt" ); -report ((rdtsc () - start >NMI_DELAY ) && nmi_fired, -"direct NMI + hlt" ); - -if (!nmi_fired) -set_test_stage (test,-1 ); +report_svm_guest (nmi_fired, test,"direct NMI + hlt" ); +report (rdtsc () - start >NMI_DELAY ,"direct NMI after expected delay" ); nmi_fired = false;
@@ -1395,14 +1374,8 @@ static void nmi_hlt_test(struct svm_test *test) asmvolatile ("hlt" ); -report ((rdtsc () - start >NMI_DELAY ) && nmi_fired, -"intercepted NMI + hlt" ); - -if (!nmi_fired) { -report (nmi_fired,"intercepted pending NMI not dispatched" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (nmi_fired, test,"intercepted NMI + hlt" ); +report (rdtsc () - start >NMI_DELAY ,"intercepted NMI after expected delay" );set_test_stage (test,3 ); }
@@ -1534,37 +1507,23 @@ static void virq_inject_prepare(struct svm_test *test)static void virq_inject_test (struct svm_test *test) { -if (virq_fired) { -report_fail ("virtual interrupt fired before L2 sti" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (!virq_fired, test,"virtual IRQ blocked after L2 cli" );irq_enable (); asmvolatile ("nop" );irq_disable (); -if (!virq_fired) { -report_fail ("virtual interrupt not fired after L2 sti" ); -set_test_stage (test,-1 ); - } +report_svm_guest (virq_fired, test,"virtual IRQ fired after L2 sti" );vmmcall (); -if (virq_fired) { -report_fail ("virtual interrupt fired before L2 sti after VINTR intercept" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (!virq_fired, test,"intercepted VINTR blocked after L2 cli" );irq_enable (); asmvolatile ("nop" );irq_disable (); -if (!virq_fired) { -report_fail ("virtual interrupt not fired after return from VINTR intercept" ); -set_test_stage (test,-1 ); - } +report_svm_guest (virq_fired, test,"intercepted VINTR fired after L2 sti" );vmmcall ();
@@ -1572,10 +1531,8 @@ static void virq_inject_test(struct svm_test *test) asmvolatile ("nop" );irq_disable (); -if (virq_fired) { -report_fail ("virtual interrupt fired when V_IRQ_PRIO less than V_TPR" ); -set_test_stage (test,-1 ); - } +report_svm_guest (!virq_fired, test, +"virtual IRQ blocked V_IRQ_PRIO less than V_TPR" );vmmcall ();vmmcall ();
Signature · 1 line
2.40.0.348.gf938b09366-goog
Re: [kvm-unit-tests PATCH v4 1/2] nSVM: Add helper to report fatal errors in guest
Quoted 22 lines · Sean Christopherson
Add a helper macro to dedup nSVM test code that handles fatal errors by reporting the failure, setting the test stage to a magic number, and invoking VMMCALL to bail to the host and terminate.
Note, the
V_TPRfails ifreport()is invoked. Punt on the issue for now as most users already report only failures, but leave a TODO for future developers.Signed-off-by Sean Christopherson <[email protected]>--- x86/svm_tests.c | 127 ++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 85 deletions(-)x86/svm_tests.c +1
-0@@ -947,6 +947,21 @@ static bool lat_svm_insn_check(struct svm_test *test)return true; } +/*
x86/svm_tests.c static bool lat_svm_insn_check(struct svm_test *test) · line 960
Quoted 10 lines
x86/svm_tests.c +9
-0+* Report failures from SVM guest code, and on failure, set the stage to -1 and +* do VMMCALL to terminate the test (host side must treat -1 as "finished"). +* TODO: fix the tests that don't play nice with a straight report, e.g. the +* V_TPR test fails if report() is invoked. +*/ +#define report_svm_guest(cond, test, fmt, args...) \ +do { \ + if (!(cond)) { \ + report_fail("why didn't my format '" fmt "' format?", ##args);\
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Debug artifact? Should probably be this instead (making use of C99):
#define report_svm_guest(cond, test, fmt,...) \
do { \
if (!(cond)) { \
report_fail((fmt), ##__VA_ARGS__); \
set_test_stage((test), -1); \
vmmcall(); \
} \
} while (0)Quoted 223 lines
x86/svm_tests.c +32
-85+set_test_stage (test,-1 ); \ +vmmcall (); \ + } \ +}while (0 ) + bool pending_event_ipi_fired;bool pending_event_guest_run;@@ -1049,22 +1064,16 @@ static void pending_event_cli_prepare_gif_clear(struct svm_test *test)static void pending_event_cli_test (struct svm_test *test) { -if (pending_event_ipi_fired == true) { -set_test_stage (test,-1 ); -report_fail ("Interrupt preceeded guest" ); -vmmcall (); - } +report_svm_guest (!pending_event_ipi_fired, test, +"IRQ should NOT be delivered while IRQs disabled" );/* VINTR_MASKING is zero. This should cause the IPI to fire. */ irq_enable (); asmvolatile ("nop" );irq_disable (); -if (pending_event_ipi_fired != true) { -set_test_stage (test,-1 ); -report_fail ("Interrupt not triggered by guest" ); - } - +report_svm_guest (pending_event_ipi_fired, test, +"IRQ should be delivered after enabling IRQs" );vmmcall ();/* @@ -1079,11 +1088,9 @@ static void pending_event_cli_test(struct svm_test *test)static bool pending_event_cli_finished (struct svm_test *test) { -if ( vmcb->control.exit_code !=SVM_EXIT_VMMCALL ) { -report_fail ("VM_EXIT return to host is not EXIT_VMMCALL exit reason 0x%x" , - vmcb->control.exit_code); -return true; - } +report_svm_guest (vmcb->control.exit_code ==SVM_EXIT_VMMCALL , test, +"Wanted VMMCALL VM-Exit, got ext reason 0x%x" , + vmcb->control.exit_code);switch (get_test_stage (test)) {case 0 :@@ -1158,12 +1165,8 @@ static void interrupt_test(struct svm_test *test)for (loops =0 ; loops <10000000 && !timer_fired; loops++) asmvolatile ("nop" ); -report (timer_fired,"direct interrupt while running guest" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test, +"direct interrupt while running guest" );apic_write (APIC_TMICT ,0 );irq_disable ();@@ -1174,12 +1177,8 @@ static void interrupt_test(struct svm_test *test)for (loops =0 ; loops <10000000 && !timer_fired; loops++) asmvolatile ("nop" ); -report (timer_fired,"intercepted interrupt while running guest" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test, +"intercepted interrupt while running guest" );irq_enable ();apic_write (APIC_TMICT ,0 );@@ -1190,13 +1189,8 @@ static void interrupt_test(struct svm_test *test)apic_write (APIC_TMICT ,1000000 );safe_halt (); -report (rdtsc () - start >10000 && timer_fired, -"direct interrupt + hlt" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test,"direct interrupt + hlt" ); +report (rdtsc () - start >10000 ,"IRQ arrived after expected delay" );apic_write (APIC_TMICT ,0 );irq_disable ();@@ -1207,13 +1201,8 @@ static void interrupt_test(struct svm_test *test)apic_write (APIC_TMICT ,1000000 ); asmvolatile ("hlt" ); -report (rdtsc () - start >10000 && timer_fired, -"intercepted interrupt + hlt" ); - -if (!timer_fired) { -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (timer_fired, test,"intercepted interrupt + hlt" ); +report (rdtsc () - start >10000 ,"IRQ arrived after expected delay" );apic_write (APIC_TMICT ,0 );irq_disable ();@@ -1287,10 +1276,7 @@ static void nmi_test(struct svm_test *test) {apic_icr_write (APIC_DEST_SELF |APIC_DEST_PHYSICAL |APIC_DM_NMI |APIC_INT_ASSERT ,0 ); -report (nmi_fired,"direct NMI while running guest" ); - -if (!nmi_fired) -set_test_stage (test,-1 ); +report_svm_guest (nmi_fired, test,"direct NMI while running guest" );vmmcall ();@@ -1298,11 +1284,7 @@ static void nmi_test(struct svm_test *test)apic_icr_write (APIC_DEST_SELF |APIC_DEST_PHYSICAL |APIC_DM_NMI |APIC_INT_ASSERT ,0 ); -if (!nmi_fired) { -report (nmi_fired,"intercepted pending NMI not dispatched" ); -set_test_stage (test,-1 ); - } - +report_svm_guest (nmi_fired, test,"intercepted pending NMI delivered to guest" ); }static bool nmi_finished (struct svm_test *test)@@ -1379,11 +1361,8 @@ static void nmi_hlt_test(struct svm_test *test) asmvolatile ("hlt" ); -report ((rdtsc () - start >NMI_DELAY ) && nmi_fired, -"direct NMI + hlt" ); - -if (!nmi_fired) -set_test_stage (test,-1 ); +report_svm_guest (nmi_fired, test,"direct NMI + hlt" ); +report (rdtsc () - start >NMI_DELAY ,"direct NMI after expected delay" ); nmi_fired = false;@@ -1395,14 +1374,8 @@ static void nmi_hlt_test(struct svm_test *test) asmvolatile ("hlt" ); -report ((rdtsc () - start >NMI_DELAY ) && nmi_fired, -"intercepted NMI + hlt" ); - -if (!nmi_fired) { -report (nmi_fired,"intercepted pending NMI not dispatched" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (nmi_fired, test,"intercepted NMI + hlt" ); +report (rdtsc () - start >NMI_DELAY ,"intercepted NMI after expected delay" );set_test_stage (test,3 ); }@@ -1534,37 +1507,23 @@ static void virq_inject_prepare(struct svm_test *test)static void virq_inject_test (struct svm_test *test) { -if (virq_fired) { -report_fail ("virtual interrupt fired before L2 sti" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (!virq_fired, test,"virtual IRQ blocked after L2 cli" );irq_enable (); asmvolatile ("nop" );irq_disable (); -if (!virq_fired) { -report_fail ("virtual interrupt not fired after L2 sti" ); -set_test_stage (test,-1 ); - } +report_svm_guest (virq_fired, test,"virtual IRQ fired after L2 sti" );vmmcall (); -if (virq_fired) { -report_fail ("virtual interrupt fired before L2 sti after VINTR intercept" ); -set_test_stage (test,-1 ); -vmmcall (); - } +report_svm_guest (!virq_fired, test,"intercepted VINTR blocked after L2 cli" );irq_enable (); asmvolatile ("nop" );irq_disable (); -if (!virq_fired) { -report_fail ("virtual interrupt not fired after return from VINTR intercept" ); -set_test_stage (test,-1 ); - } +report_svm_guest (virq_fired, test,"intercepted VINTR fired after L2 sti" );vmmcall ();@@ -1572,10 +1531,8 @@ static void virq_inject_test(struct svm_test *test) asmvolatile ("nop" );irq_disable (); -if (virq_fired) { -report_fail ("virtual interrupt fired when V_IRQ_PRIO less than V_TPR" ); -set_test_stage (test,-1 ); - } +report_svm_guest (!virq_fired, test, +"virtual IRQ blocked V_IRQ_PRIO less than V_TPR" );vmmcall ();vmmcall ();
Sean Christopherson
reviewerRe: [kvm-unit-tests PATCH v4 1/2] nSVM: Add helper to report fatal errors in guest
Quoted 32 lines · Mathias Krause
Quoted 30 lines · Sean Christopherson
Add a helper macro to dedup nSVM test code that handles fatal errors by reporting the failure, setting the test stage to a magic number, and invoking VMMCALL to bail to the host and terminate.
Note, the
V_TPRfails ifreport()is invoked. Punt on the issue for now as most users already report only failures, but leave a TODO for future developers.Signed-off-by Sean Christopherson <[email protected]>--- x86/svm_tests.c | 127 ++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 85 deletions(-)x86/svm_tests.c +9
-0@@ -947,6 +947,21 @@ static bool lat_svm_insn_check(struct svm_test *test)return true; } +/* +* Report failures from SVM guest code, and on failure, set the stage to -1 and +* do VMMCALL to terminate the test (host side must treat -1 as "finished"). +* TODO: fix the tests that don't play nice with a straight report, e.g. the +* V_TPR test fails if report() is invoked. +*/ +#define report_svm_guest(cond, test, fmt, args...) \ +do { \ + if (!(cond)) { \
Quoted 3 lines
x86/svm_tests.c static bool lat_svm_insn_check(struct svm_test *test) · line 959
Quoted 1 line
x86/svm_tests.c +1
-0+ report_fail("why didn't my format '" fmt "' format?", ##args);\~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Debug artifact? Should probably be this instead (making use of C99):
Yes. I'm just glad I posted the PG version and not the rated R version.
Sean Christopherson
reviewerPATCH v4 2/2 x86: nSVM: Add support for VNMI test
In reply to Sean ChristophersonFrom: Santosh Shukla <[email protected]>
Add a VNMI test case to test Virtual NMI in a nested environment, The test covers the Virtual NMI (VNMI) delivery.
--- lib/x86/processor.h | 1 + x86/svm.c | 5 +++ x86/svm.h | 8 +++++ x86/svm_tests.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+)
lib/x86/processor.h +1 -0
@@ -267,6 +267,7 @@ static inline bool is_intel(void)#define X86_FEATURE_PAUSEFILTER (CPUID(0x8000000A, 0, EDX, 10))#define X86_FEATURE_PFTHRESHOLD (CPUID(0x8000000A, 0, EDX, 12))#define X86_FEATURE_VGIF (CPUID(0x8000000A, 0, EDX, 16)) +#define X86_FEATURE_V_NMI (CPUID(0x8000000A, 0, EDX, 25))#define X86_FEATURE_AMD_PMU_V2 (CPUID(0x80000022, 0, EAX, 0))static inline bool this_cpu_has (u64 feature)
x86/svm.c +5 -0
@@ -99,6 +99,11 @@ bool npt_supported(void)return this_cpu_has (X86_FEATURE_NPT ); } +bool vnmi_supported (void ) +{ +return this_cpu_has (X86_FEATURE_V_NMI ); +} +int get_test_stage (struct svm_test *test) {barrier ();
x86/svm.h +8 -0
@@ -131,6 +131,13 @@ struct __attribute__ ((__packed__)) vmcb_control_area {#define V_INTR_MASKING_SHIFT 24#define V_INTR_MASKING_MASK (1 << V_INTR_MASKING_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_NMI_ENABLE_SHIFT 26 +#define V_NMI_ENABLE_MASK (1 << V_NMI_ENABLE_SHIFT) +#define SVM_INTERRUPT_SHADOW_MASK 1#define SVM_IOIO_STR_SHIFT 2
@@ -419,6 +426,7 @@ void default_prepare(struct svm_test *test);void default_prepare_gif_clear (struct svm_test *test);bool default_finished (struct svm_test *test);bool npt_supported (void ); +bool vnmi_supported (void );int get_test_stage (struct svm_test *test);void set_test_stage (struct svm_test *test,int s);void inc_test_stage (struct svm_test *test);
x86/svm_tests.c +78 -0
90 lines not on this page · raw message
Signature · 1 line
2.40.0.348.gf938b09366-goog
Re: [kvm-unit-tests PATCH v4 2/2] x86: nSVM: Add support for VNMI test
Hi Sean,
Quoted 8 lines · Sean Christopherson
From: Santosh Shukla <[email protected]>
Add a VNMI test case to test Virtual NMI in a nested environment, The test covers the Virtual NMI (VNMI) delivery.
Signed-off-by Santosh Shukla <[email protected]>[sean: reuse pieces of NMI test framework, fix formatting issues]Signed-off-by Sean Christopherson <[email protected]>
Tested on Genoa system, Test passed, Thank-you!.,
Renaming comment inline -
Quoted 12 lines
--- lib/x86/processor.h | 1 + x86/svm.c | 5 +++ x86/svm.h | 8 +++++ x86/svm_tests.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+)lib/x86/processor.h +0
-0
lib/x86/processor.h static inline bool is_intel(void) · line 270
Quoted 4 lines
lib/x86/processor.h +1
-0@@ -267,6 +267,7 @@ static inline bool is_intel(void)#define X86_FEATURE_PAUSEFILTER (CPUID(0x8000000A, 0, EDX, 10))#define X86_FEATURE_PFTHRESHOLD (CPUID(0x8000000A, 0, EDX, 12))#define X86_FEATURE_VGIF (CPUID(0x8000000A, 0, EDX, 16)) +#define X86_FEATURE_V_NMI (CPUID(0x8000000A, 0, EDX, 25))
s/X86_FEATURE_V_NMI/X86_FEATURE_VNMI
Quoted 8 lines
lib/x86/processor.h +0
-0#define X86_FEATURE_AMD_PMU_V2 (CPUID(0x80000022, 0, EAX, 0))static inline bool this_cpu_has (u64 feature)x86/svm.c +0
-0
x86/svm.c bool npt_supported(void) · line 104
Quoted 6 lines
x86/svm.c +3
-0@@ -99,6 +99,11 @@ bool npt_supported(void)return this_cpu_has (X86_FEATURE_NPT ); } +bool vnmi_supported (void ) +{ +return this_cpu_has (X86_FEATURE_V_NMI );
ditto..
Thanks,
Santosh
Quoted 9 lines · Sean Christopherson
Santosh's vNMI test, plus a prep patch to dedup a pile of copy+paste code in the SVM test for handling fatal errors in the guest.
Santosh, can you check that I didn't break anything in the vNMI test? I don't have access to the necessary hardware.
Thanks!
[...]
Applied to kvm-x86 next, with fixups for the goofs pointed out by Mathias and Santosh.
[1/2] nSVM: Add helper to report fatal errors in guest
https://github.com/kvm-x86/kvm-unit-tests/commit/76c60c49ebfd [2/2] x86: nSVM: Add support for VNMI test https://github.com/kvm-x86/kvm-unit-tests/commit/928fec073045