Skip to contentSkip to conversation

KVM: Drop unused @may_block param from gfn_to_pfn_cache_invalidate_start()

PATCH Applied Sean Christopherson 3 participants 4 messages Mar 5, 2024 – Apr 10, 2024 KVM

lore
Share & tools
lore

Sean Christopherson

author reviewer
#0 lore raw

PATCH 1/1 KVM: Drop unused @may_block param from gfn_to_pfn_cache_invalidate_start()

Remove gfn_to_pfn_cache_invalidate_start()'s unused @may_block parameter, which was leftover from KVM's abandoned (for now) attempt to support guest usage of gfn_to_pfn caches.

Fixes a4bff3df5147 ("KVM: pfncache: remove KVM_GUEST_USES_PFN usage")
Cc Paul Durrant <[email protected]>
Cc David Woodhouse <[email protected]>
---
 virt/kvm/kvm_main.c | 3 +--
 virt/kvm/kvm_mm.h   | 6 ++----
 virt/kvm/pfncache.c | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
virt/kvm/kvm_main.c +1 -2
index ff588677beb7..7106b57b8468 100644
@@ -832,8 +832,7 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
 	 * mn_active_invalidate_count (see above) instead of
 	 * mmu_invalidate_in_progress.
 	 */
-	gfn_to_pfn_cache_invalidate_start(kvm, range->start, range->end,
-					  hva_range.may_block);
+	gfn_to_pfn_cache_invalidate_start(kvm, range->start, range->end);
 
 	/*
 	 * If one or more memslots were found and thus zapped, notify arch code
virt/kvm/kvm_mm.h +2 -4
index ecefc7ec51af..715f19669d01 100644
@@ -26,13 +26,11 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool interruptible,
 #ifdef CONFIG_HAVE_KVM_PFNCACHE
 void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
 				       unsigned long start,
-				       unsigned long end,
-				       bool may_block);
+				       unsigned long end);
 #else
 static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
 						     unsigned long start,
-						     unsigned long end,
-						     bool may_block)
+						     unsigned long end)
 {
 }
 #endif /* HAVE_KVM_PFNCACHE */
virt/kvm/pfncache.c +1 -1
index 9ac8c9da4eda..bff9875cdcd2 100644
@@ -23,7 +23,7 @@
  * MMU notifier 'invalidate_range_start' hook.
  */
 void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, unsigned long start,
-				       unsigned long end, bool may_block)
+				       unsigned long end)
 {
 	struct gfn_to_pfn_cache *gpc;
 

base-commit: 003d914220c97ef93cabfe3ec4e245e2383e19e9

Signature · 1 line
2.44.0.278.ge034bb2e1d-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Sean Christopherson

Remove gfn_to_pfn_cache_invalidate_start()'s unused @may_block parameter, which was leftover from KVM's abandoned (for now) attempt to support guest usage of gfn_to_pfn caches.

Fixes a4bff3df5147 ("KVM: pfncache: remove KVM_GUEST_USES_PFN usage")
Cc Paul Durrant <[email protected]>
Cc David Woodhouse <[email protected]>
Quoted 6 lines
---
  virt/kvm/kvm_main.c | 3 +--
  virt/kvm/kvm_mm.h   | 6 ++----
  virt/kvm/pfncache.c | 2 +-
  3 files changed, 4 insertions(+), 7 deletions(-)
Reviewed-by on v1 1/1
#2 lore raw
In reply to Sean Christopherson
Quoted 9 lines · Sean Christopherson

Remove gfn_to_pfn_cache_invalidate_start()'s unused @may_block parameter, which was leftover from KVM's abandoned (for now) attempt to support guest usage of gfn_to_pfn caches.

Fixes a4bff3df5147 ("KVM: pfncache: remove KVM_GUEST_USES_PFN usage")
Cc Paul Durrant <[email protected]>
Cc David Woodhouse <[email protected]>
author reviewer Applied
#3 lore raw
In reply to Sean Christopherson
Quoted 5 lines · Sean Christopherson

Remove gfn_to_pfn_cache_invalidate_start()'s unused @may_block parameter, which was leftover from KVM's abandoned (for now) attempt to support guest usage of gfn_to_pfn caches.

Applied to kvm-x86 fixes, thanks!

[1/1] KVM: Drop unused @may_block param from gfn_to_pfn_cache_invalidate_start()

      https://github.com/kvm-x86/linux/commit/b326ec064c9a

--
https://github.com/kvm-x86/linux/tree/next