| Message ID | 20240305003742.245767-1-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: Drop unused @may_block param from gfn_to_pfn_cache_invalidate_start() | expand |
On 05/03/2024 00:37, Sean Christopherson wrote: > 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") > Reported-by: Like Xu <like.xu.linux@gmail.com> > Cc: Paul Durrant <paul@xen.org> > Cc: David Woodhouse <dwmw2@infradead.org> > Signed-off-by: Sean Christopherson <seanjc@google.com> > --- > 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: Paul Durrant <paul@xen.org>
On Mon, 2024-03-04 at 16:37 -0800, Sean Christopherson wrote: > 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") > Reported-by: Like Xu <like.xu.linux@gmail.com> > Cc: Paul Durrant <paul@xen.org> > Cc: David Woodhouse <dwmw2@infradead.org> > Signed-off-by: Sean Christopherson <seanjc@google.com> Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
On Mon, 04 Mar 2024 16:37:42 -0800, Sean Christopherson wrote: > 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
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ff588677beb7..7106b57b8468 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -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 diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h index ecefc7ec51af..715f19669d01 100644 --- a/virt/kvm/kvm_mm.h +++ b/virt/kvm/kvm_mm.h @@ -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 */ diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index 9ac8c9da4eda..bff9875cdcd2 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -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;
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") Reported-by: Like Xu <like.xu.linux@gmail.com> Cc: Paul Durrant <paul@xen.org> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Sean Christopherson <seanjc@google.com> --- virt/kvm/kvm_main.c | 3 +-- virt/kvm/kvm_mm.h | 6 ++---- virt/kvm/pfncache.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) base-commit: 003d914220c97ef93cabfe3ec4e245e2383e19e9