KVM: selftests: Add operand to vmsave/vmload/vmrun in svm.c
PATCH 1/1 KVM: selftests: Add operand to vmsave/vmload/vmrun in svm.c
Building the KVM selftests with LLVM's integrated assembler fails with:
$ CFLAGS=-fintegrated-as make -C tools/testing/selftests/kvm CC=clang
lib/x86_64/svm.c:77:16: error: too few operands for instruction
asm volatile ("vmsave\n\t" : : "a" (vmcb_gpa) : "memory");
^
<inline asm>:1:2: note: instantiated into assembly here
vmsave
^
lib/x86_64/svm.c:134:3: error: too few operands for instruction
"vmload\n\t"
^
<inline asm>:1:2: note: instantiated into assembly here
vmload
^
This is because LLVM IAS does not currently support calling vmsave,
vmload, or vmload without an explicit %rax operand.Add an explicit operand to vmsave, vmload, and vmrum in svm.c. Fixing this was suggested by Sean Christopherson.
Tested: building without this error in clang 11. The following patch (not queued yet) needs to be applied to solve the other remaining error:
"selftests: kvm: remove reassignment of non-absolute variables".
--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/svm.c +4 -4
@@ -74,7 +74,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa);memset (vmcb,0 ,sizeof (*vmcb)); - asmvolatile ("vmsave\n\t" : :"a" (vmcb_gpa) :"memory" ); + asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);vmcb_set_seg (&save->ss,get_ss (),0 ,-1U , data_seg_attr);
@@ -131,19 +131,19 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rvoid run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa) { asmvolatile ( -"vmload\n\t" +"vmload %[vmcb_gpa]\n\t" "mov rflags, %%r15\n\t" // rflags "mov %%r15, 0x170(%[vmcb])\n\t" "mov guest_regs, %%r15\n\t" // rax "mov %%r15, 0x1f8(%[vmcb])\n\t" LOAD_GPR_C -"vmrun\n\t" +"vmrun %[vmcb_gpa]\n\t" SAVE_GPR_C "mov 0x170(%[vmcb]), %%r15\n\t" // rflags "mov %%r15, rflags\n\t" "mov 0x1f8(%[vmcb]), %%r15\n\t" // rax "mov %%r15, guest_regs\n\t" -"vmsave\n\t" +"vmsave %[vmcb_gpa]\n\t" : : [vmcb]"r" (vmcb), [vmcb_gpa]"a" (vmcb_gpa) :"r15" ,"memory" ); }
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 17 lines · Ricardo Koller
Building the KVM selftests with LLVM's integrated assembler fails with:
$ CFLAGS=-fintegrated-as make -C tools/testing/selftests/kvm CC=clang lib/x86_64/svm.c:77:16: error: too few operands for instruction asm volatile ("vmsave\n\t" : : "a" (vmcb_gpa) : "memory"); ^ <inline asm>:1:2: note: instantiated into assembly here vmsave ^ lib/x86_64/svm.c:134:3: error: too few operands for instruction "vmload\n\t" ^ <inline asm>:1:2: note: instantiated into assembly here vmload ^ This is because LLVM IAS does not currently support calling vmsave, vmload, or vmload without an explicit %rax operand.
It is worth noting that this has been fixed in LLVM already, available in 12.0.0-rc1 (final should be out in about a month or so as far as I am aware):
http://github.com/llvm/llvm-project/commit/f47b07315a3c308a214119244b216602c537a1b2
Quoted 11 lines
Add an explicit operand to vmsave, vmload, and vmrum in
svm.c. Fixing this was suggested by Sean Christopherson.Tested: building without this error in clang 11. The following patch (not queued yet) needs to be applied to solve the other remaining error:
"selftests: kvm: remove reassignment of non-absolute variables".Suggested-by Sean Christopherson <[email protected]>Reviewed-by Jim Mattson <[email protected]>Signed-off-by Ricardo Koller <[email protected]>
Yes, same fix as commit f65cf84ee769 ("KVM: SVM: Add register operand to vmsave call in sev_es_vcpu_load").
Quoted 43 lines
--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/kvm/lib/x86_64/svm.c +4
-4@@ -74,7 +74,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa);memset (vmcb,0 ,sizeof (*vmcb)); - asmvolatile ("vmsave\n\t" : :"a" (vmcb_gpa) :"memory" ); + asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);vmcb_set_seg (&save->ss,get_ss (),0 ,-1U , data_seg_attr);@@ -131,19 +131,19 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rvoid run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa) { asmvolatile ( -"vmload\n\t" +"vmload %[vmcb_gpa]\n\t" "mov rflags, %%r15\n\t" // rflags "mov %%r15, 0x170(%[vmcb])\n\t" "mov guest_regs, %%r15\n\t" // rax "mov %%r15, 0x1f8(%[vmcb])\n\t" LOAD_GPR_C -"vmrun\n\t" +"vmrun %[vmcb_gpa]\n\t" SAVE_GPR_C "mov 0x170(%[vmcb]), %%r15\n\t" // rflags "mov %%r15, rflags\n\t" "mov 0x1f8(%[vmcb]), %%r15\n\t" // rax "mov %%r15, guest_regs\n\t" -"vmsave\n\t" +"vmsave %[vmcb_gpa]\n\t" : : [vmcb]"r" (vmcb), [vmcb_gpa]"a" (vmcb_gpa) :"r15" ,"memory" ); }Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 60 lines · Ricardo Koller
Building the KVM selftests with LLVM's integrated assembler fails with:
$ CFLAGS=-fintegrated-as make -C tools/testing/selftests/kvm CC=clang lib/x86_64/svm.c:77:16: error: too few operands for instruction asm volatile ("vmsave\n\t" : : "a" (vmcb_gpa) : "memory"); ^ <inline asm>:1:2: note: instantiated into assembly here vmsave ^ lib/x86_64/svm.c:134:3: error: too few operands for instruction "vmload\n\t" ^ <inline asm>:1:2: note: instantiated into assembly here vmload ^ This is because LLVM IAS does not currently support calling vmsave, vmload, or vmload without an explicit %rax operand.Add an explicit operand to vmsave, vmload, and vmrum in
svm.c. Fixing this was suggested by Sean Christopherson.Tested: building without this error in clang 11. The following patch (not queued yet) needs to be applied to solve the other remaining error:
"selftests: kvm: remove reassignment of non-absolute variables".Suggested-by Sean Christopherson <[email protected]>Reviewed-by Jim Mattson <[email protected]>Signed-off-by Ricardo Koller <[email protected]>--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/kvm/lib/x86_64/svm.c +3
-3@@ -74,7 +74,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa);memset (vmcb,0 ,sizeof (*vmcb)); - asmvolatile ("vmsave\n\t" : :"a" (vmcb_gpa) :"memory" ); + asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);vmcb_set_seg (&save->ss,get_ss (),0 ,-1U , data_seg_attr);@@ -131,19 +131,19 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rvoid run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa) { asmvolatile ( -"vmload\n\t" +"vmload %[vmcb_gpa]\n\t" "mov rflags, %%r15\n\t" // rflags "mov %%r15, 0x170(%[vmcb])\n\t" "mov guest_regs, %%r15\n\t" // rax "mov %%r15, 0x1f8(%[vmcb])\n\t" LOAD_GPR_C - "vmrun\n\t" + "vmrun %[vmcb_gpa]\n\t"
tools/testing/selftests/kvm/lib/x86_64/svm.c void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_r · line 149
Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/svm.c +1
-1SAVE_GPR_C "mov 0x170(%[vmcb]), %%r15\n\t" // rflags "mov %%r15, rflags\n\t" "mov 0x1f8(%[vmcb]), %%r15\n\t" // rax "mov %%r15, guest_regs\n\t" -"vmsave\n\t" +"vmsave %[vmcb_gpa]\n\t" : : [vmcb] "r" (vmcb), [vmcb_gpa] "a" (vmcb_gpa) : "r15", "memory"); }
Queued, thanks.
Paolo
Quoted 60 lines · Ricardo Koller
Building the KVM selftests with LLVM's integrated assembler fails with:
$ CFLAGS=-fintegrated-as make -C tools/testing/selftests/kvm CC=clang lib/x86_64/svm.c:77:16: error: too few operands for instruction asm volatile ("vmsave\n\t" : : "a" (vmcb_gpa) : "memory"); ^ <inline asm>:1:2: note: instantiated into assembly here vmsave ^ lib/x86_64/svm.c:134:3: error: too few operands for instruction "vmload\n\t" ^ <inline asm>:1:2: note: instantiated into assembly here vmload ^ This is because LLVM IAS does not currently support calling vmsave, vmload, or vmload without an explicit %rax operand.Add an explicit operand to vmsave, vmload, and vmrum in
svm.c. Fixing this was suggested by Sean Christopherson.Tested: building without this error in clang 11. The following patch (not queued yet) needs to be applied to solve the other remaining error:
"selftests: kvm: remove reassignment of non-absolute variables".Suggested-by Sean Christopherson <[email protected]>Reviewed-by Jim Mattson <[email protected]>Signed-off-by Ricardo Koller <[email protected]>--- tools/testing/selftests/kvm/lib/x86_64/svm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/testing/selftests/kvm/lib/x86_64/svm.c +3
-3@@ -74,7 +74,7 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rwrmsr (MSR_VM_HSAVE_PA , svm->save_area_gpa);memset (vmcb,0 ,sizeof (*vmcb)); - asmvolatile ("vmsave\n\t" : :"a" (vmcb_gpa) :"memory" ); + asmvolatile ("vmsave %0\n\t" : :"a" (vmcb_gpa) :"memory" );vmcb_set_seg (&save->es,get_es (),0 ,-1U , data_seg_attr);vmcb_set_seg (&save->cs,get_cs (),0 ,-1U , code_seg_attr);vmcb_set_seg (&save->ss,get_ss (),0 ,-1U , data_seg_attr);@@ -131,19 +131,19 @@ void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_rvoid run_guest (struct vmcb *vmcb,uint64_t vmcb_gpa) { asmvolatile ( -"vmload\n\t" +"vmload %[vmcb_gpa]\n\t" "mov rflags, %%r15\n\t" // rflags "mov %%r15, 0x170(%[vmcb])\n\t" "mov guest_regs, %%r15\n\t" // rax "mov %%r15, 0x1f8(%[vmcb])\n\t" LOAD_GPR_C - "vmrun\n\t" + "vmrun %[vmcb_gpa]\n\t"
tools/testing/selftests/kvm/lib/x86_64/svm.c void generic_svm_setup(struct svm_test_data *svm, void *guest_rip, void *guest_r · line 149
Quoted 10 lines
tools/testing/selftests/kvm/lib/x86_64/svm.c +1
-1SAVE_GPR_C "mov 0x170(%[vmcb]), %%r15\n\t" // rflags "mov %%r15, rflags\n\t" "mov 0x1f8(%[vmcb]), %%r15\n\t" // rax "mov %%r15, guest_regs\n\t" -"vmsave\n\t" +"vmsave %[vmcb_gpa]\n\t" : : [vmcb] "r" (vmcb), [vmcb_gpa] "a" (vmcb_gpa) : "r15", "memory"); }
Queued, thanks.
Paolo