From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC0443BA24F for ; Fri, 27 Mar 2026 14:01:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774620103; cv=none; b=ITebBcNbrNjJ022WStgDXNWgrFfo5uB/gX0So7BPhUAmNxeXPkYHTKu6ippEQWLlqIG2CbCgIuCvnUbxzvVnOgKfCr6hXIw/vse0XBfZ71zK4q2AlzkNevkL5M/YSOWBlQitqXpxh4S18ZkYb82X5wPcPUwNo6XjLRndtwBI5G0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774620103; c=relaxed/simple; bh=zuC6OOhAKUR5agNWsBffKqsykDcFTTogE8Z2bho5xJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xf9AQEi3+RBZbXJDDnXDJKCpV0RlNSteuWdr22r/fU/6JMPIcwii7j7UwAtc8yRxkHIoaH0VP4x2QKbV8PiskvOQvZw6bLVX0QmJV9EzuJST7fYT8nwzT6kZouExkjClc7P0b+40M6zKy8qH8xoRQ5FppExyNZ8qbZdzqcIfMUg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YodXb647; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YodXb647" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEE22C2BC9E; Fri, 27 Mar 2026 14:01:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774620103; bh=zuC6OOhAKUR5agNWsBffKqsykDcFTTogE8Z2bho5xJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YodXb647Cdg5qXjKpZzb4td6IfMv0hmoB7ROTAJXMdL3PgeCSIkqiu96Yxu6yWpJr 7Ysb7RvmDeUGpg957aI79fvxidd40YucIVvWSz4WXQIIi4A58tmG544YRkWgLHWZpr Clw9z9BqiBmJnRtqqN/6gF9undqSxwhsmyOSpLp0V4TJtL7cFjpRnkY+i7Kkec2k2/ 9ReQMeyStALXaGHak/sVIa9dQUJDP/DrhFaz6vc6OAuavSJeZB/0GetCwWFZPIEOSe R4koTVzC394XbWrqy7tOvBzMQzHJGIwIL3ztIIH2nyxrMpmG+lggcY9Htboapt56xy 3ZC1IXz1Wr5cA== From: Will Deacon To: kvmarm@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org, Will Deacon , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Quentin Perret , Fuad Tabba , Vincent Donnefort , Mostafa Saleh , Alexandru Elisei Subject: [PATCH v4 16/38] KVM: arm64: Hook up reclaim hypercall to pkvm_pgtable_stage2_destroy() Date: Fri, 27 Mar 2026 14:00:15 +0000 Message-ID: <20260327140039.21228-17-will@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327140039.21228-1-will@kernel.org> References: <20260327140039.21228-1-will@kernel.org> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit During teardown of a protected guest, its memory pages must be reclaimed from the hypervisor by issuing the '__pkvm_reclaim_dying_guest_page' hypercall. Add a new helper, __pkvm_pgtable_stage2_reclaim(), which is called during the VM teardown operation to reclaim pages from the hypervisor and drop the GUP pin on the host. Tested-by: Fuad Tabba Tested-by: Mostafa Saleh Signed-off-by: Will Deacon --- arch/arm64/kvm/pkvm.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 1814e17d600e..8be91051699e 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -322,6 +322,32 @@ int pkvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu, return 0; } +static int __pkvm_pgtable_stage2_reclaim(struct kvm_pgtable *pgt, u64 start, u64 end) +{ + struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu); + pkvm_handle_t handle = kvm->arch.pkvm.handle; + struct pkvm_mapping *mapping; + int ret; + + for_each_mapping_in_range_safe(pgt, start, end, mapping) { + struct page *page; + + ret = kvm_call_hyp_nvhe(__pkvm_reclaim_dying_guest_page, + handle, mapping->gfn); + if (WARN_ON(ret)) + return ret; + + page = pfn_to_page(mapping->pfn); + WARN_ON_ONCE(mapping->nr_pages != 1); + unpin_user_pages_dirty_lock(&page, 1, true); + account_locked_vm(current->mm, 1, false); + pkvm_mapping_remove(mapping, &pgt->pkvm_mappings); + kfree(mapping); + } + + return 0; +} + static int __pkvm_pgtable_stage2_unshare(struct kvm_pgtable *pgt, u64 start, u64 end) { struct kvm *kvm = kvm_s2_mmu_to_kvm(pgt->mmu); @@ -355,7 +381,10 @@ void pkvm_pgtable_stage2_destroy_range(struct kvm_pgtable *pgt, kvm->arch.pkvm.is_dying = true; } - __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size); + if (kvm_vm_is_protected(kvm)) + __pkvm_pgtable_stage2_reclaim(pgt, addr, addr + size); + else + __pkvm_pgtable_stage2_unshare(pgt, addr, addr + size); } void pkvm_pgtable_stage2_destroy_pgd(struct kvm_pgtable *pgt) -- 2.53.0.1018.g2bb0e51243-goog