AMD's LBR test for nesting and few more fixes
cover AMD's LBR test for nesting and few more fixes
This patch series adds a test for nested LBR usage on AMD, and few more things.
Best regards,
Maxim Levitsky
Maxim Levitsky (4):
svm: add SVM_BARE_VMRUN
svm: intercept shutdown in all svm tests by default few fixes for pmu_lbr test
svm: add tests for LBR virtualization
lib/x86/processor.h | 1 + x86/pmu_lbr.c | 8 ++ x86/svm.c | 41 ++------ x86/svm.h | 52 +++++++++- x86/svm_tests.c | 239 ++++++++++++++++++++++++++++++++++++++++++++ x86/unittests.cfg | 1 + 6 files changed, 308 insertions(+), 34 deletions(-)
Signature · 1 line
2.26.3
PATCH 1/4 svm: add SVM_BARE_VMRUN
This will be useful in nested LBR tests to ensure that no extra branches are made in the guest entry.
--- x86/svm.c | 32 -------------------------------- x86/svm.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 32 deletions(-)
x86/svm.c +0 -32
@@ -194,41 +194,9 @@ struct regs get_regs(void)// rax handled specially below -#define SAVE_GPR_C \ - "xchg %%rbx, regs+0x8\n\t" \ - "xchg %%rcx, regs+0x10\n\t" \ - "xchg %%rdx, regs+0x18\n\t" \ - "xchg %%rbp, regs+0x28\n\t" \ - "xchg %%rsi, regs+0x30\n\t" \ - "xchg %%rdi, regs+0x38\n\t" \ - "xchg %%r8, regs+0x40\n\t" \ - "xchg %%r9, regs+0x48\n\t" \ - "xchg %%r10, regs+0x50\n\t" \ - "xchg %%r11, regs+0x58\n\t" \ - "xchg %%r12, regs+0x60\n\t" \ - "xchg %%r13, regs+0x68\n\t" \ - "xchg %%r14, regs+0x70\n\t" \ - "xchg %%r15, regs+0x78\n\t" - -#define LOAD_GPR_C SAVE_GPR_Cstruct svm_test *v2_test; -#define ASM_PRE_VMRUN_CMD \ - "vmload %%rax\n\t" \ - "mov regs+0x80, %%r15\n\t" \ - "mov %%r15, 0x170(%%rax)\n\t" \ - "mov regs, %%r15\n\t" \ - "mov %%r15, 0x1f8(%%rax)\n\t" \ - LOAD_GPR_C \ - -#define ASM_POST_VMRUN_CMD \ - SAVE_GPR_C \ - "mov 0x170(%%rax), %%r15\n\t" \ - "mov %%r15, regs+0x80\n\t" \ - "mov 0x1f8(%%rax), %%r15\n\t" \ - "mov %%r15, regs\n\t" \ - "vmsave %%rax\n\t" \u64 guest_stack[10000 ];
x86/svm.h +47 -0
57 lines not on this page · raw message
Signature · 1 line
2.26.3
PATCH 2/4 svm: intercept shutdown in all svm tests by default
In reply to Maxim LevitskyIf L1 doesn't intercept shutdown, then L1 itself gets it, which doesn't allow it to report the error that happened.
--- x86/svm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
x86/svm.c +3 -1
@@ -174,7 +174,9 @@ void vmcb_ident(struct vmcb *vmcb) save->cr2 =read_cr2 (); save->g_pat =rdmsr (MSR_IA32_CR_PAT ); save->dbgctl =rdmsr (MSR_IA32_DEBUGCTLMSR ); - ctrl->intercept = (1ULL <<INTERCEPT_VMRUN ) | (1ULL <<INTERCEPT_VMMCALL ); + ctrl->intercept = (1ULL <<INTERCEPT_VMRUN ) | + (1ULL <<INTERCEPT_VMMCALL ) | + (1ULL <<INTERCEPT_SHUTDOWN ); ctrl->iopm_base_pa =virt_to_phys (io_bitmap); ctrl->msrpm_base_pa =virt_to_phys (msr_bitmap);
Signature · 1 line
2.26.3
PATCH 3/4 few fixes for pmu_lbr test
In reply to Maxim Levitsky* don't run this test on AMD since AMD's LBR is not the same as Intel's LBR and needs a different test.
* don't run this test on 32 bit as it is not built for 32 bit anyway
--- x86/pmu_lbr.c | 8 ++++++++ x86/unittests.cfg | 1 + 2 files changed, 9 insertions(+)
x86/pmu_lbr.c +8 -0
@@ -68,6 +68,12 @@ int main(int ac, char **av)int max, i;setup_vm (); + +if (!is_intel ()) { +report_skip ("PMU_LBR test is for intel CPU's only" ); +return 0 ; + } + perf_cap =rdmsr (MSR_IA32_PERF_CAPABILITIES ); eax.full = id.a;
@@ -83,6 +89,8 @@ int main(int ac, char **av)printf ("PMU version: %d\n" , eax.split.version_id);printf ("LBR version: %ld\n" , perf_cap &PMU_CAP_LBR_FMT ); + +/* Look for LBR from and to MSRs */ lbr_from =MSR_LBR_CORE_FROM ; lbr_to =MSR_LBR_CORE_TO ;
x86/unittests.cfg +1 -0
@@ -180,6 +180,7 @@ extra_params = -cpu max check = /proc/sys/kernel/nmi_watchdog=0 [pmu_lbr] +arch = x86_64 file = pmu_lbr.flat extra_params = -cpu host,migratable=no check = /sys/module/kvm/parameters/ignore_msrs=N
Signature · 1 line
2.26.3
PATCH 4/4 svm: add tests for LBR virtualization
In reply to Maxim Levitsky--- lib/x86/processor.h | 1 + x86/svm.c | 5 + x86/svm.h | 5 +- x86/svm_tests.c | 239 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 1 deletion(-)
lib/x86/processor.h +1 -0
@@ -187,6 +187,7 @@ static inline bool is_intel(void)#define X86_FEATURE_RDPRU (CPUID(0x80000008, 0, EBX, 4))#define X86_FEATURE_AMD_IBPB (CPUID(0x80000008, 0, EBX, 12))#define X86_FEATURE_NPT (CPUID(0x8000000A, 0, EDX, 0)) +#define X86_FEATURE_LBRV (CPUID(0x8000000A, 0, EDX, 1))#define X86_FEATURE_NRIPS (CPUID(0x8000000A, 0, EDX, 3))#define X86_FEATURE_VGIF (CPUID(0x8000000A, 0, EDX, 16))
x86/svm.c +5 -0
@@ -70,6 +70,11 @@ bool vgif_supported(void)return this_cpu_has (X86_FEATURE_VGIF ); } +bool lbrv_supported (void ) +{ +return this_cpu_has (X86_FEATURE_LBRV ); +} +void default_prepare (struct svm_test *test) {vmcb_ident (vmcb);
x86/svm.h +4 -1
@@ -98,7 +98,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u32 event_inj;u32 event_inj_err;u64 nested_cr3; -u64 lbr_ctl; +u64 virt_ext;u32 clean;u32 reserved_5;u64 next_rip;
@@ -360,6 +360,8 @@ struct __attribute__ ((__packed__)) vmcb {#define MSR_BITMAP_SIZE 8192 +#define LBR_CTL_ENABLE_MASK BIT_ULL(0) +struct svm_test {const char *name;bool (*supported)(void );
@@ -405,6 +407,7 @@ u64 *npt_get_pml4e(void);bool smp_supported (void );bool default_supported (void );bool vgif_supported (void ); +bool lbrv_supported (void );void default_prepare (struct svm_test *test);void default_prepare_gif_clear (struct svm_test *test);bool default_finished (struct svm_test *test);
x86/svm_tests.c +239 -0
250 lines not on this page · raw message
Signature · 1 line
2.26.3