From: Vincent Donnefort <vdonnefort@google.com>
To: maz@kernel.org, oupton@kernel.org, kvmarm@lists.linux.dev,
linux-arm-kernel@lists.infradead.org
Cc: joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com,
yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org,
kernel-team@android.com, fuad.tabba@linux.dev,
qperret@google.com, weilin.chang@arm.com,
Vincent Donnefort <vdonnefort@google.com>
Subject: [PATCH v2 20/22] KVM: arm64: Add PKVM_HYP_REQ_SPLIT
Date: Fri, 11 Sep 2026 14:50:51 +0100 [thread overview]
Message-ID: <20260911135053.146435-21-vdonnefort@google.com> (raw)
In-Reply-To: <20260911135053.146435-1-vdonnefort@google.com>
With the upcoming support for stage-2 huge mappings for protected VMs,
we need a way to split blocks. Since the host has its own "copy" of the
guest stage-2 in the pkvm_mappings rb-tree, the split must be done
simultaneously for both that tree and the guest stage-2. Therefore the
hypervisor can't do it on its own and must rely on the host for this
operation.
Create a pKVM hypervisor request to ask the host to split a specified
region of the guest. On this request, the host can synchronise the split
of both guest stage-2 (HVC __pkvm_host_split_guest) and the
pkvm_mappings tree. It ensures a concurrent VM teardown can't observe a
PMD_SIZE pkvm_mapping while the guest stage-2 is PAGE_SIZE.
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
---
arch/arm64/include/asm/kvm_host.h | 7 ++
arch/arm64/include/asm/kvm_pkvm.h | 5 +-
arch/arm64/kvm/pkvm.c | 145 ++++++++++++++++++++++++++++++
arch/arm64/kvm/trace_pkvm.h | 5 +-
4 files changed, 159 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index ea76c0f3120e..c4cb2232d4c8 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -87,11 +87,18 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu);
enum pkvm_hyp_req_type {
PKVM_HYP_NO_REQ = 0,
+ PKVM_HYP_REQ_SPLIT,
__PKVM_HYP_REQ_TYPE_MAX,
};
struct pkvm_hyp_req {
u8 type;
+ union {
+ struct {
+ u32 nr_pages;
+ u64 gfn;
+ } split;
+ };
};
struct kvm_hyp_memcache {
diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h
index 7240dcc4f395..33c94f353eda 100644
--- a/arch/arm64/include/asm/kvm_pkvm.h
+++ b/arch/arm64/include/asm/kvm_pkvm.h
@@ -196,7 +196,10 @@ static inline size_t pkvm_host_sve_state_size(void)
}
struct pkvm_mapping {
- struct rb_node node;
+ union {
+ struct rb_node node;
+ struct list_head list;
+ };
u64 gfn;
u64 pfn;
struct {
diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c
index 02ad686d7661..2840053ef2f4 100644
--- a/arch/arm64/kvm/pkvm.c
+++ b/arch/arm64/kvm/pkvm.c
@@ -362,6 +362,64 @@ INTERVAL_TREE_DEFINE(struct pkvm_mapping, node, u64, __subtree_last,
}); \
)
+static void pkvm_mapping_free_spares(struct list_head *spares)
+{
+ struct pkvm_mapping *m, *tmp;
+
+ list_for_each_entry_safe(m, tmp, spares, list) {
+ list_del(&m->list);
+ kfree(m);
+ }
+}
+
+static int pkvm_mapping_alloc_spares(struct list_head *head, u64 nr_spares)
+{
+ struct pkvm_mapping *m;
+
+ while (nr_spares--) {
+ m = kzalloc_obj(*m, GFP_KERNEL_ACCOUNT);
+ if (!m) {
+ pkvm_mapping_free_spares(head);
+ return -ENOMEM;
+ }
+
+ list_add(&m->list, head);
+ }
+
+ return 0;
+}
+
+static void pkvm_mapping_split(struct pkvm_mapping *mapping, struct kvm_pgtable *pgt,
+ struct list_head *spares)
+{
+ struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu);
+ u64 nr_pages = mapping->nr_pages - 1;
+ gfn_t gfn = mapping->gfn + 1;
+ u64 pfn = mapping->pfn + 1;
+
+ lockdep_assert_held_write(&kvm->mmu_lock);
+
+ pkvm_mapping_remove(mapping, &pgt->pkvm_mappings);
+ mapping->nr_pages = 1;
+ pkvm_mapping_insert(mapping, &pgt->pkvm_mappings);
+
+ while (nr_pages--) {
+ struct pkvm_mapping *m;
+
+ if (WARN_ON(list_empty(spares)))
+ break;
+
+ m = list_first_entry(spares, struct pkvm_mapping, list);
+ list_del(&m->list);
+
+ m->nr_pages = 1;
+ m->gfn = gfn++;
+ m->pfn = pfn++;
+
+ pkvm_mapping_insert(m, &pgt->pkvm_mappings);
+ }
+}
+
int pkvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,
struct kvm_pgtable_mm_ops *mm_ops)
{
@@ -624,6 +682,73 @@ int pkvm_pgtable_stage2_split(struct kvm_pgtable *pgt, u64 addr, u64 size,
return -EINVAL;
}
+/*
+ * Splitting is only expected on the back of a guest HVC, while
+ * pkvm_pgtable_stage2_split() can be called with dirty logging.
+ */
+static int __pkvm_pgtable_stage2_split(struct kvm_vcpu *vcpu, phys_addr_t ipa, u64 size)
+{
+ struct kvm_hyp_memcache *mc = &vcpu->arch.pkvm_memcache;
+ struct kvm_pgtable *pgt = vcpu->arch.hw_mmu->pgt;
+ struct pkvm_mapping *mapping;
+ struct kvm *kvm = vcpu->kvm;
+ struct list_head spares;
+ u64 nr_pages;
+ int ret;
+
+ if (WARN_ON(!kvm_vm_is_protected(kvm)))
+ return -EINVAL;
+
+ if (!IS_ALIGNED(ipa, PMD_SIZE) || size != PMD_SIZE)
+ return -EINVAL;
+
+ ret = topup_hyp_memcache(mc, 1);
+ if (ret)
+ return ret;
+
+ /* We already have 1 pin on the huge-page */
+ nr_pages = (size / PAGE_SIZE) - 1;
+
+ INIT_LIST_HEAD(&spares);
+ ret = pkvm_mapping_alloc_spares(&spares, nr_pages);
+ if (ret)
+ return ret;
+
+ write_lock(&kvm->mmu_lock);
+
+ mapping = pkvm_mapping_iter_first(&pgt->pkvm_mappings, ipa, ipa + size - 1);
+ if (!mapping) {
+ ret = -EPERM;
+ goto unlock_mmu;
+ } else if (mapping->nr_pages == 1) {
+ /* We've raced with another vCPU */
+ ret = 0;
+ goto unlock_mmu;
+ } else if (mapping->nr_pages * PAGE_SIZE != PMD_SIZE) {
+ ret = -EINVAL;
+ goto unlock_mmu;
+ }
+
+ ret = folio_add_pins(page_folio(pfn_to_page(mapping->pfn)), nr_pages);
+ if (ret)
+ goto unlock_mmu;
+
+ ret = kvm_call_hyp_nvhe(__pkvm_host_split_guest, gpa_to_gfn(ipa), size / PAGE_SIZE);
+ if (ret) {
+ for (int i = 0; i < nr_pages; i++)
+ unpin_user_page(pfn_to_page(mapping->pfn + 1 + i));
+ goto unlock_mmu;
+ }
+
+ pkvm_mapping_split(mapping, pgt, &spares);
+
+unlock_mmu:
+ write_unlock(&kvm->mmu_lock);
+ pkvm_mapping_free_spares(&spares);
+
+ return ret;
+}
+
/*
* Forcefully reclaim a page from the guest, zeroing its contents and
* poisoning the stage-2 pte so that pages can no longer be mapped at
@@ -636,11 +761,31 @@ bool pkvm_force_reclaim_guest_page(phys_addr_t phys)
return !ret || ret == -EAGAIN;
}
+static int pkvm_hyp_req_handle_split(struct kvm_vcpu *vcpu, u64 gfn, u64 nr_pages)
+{
+ phys_addr_t addr = ALIGN_DOWN(gfn << PAGE_SHIFT, PMD_SIZE);
+ phys_addr_t end = ALIGN((gfn + nr_pages) << PAGE_SHIFT, PMD_SIZE);
+
+ while (addr < end) {
+ int ret = __pkvm_pgtable_stage2_split(vcpu, addr, PMD_SIZE);
+
+ if (ret)
+ return ret;
+
+ addr += PMD_SIZE;
+ }
+
+ return 0;
+}
+
static int pkvm_hyp_req_handle(struct pkvm_hyp_req *req, struct kvm_vcpu *vcpu)
{
int ret = -EINVAL;
switch (req->type) {
+ case PKVM_HYP_REQ_SPLIT:
+ ret = pkvm_hyp_req_handle_split(vcpu, req->split.gfn, req->split.nr_pages);
+ break;
}
trace_kvm_handle_pkvm_hyp_req(req, ret);
diff --git a/arch/arm64/kvm/trace_pkvm.h b/arch/arm64/kvm/trace_pkvm.h
index 3966c111e3ad..801c6e9aaa4c 100644
--- a/arch/arm64/kvm/trace_pkvm.h
+++ b/arch/arm64/kvm/trace_pkvm.h
@@ -10,8 +10,9 @@
TRACE_DEFINE_ENUM(PKVM_HYP_NO_REQ);
-#define PKVM_HYP_REQ_TYPES \
- { PKVM_HYP_NO_REQ, "NO_REQ" }
+#define PKVM_HYP_REQ_TYPES \
+ { PKVM_HYP_NO_REQ, "NO_REQ" }, \
+ { PKVM_HYP_REQ_SPLIT, "SPLIT" },
TRACE_EVENT(kvm_handle_pkvm_hyp_req,
TP_PROTO(struct pkvm_hyp_req *req, int ret),
--
2.55.0.1007.g17ff1f9808-goog
next prev parent reply other threads:[~2026-09-11 13:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-11 13:50 [PATCH v2 00/22] Huge mapping support for protected VMs Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 01/22] KVM: arm64: Prefault host stage-2 entries on block split Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 02/22] KVM: arm64: Propagate host stage-2 annotated " Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 03/22] KVM: arm64: Allow block-level stage-2 annotation Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 04/22] KVM: arm64: Use block-level annotations when setting up the host stage-2 Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 05/22] KVM: arm64: Make pKVM ownership selftest an HVC Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 06/22] KVM: arm64: Add a range to __pkvm_host_share/unshare_hyp() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 07/22] KVM: arm64: Add a range to __pkvm_host_donate_guest() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 08/22] KVM: arm64: Add a range to hyp_poison_page() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 09/22] KVM: arm64: Add a range to __pkvm_host_reclaim_guest() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 10/22] KVM: arm64: Add a range to __pkvm_guest_share_host() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 11/22] KVM: arm64: Add a range to __pkvm_guest_unshare_host() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 12/22] KVM: arm64: Handle huge mappings in __pkvm_host_force_reclaim_page_guest() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 13/22] KVM: arm64: Handle huge mappings in __pkvm_vcpu_in_poison_fault() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 14/22] KVM: arm64: Add a range to pKVM ownership selftest Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 15/22] KVM: arm64: Warn on pKVM guest stage-2 block collapse Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 16/22] KVM: arm64: Add pkvm_hyp_req infrastructure Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 17/22] KVM: arm64: Introduce kvm_pgtable_stage2_table_install() Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 18/22] KVM: arm64: Add __pkvm_host_split_guest HVC Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 19/22] KVM: arm64: Extend pKVM page ownership selftests to cover guest block split Vincent Donnefort
2026-09-11 13:50 ` Vincent Donnefort [this message]
2026-09-11 13:50 ` [PATCH v2 21/22] KVM: arm64: Raise PKVM_HYP_REQ_SPLIT on guest to host sharing Vincent Donnefort
2026-09-11 13:50 ` [PATCH v2 22/22] KVM: arm64: Stage-2 huge mappings for protected VMs Vincent Donnefort
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=20260911135053.146435-21-vdonnefort@google.com \
--to=vdonnefort@google.com \
--cc=catalin.marinas@arm.com \
--cc=fuad.tabba@linux.dev \
--cc=joey.gouly@arm.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oupton@kernel.org \
--cc=qperret@google.com \
--cc=seiden@linux.ibm.com \
--cc=suzuki.poulose@arm.com \
--cc=weilin.chang@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.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