From: Quentin Perret <qperret@google.com>
To: Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org,
kernel-team@android.com
Subject: [PATCH v3 04/15] KVM: arm64: Fixup hyp stage-1 refcount
Date: Wed, 1 Dec 2021 17:03:58 +0000 [thread overview]
Message-ID: <20211201170411.1561936-5-qperret@google.com> (raw)
In-Reply-To: <20211201170411.1561936-1-qperret@google.com>
In nVHE-protected mode, the hyp stage-1 page-table refcount is broken
due to the lack of refcount support in the early allocator. Fix-up the
refcount in the finalize walker, once the 'hyp_vmemmap' is up and running.
Signed-off-by: Quentin Perret <qperret@google.com>
---
arch/arm64/kvm/hyp/nvhe/setup.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c
index 578f71798c2e..875b5174342f 100644
--- a/arch/arm64/kvm/hyp/nvhe/setup.c
+++ b/arch/arm64/kvm/hyp/nvhe/setup.c
@@ -165,6 +165,7 @@ static int finalize_host_mappings_walker(u64 addr, u64 end, u32 level,
enum kvm_pgtable_walk_flags flag,
void * const arg)
{
+ struct kvm_pgtable_mm_ops *mm_ops = arg;
enum kvm_pgtable_prot prot;
enum pkvm_page_state state;
kvm_pte_t pte = *ptep;
@@ -173,6 +174,15 @@ static int finalize_host_mappings_walker(u64 addr, u64 end, u32 level,
if (!kvm_pte_valid(pte))
return 0;
+ /*
+ * Fix-up the refcount for the page-table pages as the early allocator
+ * was unable to access the hyp_vmemmap and so the buddy allocator has
+ * initialised the refcount to '1'.
+ */
+ mm_ops->get_page(ptep);
+ if (flag != KVM_PGTABLE_WALK_LEAF)
+ return 0;
+
if (level != (KVM_PGTABLE_MAX_LEVELS - 1))
return -EINVAL;
@@ -205,7 +215,8 @@ static int finalize_host_mappings(void)
{
struct kvm_pgtable_walker walker = {
.cb = finalize_host_mappings_walker,
- .flags = KVM_PGTABLE_WALK_LEAF,
+ .flags = KVM_PGTABLE_WALK_LEAF | KVM_PGTABLE_WALK_TABLE_POST,
+ .arg = pkvm_pgtable.mm_ops,
};
int i, ret;
@@ -240,10 +251,6 @@ void __noreturn __pkvm_init_finalise(void)
if (ret)
goto out;
- ret = finalize_host_mappings();
- if (ret)
- goto out;
-
pkvm_pgtable_mm_ops = (struct kvm_pgtable_mm_ops) {
.zalloc_page = hyp_zalloc_hyp_page,
.phys_to_virt = hyp_phys_to_virt,
@@ -253,6 +260,10 @@ void __noreturn __pkvm_init_finalise(void)
};
pkvm_pgtable.mm_ops = &pkvm_pgtable_mm_ops;
+ ret = finalize_host_mappings();
+ if (ret)
+ goto out;
+
out:
/*
* We tail-called to here from handle___pkvm_init() and will not return,
--
2.34.0.rc2.393.gf8c9666880-goog
next prev parent reply other threads:[~2021-12-01 17:05 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 17:03 [PATCH v3 00/15] KVM: arm64: Introduce kvm_share_hyp() Quentin Perret
2021-12-01 17:03 ` [PATCH v3 01/15] KVM: arm64: Check if running in VHE from kvm_host_owns_hyp_mappings() Quentin Perret
2021-12-09 10:10 ` Will Deacon
2021-12-10 13:37 ` Quentin Perret
2021-12-01 17:03 ` [PATCH v3 02/15] KVM: arm64: Provide {get,put}_page() stubs for early hyp allocator Quentin Perret
2021-12-09 10:12 ` Will Deacon
2021-12-01 17:03 ` [PATCH v3 03/15] KVM: arm64: Refcount hyp stage-1 pgtable pages Quentin Perret
2021-12-09 10:29 ` Will Deacon
2021-12-10 14:34 ` Quentin Perret
2021-12-13 12:53 ` Will Deacon
2021-12-01 17:03 ` Quentin Perret [this message]
2021-12-09 11:09 ` [PATCH v3 04/15] KVM: arm64: Fixup hyp stage-1 refcount Will Deacon
2021-12-01 17:03 ` [PATCH v3 05/15] KVM: arm64: Hook up ->page_count() for hypervisor stage-1 page-table Quentin Perret
2021-12-01 17:04 ` [PATCH v3 06/15] KVM: arm64: Implement kvm_pgtable_hyp_unmap() at EL2 Quentin Perret
2021-12-07 14:47 ` Andrew Walbran
2021-12-08 9:51 ` Quentin Perret
2021-12-08 14:40 ` Andrew Walbran
2021-12-15 16:02 ` Quentin Perret
2021-12-01 17:04 ` [PATCH v3 07/15] KVM: arm64: Introduce kvm_share_hyp() Quentin Perret
2021-12-09 11:13 ` Will Deacon
2021-12-10 14:37 ` Quentin Perret
2021-12-01 17:04 ` [PATCH v3 08/15] KVM: arm64: pkvm: Refcount the pages shared with EL2 Quentin Perret
2021-12-09 11:16 ` Will Deacon
2021-12-01 17:04 ` [PATCH v3 09/15] KVM: arm64: Extend pkvm_page_state enumeration to handle absent pages Quentin Perret
2021-12-14 14:47 ` Andrew Walbran
2021-12-01 17:04 ` [PATCH v3 10/15] KVM: arm64: Introduce wrappers for host and hyp spin lock accessors Quentin Perret
2021-12-14 14:48 ` Andrew Walbran
2021-12-14 14:52 ` Will Deacon
2021-12-01 17:04 ` [PATCH v3 11/15] KVM: arm64: Implement do_share() helper for sharing memory Quentin Perret
2021-12-10 15:18 ` Andrew Walbran
2021-12-01 17:04 ` [PATCH v3 12/15] KVM: arm64: Implement __pkvm_host_share_hyp() using do_share() Quentin Perret
2021-12-01 17:04 ` [PATCH v3 13/15] KVM: arm64: Implement do_unshare() helper for unsharing memory Quentin Perret
2021-12-10 15:08 ` Andrew Walbran
2021-12-01 17:04 ` [PATCH v3 14/15] KVM: arm64: Expose unshare hypercall to the host Quentin Perret
2021-12-01 17:04 ` [PATCH v3 15/15] KVM: arm64: pkvm: Unshare guest structs during teardown Quentin Perret
2021-12-09 11:22 ` Will Deacon
2021-12-10 14:48 ` Quentin Perret
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=20211201170411.1561936-5-qperret@google.com \
--to=qperret@google.com \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=will@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).