[PATCH v3 10/11] KVM: arm64: Dispatch stage-2 destruction by VM flavor
From: Steven Price
Date: Mon Nov 16 2026 - 11:45:36 EST
Select the stage-2 destruction functions through the VM's stage-2
operations. This keeps the native and pKVM paths explicit and lets a
Realm provide its own destruction callback when Realm stage-2
operations are registered.
The Realm callback will only free the root RTT pages, because RMI
teardown destroys the non-root RTTs separately.
Signed-off-by: Steven Price <steven.price@xxxxxxx>
---
Changes since v2:
- New patch in v3; split stage-2 destruction dispatch out of the
Realm stage-2 MMU operations patch.
---
arch/arm64/include/asm/kvm_host.h | 1 +
arch/arm64/kvm/mmu.c | 37 ++++++++++++++++++-------------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 2c8cd9a1dd52..52ccb8b4ccb2 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -242,6 +242,7 @@ struct kvm_vm_s2_ops {
int (*vm_flush_remote_tlbs)(struct kvm *kvm);
int (*vm_flush_remote_tlbs_range)(struct kvm *kvm, gfn_t gfn,
u64 nr_pages);
+ void (*vm_stage2_destroy)(struct kvm_pgtable *pgt);
void (*vm_stage2_unmap_range)(struct kvm_s2_mmu *mmu,
phys_addr_t start, u64 size,
bool may_block,
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 9b371159be92..46a83c58c12f 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1026,35 +1026,39 @@ static int kvm_init_ipa_range(struct kvm_s2_mmu *mmu, unsigned long type)
* cond_resched() periodically to prevent hogging the CPU for a long time
* and schedule something else, if required.
*/
-static void stage2_destroy_range(struct kvm_pgtable *pgt, phys_addr_t addr,
- phys_addr_t end)
+static void stage2_destroy_range(struct kvm_pgtable *pgt,
+ void (*destroy_range)(struct kvm_pgtable *pgt,
+ u64 addr, u64 size))
{
+ u64 addr = 0;
+ u64 end = BIT(VTCR_EL2_IPA(pgt->mmu->vtcr));
u64 next;
do {
next = stage2_range_addr_end(addr, end);
- KVM_PGT_FN(kvm_pgtable_stage2_destroy_range)(pgt, addr,
- next - addr);
+ destroy_range(pgt, addr, next - addr);
if (next != end)
cond_resched();
} while (addr = next, addr != end);
}
+static void kvm_vm_stage2_destroy(struct kvm_pgtable *pgt)
+{
+ stage2_destroy_range(pgt, kvm_pgtable_stage2_destroy_range);
+ kvm_pgtable_stage2_destroy_pgd(pgt);
+}
+
+static void pkvm_stage2_destroy(struct kvm_pgtable *pgt)
+{
+ stage2_destroy_range(pgt, pkvm_pgtable_stage2_destroy_range);
+ pkvm_pgtable_stage2_destroy_pgd(pgt);
+}
+
static void kvm_stage2_destroy(struct kvm_pgtable *pgt)
{
struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu);
- unsigned int ia_bits = VTCR_EL2_IPA(pgt->mmu->vtcr);
-
- /*
- * Realm RTTs are inaccessible to the host and may contain stale data
- * after the RMM has released them. The non-root RTTs are explicitly
- * destroyed through RMI before the RD is destroyed; only the root PGD
- * pages remain to be freed here.
- */
- if (!kvm_vm_is_realm(kvm))
- stage2_destroy_range(pgt, 0, BIT(ia_bits));
- KVM_PGT_FN(kvm_pgtable_stage2_destroy_pgd)(pgt);
+ kvm->arch.vm_s2_ops->vm_stage2_destroy(pgt);
}
/**
@@ -3267,6 +3271,7 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu,
}
static const struct kvm_vm_s2_ops protected_pkvm_vm_s2_ops = {
+ .vm_stage2_destroy = pkvm_stage2_destroy,
.vm_flush_remote_tlbs = pkvm_flush_remote_tlbs,
.vm_flush_remote_tlbs_range = pkvm_flush_remote_tlbs_range,
.vm_age_gfn = no_age_gfn,
@@ -3276,6 +3281,7 @@ static const struct kvm_vm_s2_ops protected_pkvm_vm_s2_ops = {
};
static const struct kvm_vm_s2_ops pkvm_vm_s2_ops = {
+ .vm_stage2_destroy = pkvm_stage2_destroy,
.vm_flush_remote_tlbs = pkvm_flush_remote_tlbs,
.vm_flush_remote_tlbs_range = pkvm_flush_remote_tlbs_range,
.vm_age_gfn = pkvm_age_gfn,
@@ -3285,6 +3291,7 @@ static const struct kvm_vm_s2_ops pkvm_vm_s2_ops = {
};
static const struct kvm_vm_s2_ops kvm_default_vm_s2_ops = {
+ .vm_stage2_destroy = kvm_vm_stage2_destroy,
.vm_flush_remote_tlbs = kvm_vm_flush_remote_tlbs,
.vm_flush_remote_tlbs_range = kvm_vm_flush_remote_tlbs_range,
.vm_age_gfn = kvm_vm_age_gfn,
--
2.43.0