From: Yosry Ahmed <yosryahmed@google.com>
To: Huacai Chen <chenhuacai@kernel.org>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Anup Patel <anup@brainfault.org>,
Atish Patra <atishp@atishpatra.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>,
Joerg Roedel <joro@8bytes.org>
Cc: mizhang@google.com, David Matlack <dmatlack@google.com>,
kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
linux-mips@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Shakeel Butt <shakeelb@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Yosry Ahmed <yosryahmed@google.com>
Subject: [PATCH v2 4/5] KVM: riscv: mm: count KVM page table pages in pagetable stats
Date: Mon, 4 Apr 2022 23:41:53 +0000 [thread overview]
Message-ID: <20220404234154.1251388-5-yosryahmed@google.com> (raw)
In-Reply-To: <20220404234154.1251388-1-yosryahmed@google.com>
Count the pages used by KVM in riscv for page tables in pagetable stats.
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
---
arch/riscv/kvm/mmu.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c
index f80a34fbf102..fcfb75713750 100644
--- a/arch/riscv/kvm/mmu.c
+++ b/arch/riscv/kvm/mmu.c
@@ -152,6 +152,7 @@ static int stage2_set_pte(struct kvm *kvm, u32 level,
next_ptep = kvm_mmu_memory_cache_alloc(pcache);
if (!next_ptep)
return -ENOMEM;
+ kvm_account_pgtable_pages((void *)next_ptep, +1);
*ptep = pfn_pte(PFN_DOWN(__pa(next_ptep)),
__pgprot(_PAGE_TABLE));
} else {
@@ -229,6 +230,7 @@ static void stage2_op_pte(struct kvm *kvm, gpa_t addr,
pte_t *next_ptep;
u32 next_ptep_level;
unsigned long next_page_size, page_size;
+ struct page *p;
ret = stage2_level_to_page_size(ptep_level, &page_size);
if (ret)
@@ -252,8 +254,13 @@ static void stage2_op_pte(struct kvm *kvm, gpa_t addr,
for (i = 0; i < PTRS_PER_PTE; i++)
stage2_op_pte(kvm, addr + i * next_page_size,
&next_ptep[i], next_ptep_level, op);
- if (op == STAGE2_OP_CLEAR)
- put_page(virt_to_page(next_ptep));
+ if (op == STAGE2_OP_CLEAR) {
+ p = virt_to_page(next_ptep);
+ if (page_count(p) == 1)
+ kvm_account_pgtable_pages((void *)next_ptep,
+ -1);
+ put_page(p);
+ }
} else {
if (op == STAGE2_OP_CLEAR)
set_pte(ptep, __pte(0));
@@ -700,25 +707,27 @@ int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu,
int kvm_riscv_stage2_alloc_pgd(struct kvm *kvm)
{
struct page *pgd_page;
+ int order;
if (kvm->arch.pgd != NULL) {
kvm_err("kvm_arch already initialized?\n");
return -EINVAL;
}
- pgd_page = alloc_pages(GFP_KERNEL | __GFP_ZERO,
- get_order(stage2_pgd_size));
+ order = get_order(stage2_pgd_size);
+ pgd_page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order);
if (!pgd_page)
return -ENOMEM;
kvm->arch.pgd = page_to_virt(pgd_page);
kvm->arch.pgd_phys = page_to_phys(pgd_page);
-
+ kvm_account_pgtable_pages((void *)kvm->arch.pgd, +(1UL << order));
return 0;
}
void kvm_riscv_stage2_free_pgd(struct kvm *kvm)
{
void *pgd = NULL;
+ int order;
spin_lock(&kvm->mmu_lock);
if (kvm->arch.pgd) {
@@ -729,8 +738,11 @@ void kvm_riscv_stage2_free_pgd(struct kvm *kvm)
}
spin_unlock(&kvm->mmu_lock);
- if (pgd)
- free_pages((unsigned long)pgd, get_order(stage2_pgd_size));
+ if (pgd) {
+ order = get_order(stage2_pgd_size);
+ kvm_account_pgtable_pages((void *)pgd, -(1UL << order));
+ free_pages((unsigned long)pgd, order);
+ }
}
void kvm_riscv_stage2_update_hgatp(struct kvm_vcpu *vcpu)
--
2.35.1.1094.g7c7d902a7c-goog
next prev parent reply other threads:[~2022-04-04 23:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 23:41 [PATCH v2 0/5] KVM: mm: count KVM page table pages in pagetable stats Yosry Ahmed
2022-04-04 23:41 ` [PATCH v2 1/5] KVM: mm: add a helper to account page table pages used by KVM Yosry Ahmed
2022-04-04 23:41 ` [PATCH v2 2/5] KVM: x86: mm: count KVM page table pages in pagetable stats Yosry Ahmed
2022-04-04 23:41 ` [PATCH v2 3/5] KVM: arm64: " Yosry Ahmed
2022-04-04 23:41 ` Yosry Ahmed [this message]
2022-04-04 23:41 ` [PATCH v2 5/5] KVM: mips: " Yosry Ahmed
2022-04-05 18:44 ` [PATCH v2 0/5] KVM: " Sean Christopherson
2022-04-05 18:50 ` Yosry Ahmed
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=20220404234154.1251388-5-yosryahmed@google.com \
--to=yosryahmed@google.com \
--cc=akpm@linux-foundation.org \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=anup@brainfault.org \
--cc=atishp@atishpatra.org \
--cc=chenhuacai@kernel.org \
--cc=dmatlack@google.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mizhang@google.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=shakeelb@google.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/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).