KVM: arm64: Drop @max param from mmu_topup_memory_cache() (61ffb3a5) · Commits · 戴 / test

arch/arm64/kvm/mmu.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -124,15 +124,13 @@ static void stage2_dissolve_pud(struct kvm kvm, phys_addr_t addr, pud_t pudp)
		put_page(virt_to_page(pudp));
		}

		static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache,
		int min, int max)
		static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, int min)
		{
		void *page;

		BUG_ON(max > KVM_NR_MEM_OBJS);
		if (cache->nobjs >= min)
		return 0;
		while (cache->nobjs < max) {
		while (cache->nobjs < ARRAY_SIZE(cache->objects)) {
		page = (void *)__get_free_page(GFP_PGTABLE_USER);
		if (!page)
		return -ENOMEM;
		@@ -1481,8 +1479,7 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
		pte = kvm_s2pte_mkwrite(pte);

		ret = mmu_topup_memory_cache(&cache,
		kvm_mmu_cache_min_pages(kvm),
		KVM_NR_MEM_OBJS);
		kvm_mmu_cache_min_pages(kvm));
		if (ret)
		goto out;
		spin_lock(&kvm->mmu_lock);
		@@ -1882,8 +1879,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
		mmap_read_unlock(current->mm);

		/* We need minimum second+third level pages */
		ret = mmu_topup_memory_cache(memcache, kvm_mmu_cache_min_pages(kvm),
		KVM_NR_MEM_OBJS);
		ret = mmu_topup_memory_cache(memcache, kvm_mmu_cache_min_pages(kvm));
		if (ret)
		return ret;