Skip to content

Commit ed290e1

Browse files
jsmattsonjrbonzini
authored andcommitted
KVM: selftests: Fix nested SVM tests when built with clang
Though gcc conveniently compiles a simple memset to "rep stos," clang prefers to call the libc version of memset. If a test is dynamically linked, the libc memset isn't available in L1 (nor is the PLT or the GOT, for that matter). Even if the test is statically linked, the libc memset may choose to use some CPU features, like AVX, which may not be enabled in L1. Note that __builtin_memset doesn't solve the problem, because (a) the compiler is free to call memset anyway, and (b) __builtin_memset may also choose to use features like AVX, which may not be available in L1. To avoid a myriad of problems, use an explicit "rep stos" to clear the VMCB in generic_svm_setup(), which is called both from L0 and L1. Reported-by: Ricardo Koller <[email protected]> Signed-off-by: Jim Mattson <[email protected]> Fixes: 20ba262 ("selftests: KVM: AMD Nested test infrastructure") Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent dfd3c71 commit ed290e1

File tree

1 file changed

+13
-1
lines changed
  • tools/testing/selftests/kvm/lib/x86_64

1 file changed

+13
-1
lines changed

tools/testing/selftests/kvm/lib/x86_64/svm.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,18 @@ static void vmcb_set_seg(struct vmcb_seg *seg, u16 selector,
5454
seg->base = base;
5555
}
5656

57+
/*
58+
* Avoid using memset to clear the vmcb, since libc may not be
59+
* available in L1 (and, even if it is, features that libc memset may
60+
* want to use, like AVX, may not be enabled).
61+
*/
62+
static void clear_vmcb(struct vmcb *vmcb)
63+
{
64+
int n = sizeof(*vmcb) / sizeof(u32);
65+
66+
asm volatile ("rep stosl" : "+c"(n), "+D"(vmcb) : "a"(0) : "memory");
67+
}
68+
5769
void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rsp)
5870
{
5971
struct vmcb *vmcb = svm->vmcb;
@@ -70,7 +82,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_r
7082
wrmsr(MSR_EFER, efer | EFER_SVME);
7183
wrmsr(MSR_VM_HSAVE_PA, svm->save_area_gpa);
7284

73-
memset(vmcb, 0, sizeof(*vmcb));
85+
clear_vmcb(vmcb);
7486
asm volatile ("vmsave %0\n\t" : : "a" (vmcb_gpa) : "memory");
7587
vmcb_set_seg(&save->es, get_es(), 0, -1U, data_seg_attr);
7688
vmcb_set_seg(&save->cs, get_cs(), 0, -1U, code_seg_attr);

0 commit comments

Comments
 (0)