lkml.org 
[lkml]   [2019]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 07/18] svm: Add support for setup/destroy virutal APIC backing page for AVIC
    Date
    Re-factor avic_init_access_page() to avic_update_access_page() since
    activate/deactivate AVIC requires setting/unsetting the memory region used
    for virtual APIC backing page (APIC_ACCESS_PAGE_PRIVATE_MEMSLOT).

    Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
    ---
    arch/x86/kvm/svm.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index 38401f9..3ffb437 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -1673,23 +1673,22 @@ static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu,
    * field of the VMCB. Therefore, we set up the
    * APIC_ACCESS_PAGE_PRIVATE_MEMSLOT (4KB) here.
    */
    -static int avic_init_access_page(struct kvm_vcpu *vcpu)
    +static int avic_update_access_page(struct kvm *kvm, bool activate)
    {
    - struct kvm *kvm = vcpu->kvm;
    int ret = 0;

    mutex_lock(&kvm->slots_lock);
    - if (kvm->arch.apic_access_page_done)
    + if (kvm->arch.apic_access_page_done == activate)
    goto out;

    ret = __x86_set_memory_region(kvm,
    APIC_ACCESS_PAGE_PRIVATE_MEMSLOT,
    APIC_DEFAULT_PHYS_BASE,
    - PAGE_SIZE);
    + activate ? PAGE_SIZE : 0);
    if (ret)
    goto out;

    - kvm->arch.apic_access_page_done = true;
    + kvm->arch.apic_access_page_done = activate;
    out:
    mutex_unlock(&kvm->slots_lock);
    return ret;
    @@ -1702,7 +1701,7 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu)
    int id = vcpu->vcpu_id;
    struct vcpu_svm *svm = to_svm(vcpu);

    - ret = avic_init_access_page(vcpu);
    + ret = avic_update_access_page(vcpu->kvm, true);
    if (ret)
    return ret;

    --
    1.8.3.1
    \
     
     \ /
      Last update: 2019-11-14 21:17    [W:4.873 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site