korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

KVM: Drop unused @gpa param from gfn=>pfn cache's __release_gpc() helper

Browse Source 
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.

Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220429210025.3293691-4-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2022-04-29 21:00:20 +00:00 committed by Paolo Bonzini
parent 0471a7bd1b
commit 345b0fd6fe
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virt/kvm/pfncache.c
View File

@ -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); 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 */ /* Unmap the old page if it was mapped before, and release it */
if (!is_error_noslot_pfn(pfn)) { 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; unsigned long page_offset = gpa & ~PAGE_MASK;
kvm_pfn_t old_pfn, new_pfn; kvm_pfn_t old_pfn, new_pfn;
unsigned long old_uhva; unsigned long old_uhva;
gpa_t old_gpa;
void *old_khva; void *old_khva;
bool old_valid; bool old_valid;
int ret = 0; 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); write_lock_irq(&gpc->lock);
old_gpa = gpc->gpa;
old_pfn = gpc->pfn; old_pfn = gpc->pfn;
old_khva = gpc->khva - offset_in_page(gpc->khva); old_khva = gpc->khva - offset_in_page(gpc->khva);
old_uhva = gpc->uhva; 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: out:
write_unlock_irq(&gpc->lock); 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; 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; void *old_khva;
kvm_pfn_t old_pfn; kvm_pfn_t old_pfn;
gpa_t old_gpa;
write_lock_irq(&gpc->lock); write_lock_irq(&gpc->lock);
gpc->valid = false; gpc->valid = false;
old_khva = gpc->khva - offset_in_page(gpc->khva); old_khva = gpc->khva - offset_in_page(gpc->khva);
old_gpa = gpc->gpa;
old_pfn = gpc->pfn; 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); 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); EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_unmap);