| Message ID | 20210717095541.1486210-6-maz@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: Remove kvm_is_transparent_hugepage() and friends | expand |
On 17/07/21 11:55, Marc Zyngier wrote: > Nobody is using kvm_get_pfn() anymore. Get rid of it. > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > include/linux/kvm_host.h | 1 - > virt/kvm/kvm_main.c | 9 +-------- > 2 files changed, 1 insertion(+), 9 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index ae7735b490b4..9818d271c2a1 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -824,7 +824,6 @@ void kvm_release_pfn_clean(kvm_pfn_t pfn); > void kvm_release_pfn_dirty(kvm_pfn_t pfn); > void kvm_set_pfn_dirty(kvm_pfn_t pfn); > void kvm_set_pfn_accessed(kvm_pfn_t pfn); > -void kvm_get_pfn(kvm_pfn_t pfn); > > void kvm_release_pfn(kvm_pfn_t pfn, bool dirty, struct gfn_to_pfn_cache *cache); > int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 2e410a8a6a67..0284418c4400 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2215,7 +2215,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, > * Get a reference here because callers of *hva_to_pfn* and > * *gfn_to_pfn* ultimately call kvm_release_pfn_clean on the > * returned pfn. This is only needed if the VMA has VM_MIXEDMAP > - * set, but the kvm_get_pfn/kvm_release_pfn_clean pair will > + * set, but the kvm_try_get_pfn/kvm_release_pfn_clean pair will > * simply do nothing for reserved pfns. > * > * Whoever called remap_pfn_range is also going to call e.g. > @@ -2612,13 +2612,6 @@ void kvm_set_pfn_accessed(kvm_pfn_t pfn) > } > EXPORT_SYMBOL_GPL(kvm_set_pfn_accessed); > > -void kvm_get_pfn(kvm_pfn_t pfn) > -{ > - if (!kvm_is_reserved_pfn(pfn)) > - get_page(pfn_to_page(pfn)); > -} > -EXPORT_SYMBOL_GPL(kvm_get_pfn); > - > static int next_segment(unsigned long len, int offset) > { > if (len > PAGE_SIZE - offset) > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ae7735b490b4..9818d271c2a1 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -824,7 +824,6 @@ void kvm_release_pfn_clean(kvm_pfn_t pfn); void kvm_release_pfn_dirty(kvm_pfn_t pfn); void kvm_set_pfn_dirty(kvm_pfn_t pfn); void kvm_set_pfn_accessed(kvm_pfn_t pfn); -void kvm_get_pfn(kvm_pfn_t pfn); void kvm_release_pfn(kvm_pfn_t pfn, bool dirty, struct gfn_to_pfn_cache *cache); int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2e410a8a6a67..0284418c4400 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2215,7 +2215,7 @@ static int hva_to_pfn_remapped(struct vm_area_struct *vma, * Get a reference here because callers of *hva_to_pfn* and * *gfn_to_pfn* ultimately call kvm_release_pfn_clean on the * returned pfn. This is only needed if the VMA has VM_MIXEDMAP - * set, but the kvm_get_pfn/kvm_release_pfn_clean pair will + * set, but the kvm_try_get_pfn/kvm_release_pfn_clean pair will * simply do nothing for reserved pfns. * * Whoever called remap_pfn_range is also going to call e.g. @@ -2612,13 +2612,6 @@ void kvm_set_pfn_accessed(kvm_pfn_t pfn) } EXPORT_SYMBOL_GPL(kvm_set_pfn_accessed); -void kvm_get_pfn(kvm_pfn_t pfn) -{ - if (!kvm_is_reserved_pfn(pfn)) - get_page(pfn_to_page(pfn)); -} -EXPORT_SYMBOL_GPL(kvm_get_pfn); - static int next_segment(unsigned long len, int offset) { if (len > PAGE_SIZE - offset)
Nobody is using kvm_get_pfn() anymore. Get rid of it. Signed-off-by: Marc Zyngier <maz@kernel.org> --- include/linux/kvm_host.h | 1 - virt/kvm/kvm_main.c | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-)