lkml.org 
[lkml]   [2022]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 3/8] KVM: Drop unused @gpa param from gfn=>pfn cache's __release_gpc() helper
    From
    Drop the @pga param from __release_gpc() and rename the helper to make it
    more obvious that the cache itself is not being released. The helper
    will be reused by a future commit to release a pfn+khva combination that
    is _never_ associated with the cache, at which point the current name
    would go from slightly misleading to blatantly wrong.

    No functional change intended.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    virt/kvm/pfncache.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c
    index dd84676615f1..e05a6a1b8eff 100644
    --- a/virt/kvm/pfncache.c
    +++ b/virt/kvm/pfncache.c
    @@ -95,7 +95,7 @@ bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
    }
    EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_check);

    -static void __release_gpc(struct kvm *kvm, kvm_pfn_t pfn, void *khva, gpa_t gpa)
    +static void gpc_release_pfn_and_khva(struct kvm *kvm, kvm_pfn_t pfn, void *khva)
    {
    /* Unmap the old page if it was mapped before, and release it */
    if (!is_error_noslot_pfn(pfn)) {
    @@ -146,7 +146,6 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
    unsigned long page_offset = gpa & ~PAGE_MASK;
    kvm_pfn_t old_pfn, new_pfn;
    unsigned long old_uhva;
    - gpa_t old_gpa;
    void *old_khva;
    bool old_valid;
    int ret = 0;
    @@ -160,7 +159,6 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,

    write_lock_irq(&gpc->lock);

    - old_gpa = gpc->gpa;
    old_pfn = gpc->pfn;
    old_khva = gpc->khva - offset_in_page(gpc->khva);
    old_uhva = gpc->uhva;
    @@ -244,7 +242,7 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc,
    out:
    write_unlock_irq(&gpc->lock);

    - __release_gpc(kvm, old_pfn, old_khva, old_gpa);
    + gpc_release_pfn_and_khva(kvm, old_pfn, old_khva);

    return ret;
    }
    @@ -254,14 +252,12 @@ void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)
    {
    void *old_khva;
    kvm_pfn_t old_pfn;
    - gpa_t old_gpa;

    write_lock_irq(&gpc->lock);

    gpc->valid = false;

    old_khva = gpc->khva - offset_in_page(gpc->khva);
    - old_gpa = gpc->gpa;
    old_pfn = gpc->pfn;

    /*
    @@ -273,7 +269,7 @@ void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc)

    write_unlock_irq(&gpc->lock);

    - __release_gpc(kvm, old_pfn, old_khva, old_gpa);
    + gpc_release_pfn_and_khva(kvm, old_pfn, old_khva);
    }
    EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_unmap);

    --
    2.36.0.rc2.479.g8af0fa9b8e-goog
    \
     
     \ /
      Last update: 2022-04-27 03:40    [W:4.113 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site