lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/7] KVM: nSVM: rename nested 'vmcb' to vmcb12_gpa in few places
    Date
    No functional changes.

    Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
    ---
    arch/x86/kvm/svm/nested.c | 10 +++++-----
    arch/x86/kvm/svm/svm.c | 13 +++++++------
    arch/x86/kvm/svm/svm.h | 2 +-
    3 files changed, 13 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
    index fb68467e6049..f5b17920a2ca 100644
    --- a/arch/x86/kvm/svm/nested.c
    +++ b/arch/x86/kvm/svm/nested.c
    @@ -431,7 +431,7 @@ int enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,
    {
    int ret;

    - svm->nested.vmcb = vmcb_gpa;
    + svm->nested.vmcb12_gpa = vmcb_gpa;
    load_nested_vmcb_control(svm, &nested_vmcb->control);
    nested_prepare_vmcb_save(svm, nested_vmcb);
    nested_prepare_vmcb_control(svm);
    @@ -568,7 +568,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
    struct vmcb *vmcb = svm->vmcb;
    struct kvm_host_map map;

    - rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb), &map);
    + rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb12_gpa), &map);
    if (rc) {
    if (rc == -EINVAL)
    kvm_inject_gp(&svm->vcpu, 0);
    @@ -579,7 +579,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm)

    /* Exit Guest-Mode */
    leave_guest_mode(&svm->vcpu);
    - svm->nested.vmcb = 0;
    + svm->nested.vmcb12_gpa = 0;
    WARN_ON_ONCE(svm->nested.nested_run_pending);

    /* in case we halted in L2 */
    @@ -1018,7 +1018,7 @@ static int svm_get_nested_state(struct kvm_vcpu *vcpu,

    /* First fill in the header and copy it out. */
    if (is_guest_mode(vcpu)) {
    - kvm_state.hdr.svm.vmcb_pa = svm->nested.vmcb;
    + kvm_state.hdr.svm.vmcb_pa = svm->nested.vmcb12_gpa;
    kvm_state.size += KVM_STATE_NESTED_SVM_VMCB_SIZE;
    kvm_state.flags |= KVM_STATE_NESTED_GUEST_MODE;

    @@ -1128,7 +1128,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
    copy_vmcb_control_area(&hsave->control, &svm->vmcb->control);
    hsave->save = save;

    - svm->nested.vmcb = kvm_state->hdr.svm.vmcb_pa;
    + svm->nested.vmcb12_gpa = kvm_state->hdr.svm.vmcb_pa;
    load_nested_vmcb_control(svm, &ctl);
    nested_prepare_vmcb_control(svm);

    diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
    index 562a79e3e63a..d33013b9b4d7 100644
    --- a/arch/x86/kvm/svm/svm.c
    +++ b/arch/x86/kvm/svm/svm.c
    @@ -1102,7 +1102,7 @@ static void init_vmcb(struct vcpu_svm *svm)
    }
    svm->asid_generation = 0;

    - svm->nested.vmcb = 0;
    + svm->nested.vmcb12_gpa = 0;
    svm->vcpu.arch.hflags = 0;

    if (!kvm_pause_in_guest(svm->vcpu.kvm)) {
    @@ -3884,7 +3884,7 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate)
    /* FED8h - SVM Guest */
    put_smstate(u64, smstate, 0x7ed8, 1);
    /* FEE0h - SVM Guest VMCB Physical Address */
    - put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb);
    + put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb12_gpa);

    svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
    svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
    @@ -3903,17 +3903,18 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate)
    struct vmcb *nested_vmcb;
    struct kvm_host_map map;
    u64 guest;
    - u64 vmcb;
    + u64 vmcb12_gpa;
    int ret = 0;

    guest = GET_SMSTATE(u64, smstate, 0x7ed8);
    - vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);
    + vmcb12_gpa = GET_SMSTATE(u64, smstate, 0x7ee0);

    if (guest) {
    - if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb), &map) == -EINVAL)
    + if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb12_gpa), &map) == -EINVAL)
    return 1;
    +
    nested_vmcb = map.hva;
    - ret = enter_svm_guest_mode(svm, vmcb, nested_vmcb);
    + ret = enter_svm_guest_mode(svm, vmcb12_gpa, nested_vmcb);
    kvm_vcpu_unmap(&svm->vcpu, &map, true);
    }

    diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
    index a798e1731709..ab913468f9cb 100644
    --- a/arch/x86/kvm/svm/svm.h
    +++ b/arch/x86/kvm/svm/svm.h
    @@ -85,7 +85,7 @@ struct svm_nested_state {
    struct vmcb *hsave;
    u64 hsave_msr;
    u64 vm_cr_msr;
    - u64 vmcb;
    + u64 vmcb12_gpa;
    u32 host_intercept_exceptions;

    /* These are the merged vectors */
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-08-20 15:34    [W:4.139 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site