From: Will Deacon <will@kernel.org>
To: kvmarm@lists.cs.columbia.edu
Cc: Will Deacon <will@kernel.org>,
maz@kernel.org, kernel-team@android.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] KVM: arm64: Simplify mmu_topup_memory_cache()
Date: Thu, 23 Jul 2020 12:02:26 +0100 [thread overview]
Message-ID: <20200723110227.16001-3-will@kernel.org> (raw)
In-Reply-To: <20200723110227.16001-1-will@kernel.org>
All callers of mmu_topup_memory_cache() pass the same min/max limits.
Simplify the code by just passing the 'struct kvm' instead.
Cc: Marc Zyngier <maz@kernel.org>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
---
arch/arm64/kvm/mmu.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 9102373a9744..e55a28178164 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -124,20 +124,22 @@ 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 *kvm,
+ struct kvm_mmu_memory_cache *cache)
{
void *page;
- BUG_ON(max > KVM_NR_MEM_OBJS);
- if (cache->nobjs >= min)
+ if (cache->nobjs >= kvm_mmu_cache_min_pages(kvm))
return 0;
- while (cache->nobjs < max) {
+
+ while (cache->nobjs < KVM_NR_MEM_OBJS) {
page = (void *)__get_free_page(GFP_PGTABLE_USER);
if (!page)
return -ENOMEM;
+
cache->objects[cache->nobjs++] = page;
}
+
return 0;
}
@@ -1480,9 +1482,7 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
if (writable)
pte = kvm_s2pte_mkwrite(pte);
- ret = mmu_topup_memory_cache(&cache,
- kvm_mmu_cache_min_pages(kvm),
- KVM_NR_MEM_OBJS);
+ ret = mmu_topup_memory_cache(kvm, &cache);
if (ret)
break;
spin_lock(&kvm->mmu_lock);
@@ -1880,8 +1880,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(kvm, memcache);
if (ret)
return ret;
--
2.28.0.rc0.105.gf9edc3c819-goog
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2020-07-23 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 11:02 [PATCH 0/3] KVM: arm64: Clean up memcache usage for page-table pages Will Deacon
2020-07-23 11:02 ` [PATCH 1/3] KVM: arm64: Don't free memcache pages in kvm_phys_addr_ioremap() Will Deacon
2020-07-23 11:02 ` Will Deacon [this message]
2020-07-23 11:02 ` [PATCH 3/3] KVM: arm64: Remove mmu_free_memory_cache() Will Deacon
2020-07-27 8:45 ` [PATCH 0/3] KVM: arm64: Clean up memcache usage for page-table pages Marc Zyngier
2020-07-27 10:38 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723110227.16001-3-will@kernel.org \
--to=will@kernel.org \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).