Skip to content

Commit eefb85b

Browse files
committed
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: a4bff3d ("KVM: pfncache: remove KVM_GUEST_USES_PFN usage") Reported-by: Like Xu <[email protected]> Cc: Paul Durrant <[email protected]> Cc: David Woodhouse <[email protected]> Reviewed-by: Paul Durrant <[email protected]> Reviewed-by: David Woodhouse <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]>
1 parent 40e0ee6 commit eefb85b

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

virt/kvm/kvm_main.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,7 @@ static int kvm_mmu_notifier_invalidate_range_start(struct mmu_notifier *mn,
832832
* mn_active_invalidate_count (see above) instead of
833833
* mmu_invalidate_in_progress.
834834
*/
835-
gfn_to_pfn_cache_invalidate_start(kvm, range->start, range->end,
836-
hva_range.may_block);
835+
gfn_to_pfn_cache_invalidate_start(kvm, range->start, range->end);
837836

838837
/*
839838
* If one or more memslots were found and thus zapped, notify arch code

virt/kvm/kvm_mm.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool interruptible,
2626
#ifdef CONFIG_HAVE_KVM_PFNCACHE
2727
void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
2828
unsigned long start,
29-
unsigned long end,
30-
bool may_block);
29+
unsigned long end);
3130
#else
3231
static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
3332
unsigned long start,
34-
unsigned long end,
35-
bool may_block)
33+
unsigned long end)
3634
{
3735
}
3836
#endif /* HAVE_KVM_PFNCACHE */

virt/kvm/pfncache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* MMU notifier 'invalidate_range_start' hook.
2424
*/
2525
void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm, unsigned long start,
26-
unsigned long end, bool may_block)
26+
unsigned long end)
2727
{
2828
struct gfn_to_pfn_cache *gpc;
2929

0 commit comments

Comments
 (0)