From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=91.218.175.69 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793695672; b=LPiEACtGq6xvlmiVXiCRy1x7m1wzoONb8itie5g5ekDe/eqScmi9EkZSTJdxfRSwrawq aceoHTFpaHLm0fyWomdmAvyk6dUShfofHajaad+1oD2ioqhHB9AzL5Jcjtw6JM/uazdYf TYXVnLkqALgZJ5U17/BCi6M3SQiHvslbBztcR01Ii/uJTrpedvK8VJDzFiNLJ61iXLZGp mIE8txdp6AdNfVoD1ojSS6SLY5N/+HId+EAqt/NeJmFZpw+r3TI2CXKEMTYooiTyA6Gvs otSXdIhaiXEA/Z7BhF+dUoRgb4F8imVtZdhzWVCrswkGKGPatOrqVoQ5hRbsRISrdLw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793695672; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=wgbqMxG+rMSoSEghwC8Ab1bjmOfWy1U7IH8igckfst0=; b=I1LgAZF463BgzGPHlcjFjPbv1XngtxRKr+ui2QhURNbHqzSZk+FEpxWV6bQ8CXOhBfN1 ncit78cG8oEQJP5D75KbFN0GfFc2i8k5bzog/8m60GVr4YR5mJIvptIuutXlKTMP+e724 FM+gBJ3qgkA73XA3BWi/qmAv2ymjHBzvQXqwgMyMu78DPmc++G+rNcTn2luRu6xVHudtG vpv4ADi22VEV6iIt0x/DzzciP8c/B7ELwXtWi4EHo+OtIc2gxILAAIQEuIo1ZSW4/45Rv toiOkgBOUheNBgNz/GF/8sibSDSov/isg4zOhllljrItSgFtm3J/vXfW/nLAOC4+Gew== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=LFAgAyuT; arc=none smtp.remote-ip=91.218.175.69 Received: from mta0.migadu.com (out-69.mta0.migadu.com [91.218.175.69]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 650F5606A968 for ; Tue, 3 Nov 2026 08:47:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 650F5606A968 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=LFAgAyuT X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=wk8krk/WXEgB1deJlYK3BeClqHTd5FTckwLdnXhB1Ik=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793695664; v=1; x=1794300464; b=LFAgAyuTgd/RSNGMFRU6qPs2/rSl9fS1OsnEtXMEewVzTod0YQ1gJNECV9IzMEp/mV2IpARu 9ho6aIWx4q0MA81MiXb+fvHAB69OqTD3SU6twxzUEeIxTLnr/oYgpLRtJ8/AxluETx/K98iwLX6 IxsKnyUNGKQfr1h/rn7q9gkE= X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id e56060b775514378; Tue, 03 Nov 2026 08:47:44 +0000 X-Mizu-Trace-ID: e56060b775514378 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Mark Rutland , Raghavendra Rao Ananta , Fuad Tabba Subject: [PATCH 3/3] KVM: arm64: Move stage-2 teardown into kvm_vm_s2_ops Date: Tue, 3 Nov 2026 08:47:42 +0000 Message-ID: <20261103084742.1302597-4-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261103084742.1302597-1-fuad.tabba@linux.dev> References: <20261103084742.1302597-1-fuad.tabba@linux.dev> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace kvm_stage2_destroy()'s is_protected_kvm_enabled() and KVM_PGT_FN() dispatch with a vm_stage2_destroy hook in kvm_vm_s2_ops, like the other stage-2 operations. Both pKVM flavors share pkvm_stage2_destroy(). Like kvm_vm_stage2_destroy(), it takes the range from kvm_phys_size(). No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/mmu.c | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 97332ffcb1300..b36779bafae9b 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -233,6 +233,7 @@ struct kvm_vcpu_ops { struct kvm_gfn_range; struct kvm_s2_fault_desc; +struct kvm_pgtable; struct kvm_vm_s2_ops { bool (*vm_age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range); @@ -243,6 +244,7 @@ struct kvm_vm_s2_ops { void (*vm_stage2_unmap_range)(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size, bool may_block); + void (*vm_stage2_destroy)(struct kvm_pgtable *pgt); int (*vm_mem_abort)(const struct kvm_s2_fault_desc *s2fd); }; diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 10b425a0141be..9df3c80a5acd1 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1029,17 +1029,16 @@ static void stage2_destroy_range(struct kvm_pgtable *pgt, phys_addr_t addr, } while (addr = next, addr != end); } -static void kvm_stage2_destroy(struct kvm_pgtable *pgt) +static void kvm_vm_stage2_destroy(struct kvm_pgtable *pgt) { - unsigned int ia_bits = VTCR_EL2_IPA(pgt->mmu->vtcr); + stage2_destroy_range(pgt, 0, kvm_phys_size(pgt->mmu)); + kvm_pgtable_stage2_destroy_pgd(pgt); +} - /* pKVM walks its mapping tree, not the IPA space, and reschedules per mapping */ - if (is_protected_kvm_enabled()) - pkvm_pgtable_stage2_destroy_range(pgt, 0, BIT(ia_bits)); - else - stage2_destroy_range(pgt, 0, BIT(ia_bits)); - - KVM_PGT_FN(kvm_pgtable_stage2_destroy_pgd)(pgt); +static void pkvm_stage2_destroy(struct kvm_pgtable *pgt) +{ + pkvm_pgtable_stage2_destroy_range(pgt, 0, kvm_phys_size(pgt->mmu)); + pkvm_pgtable_stage2_destroy_pgd(pgt); } /** @@ -1126,7 +1125,7 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long t return 0; out_destroy_pgtable: - kvm_stage2_destroy(pgt); + kvm->arch.vm_s2_ops->vm_stage2_destroy(pgt); mmu->pgt = NULL; out_free_pgtable: kfree(pgt); @@ -1246,7 +1245,7 @@ void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu) write_unlock(&kvm->mmu_lock); if (pgt) { - kvm_stage2_destroy(pgt); + kvm->arch.vm_s2_ops->vm_stage2_destroy(pgt); kfree(pgt); } @@ -3152,6 +3151,7 @@ static const struct kvm_vm_s2_ops protected_pkvm_vm_s2_ops = { .vm_age_gfn = no_age_gfn, .vm_test_age_gfn = no_age_gfn, .vm_stage2_unmap_range = no_stage2_unmap_range, + .vm_stage2_destroy = pkvm_stage2_destroy, .vm_mem_abort = protected_pkvm_mem_abort, }; @@ -3161,6 +3161,7 @@ static const struct kvm_vm_s2_ops pkvm_vm_s2_ops = { .vm_age_gfn = pkvm_age_gfn, .vm_test_age_gfn = pkvm_test_age_gfn, .vm_stage2_unmap_range = pkvm_stage2_unmap_range, + .vm_stage2_destroy = pkvm_stage2_destroy, .vm_mem_abort = kvm_vm_mem_abort, }; @@ -3170,6 +3171,7 @@ static const struct kvm_vm_s2_ops kvm_default_vm_s2_ops = { .vm_age_gfn = kvm_vm_age_gfn, .vm_test_age_gfn = kvm_vm_test_age_gfn, .vm_stage2_unmap_range = kvm_vm_stage2_unmap_range, + .vm_stage2_destroy = kvm_vm_stage2_destroy, .vm_mem_abort = kvm_vm_mem_abort, }; -- 2.47.3