KVM: nSVM: Rename nested_svm_vmloadsave() to svm_copy_vmloadsave_state()
PATCH 1/1 KVM: nSVM: Rename nested_svm_vmloadsave() to svm_copy_vmloadsave_state()
To match svm_copy_vmrun_state(), rename nested_svm_vmloadsave() to svm_copy_vmloadsave_state().
Opportunistically add missing braces to 'else' branch in vmload_vmsave_interception().
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/svm.c | 7 ++++--- arch/x86/kvm/svm/svm.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/kvm/svm/nested.c +1 -1
@@ -722,7 +722,7 @@ void svm_copy_vmrun_state(struct vmcb_save_area *from_save, to_save->cpl =0 ; } -void nested_svm_vmloadsave (struct vmcb *from_vmcb,struct vmcb *to_vmcb) +void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb) { to_vmcb->save.fs = from_vmcb->save.fs; to_vmcb->save.gs = from_vmcb->save.gs;
arch/x86/kvm/svm/svm.c +4 -3
@@ -2147,11 +2147,12 @@ static int vmload_vmsave_interception(struct kvm_vcpu *vcpu, bool vmload) ret =kvm_skip_emulated_instruction (vcpu);if (vmload) { -nested_svm_vmloadsave (vmcb12, svm->vmcb); +svm_copy_vmloadsave_state (vmcb12, svm->vmcb); svm->sysenter_eip_hi =0 ; svm->sysenter_esp_hi =0 ; - }else -nested_svm_vmloadsave (svm->vmcb, vmcb12); + }else { +svm_copy_vmloadsave_state (svm->vmcb, vmcb12); + }kvm_vcpu_unmap (vcpu, &map, true);
arch/x86/kvm/svm/svm.h +1 -1
@@ -466,7 +466,7 @@ int svm_allocate_nested(struct vcpu_svm *svm);int nested_svm_vmrun (struct kvm_vcpu *vcpu);void svm_copy_vmrun_state (struct vmcb_save_area *from_save,struct vmcb_save_area *to_save); -void nested_svm_vmloadsave (struct vmcb *from_vmcb,struct vmcb *to_vmcb); +void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb);int nested_svm_vmexit (struct vcpu_svm *svm);static inline int nested_svm_simple_vmexit (struct vcpu_svm *svm,u32 exit_code)
Signature · 1 line
2.31.1
Sean Christopherson
maintainerarch/x86/kvm/svm/nested.c void svm_copy_vmrun_state(struct vmcb_save_area *from_save, · line 725
Quoted 10 lines · Vitaly Kuznetsov
arch/x86/kvm/svm/nested.c +1
-1@@ -722,7 +722,7 @@ void svm_copy_vmrun_state(struct vmcb_save_area *from_save, to_save->cpl =0 ; } -void nested_svm_vmloadsave (struct vmcb *from_vmcb,struct vmcb *to_vmcb) +void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb)
And swap the parameter order for both functions in a follow-up patch? I.e. have the destination first to match memcpy().
Quoted 9 lines · Sean Christopherson
Quoted 8 lines · Vitaly Kuznetsov
arch/x86/kvm/svm/nested.c +0
-0@@ -722,7 +722,7 @@ void svm_copy_vmrun_state(struct vmcb_save_area *from_save, to_save->cpl =0 ; }
Quoted 6 lines
arch/x86/kvm/svm/nested.c void svm_copy_vmrun_state(struct vmcb_save_area *from_save, · line 725
Quoted 2 lines
arch/x86/kvm/svm/nested.c +1
-1-void nested_svm_vmloadsave (struct vmcb *from_vmcb,struct vmcb *to_vmcb) +void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb)And swap the parameter order for both functions in a follow-up patch? I.e. have the destination first to match
memcpy().
Queued, thanks.
Paolo
[PATCH 2/1] KVM: nSVM: Swap the parameter order for svm_copy_vmrun_state()/svm_copy_vmloadsave_state()
In reply to Vitaly KuznetsovMake svm_copy_vmrun_state()/svm_copy_vmloadsave_state() interface match 'memcpy(dest, src)' to avoid any confusion.
No functional change intended.
--- arch/x86/kvm/svm/nested.c | 8 ++++---- arch/x86/kvm/svm/svm.c | 12 ++++++------ arch/x86/kvm/svm/svm.h | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-)
arch/x86/kvm/svm/nested.c +4 -4
@@ -702,8 +702,8 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) }/* Copy state save area fields which are handled by VMRUN */ -void svm_copy_vmrun_state (struct vmcb_save_area *from_save, -struct vmcb_save_area *to_save) +void svm_copy_vmrun_state (struct vmcb_save_area *to_save, +struct vmcb_save_area *from_save) { to_save->es = from_save->es; to_save->cs = from_save->cs;
@@ -722,7 +722,7 @@ void svm_copy_vmrun_state(struct vmcb_save_area *from_save, to_save->cpl =0 ; } -void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb) +void svm_copy_vmloadsave_state (struct vmcb *to_vmcb,struct vmcb *from_vmcb) { to_vmcb->save.fs = from_vmcb->save.fs; to_vmcb->save.gs = from_vmcb->save.gs;
@@ -1385,7 +1385,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, svm->nested.vmcb12_gpa = kvm_state->hdr.svm.vmcb_pa; -svm_copy_vmrun_state (save, &svm->vmcb01.ptr->save); +svm_copy_vmrun_state (&svm->vmcb01.ptr->save, save);nested_load_control_from_vmcb12 (svm, ctl);svm_switch_vmcb (svm, &svm->nested.vmcb02);
arch/x86/kvm/svm/svm.c +6 -6
@@ -2147,11 +2147,11 @@ static int vmload_vmsave_interception(struct kvm_vcpu *vcpu, bool vmload) ret =kvm_skip_emulated_instruction (vcpu);if (vmload) { -svm_copy_vmloadsave_state (vmcb12, svm->vmcb); +svm_copy_vmloadsave_state (svm->vmcb, vmcb12); svm->sysenter_eip_hi =0 ; svm->sysenter_esp_hi =0 ; }else { -svm_copy_vmloadsave_state (svm->vmcb, vmcb12); +svm_copy_vmloadsave_state (vmcb12, svm->vmcb); }kvm_vcpu_unmap (vcpu, &map, true);
@@ -4345,8 +4345,8 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, char *smstate)BUILD_BUG_ON (offsetof(struct vmcb , save) !=0x400 ); -svm_copy_vmrun_state (&svm->vmcb01.ptr->save, - map_save.hva +0x400 ); +svm_copy_vmrun_state (map_save.hva +0x400 , + &svm->vmcb01.ptr->save);kvm_vcpu_unmap (vcpu, &map_save, true); }
@@ -4394,8 +4394,8 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) &map_save) == -EINVAL)return 1 ; -svm_copy_vmrun_state (map_save.hva +0x400 , - &svm->vmcb01.ptr->save); +svm_copy_vmrun_state (&svm->vmcb01.ptr->save, + map_save.hva +0x400 );kvm_vcpu_unmap (vcpu, &map_save, true); }
arch/x86/kvm/svm/svm.h +3 -3
@@ -464,9 +464,9 @@ void svm_leave_nested(struct vcpu_svm *svm);void svm_free_nested (struct vcpu_svm *svm);int svm_allocate_nested (struct vcpu_svm *svm);int nested_svm_vmrun (struct kvm_vcpu *vcpu); -void svm_copy_vmrun_state (struct vmcb_save_area *from_save, -struct vmcb_save_area *to_save); -void svm_copy_vmloadsave_state (struct vmcb *from_vmcb,struct vmcb *to_vmcb); +void svm_copy_vmrun_state (struct vmcb_save_area *to_save, +struct vmcb_save_area *from_save); +void svm_copy_vmloadsave_state (struct vmcb *to_vmcb,struct vmcb *from_vmcb);int nested_svm_vmexit (struct vcpu_svm *svm);static inline int nested_svm_simple_vmexit (struct vcpu_svm *svm,u32 exit_code)
Signature · 1 line
2.31.1