[PATCH v2 02/22] KVM: arm64: Remove kvm_mmu_free_memory_caches()

[Gavin Shan]

On 8/18/20 11:27 PM, Will Deacon wrote:
> kvm_mmu_free_memory_caches() is only called by kvm_arch_vcpu_destroy(),
> so inline the implementation and get rid of the extra function.
> 
> Cc: Marc Zyngier <maz at kernel.org>
> Cc: Quentin Perret <qperret at google.com>
> Signed-off-by: Will Deacon <will at kernel.org>
> ---
>   arch/arm64/include/asm/kvm_mmu.h | 2 --
>   arch/arm64/kvm/arm.c             | 2 +-
>   arch/arm64/kvm/mmu.c             | 5 -----
>   3 files changed, 1 insertion(+), 8 deletions(-)
> 

Reviewed-by: Gavin Shan <gshan at redhat.com>

> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> index 189839c3706a..0f078b1920ff 100644
> --- a/arch/arm64/include/asm/kvm_mmu.h
> +++ b/arch/arm64/include/asm/kvm_mmu.h
> @@ -141,8 +141,6 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
>   
>   int kvm_handle_guest_abort(struct kvm_vcpu *vcpu);
>   
> -void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu);
> -
>   phys_addr_t kvm_mmu_get_httbr(void);
>   phys_addr_t kvm_get_idmap_vector(void);
>   int kvm_mmu_init(void);
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 691d21e4c717..c958c8f03144 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -283,7 +283,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
>   	if (vcpu->arch.has_run_once && unlikely(!irqchip_in_kernel(vcpu->kvm)))
>   		static_branch_dec(&userspace_irqchip_in_use);
>   
> -	kvm_mmu_free_memory_caches(vcpu);
> +	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);
>   	kvm_timer_vcpu_terminate(vcpu);
>   	kvm_pmu_vcpu_destroy(vcpu);
>   
> diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
> index 4a24ebdc6fc6..9bc1a5d5a310 100644
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@ -2322,11 +2322,6 @@ int kvm_test_age_hva(struct kvm *kvm, unsigned long hva)
>   				 kvm_test_age_hva_handler, NULL);
>   }
>   
> -void kvm_mmu_free_memory_caches(struct kvm_vcpu *vcpu)
> -{
> -	kvm_mmu_free_memory_cache(&vcpu->arch.mmu_page_cache);
> -}
> -
>   phys_addr_t kvm_mmu_get_httbr(void)
>   {
>   	if (__kvm_cpu_uses_extended_idmap())
>