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 9F62F35FF55 for ; Mon, 19 Jan 2026 12:47:42 +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=1768826862; cv=none; b=X9atJzWQLMS4NX71G3cTRfleolKgaaHtjuge+qH/GZHeQkxTKe9XnH2TqWKEOuPuhcHzMvz4Zdg6Y9/oExhVRIB/qkyrlwVdCaOZIaGCCiRMIroLmQ7nwmKkMpohIyLZMU4EE4Y38sS8V6Ah8qYhkbCwWD+q5kFpzyhypwKvc6I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768826862; c=relaxed/simple; bh=ZAjQPBd9eNNnkLXTRXaMdVil4Dxe23mZFWAvFAqk33c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rRV6+hbv5ojTkdwr/YHU1kDY7axZ69Y8y8zEZsSZGXEA/T73nATOFiu8RrN07pdMSFC4Axq4awmz/S5t1P129QqIQJyJUZZJ+rVMkH2NNCm7Px/wXmFIVbntEoR/Lds1oDTcSLMN/4GjkzpK7C7+UtItY2pN0Z8SQ1YVDEMwVU0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OD68X2+9; 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="OD68X2+9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3DD1C116C6; Mon, 19 Jan 2026 12:47:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768826862; bh=ZAjQPBd9eNNnkLXTRXaMdVil4Dxe23mZFWAvFAqk33c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OD68X2+9iSoTK54PME/4C5vHWoVLb0I5Xg9b2Y628p30SzH/63jINSFkxWs9elu1g Q97tAfYz5oMyKlZMXknSBYV/KfbzJxBe7BDt8JYPSOFbRaCa/U0HyDxtIN1OimKAVz Qc4ZJsz7PLzD3Qevdck0NB2bGsKRzvM9Gj7XcWWwIM6r1xEIh1i+6IMmMmCaUWi9XN NZbdloJjIobJzBWx6/cp5JdUNhV5XnNghhieZjkRlwY8VBD1MElPn5sM24uI6iBNhN MprVGO7yHEJlLNFH5ZvhjTX4sK/jw53KU5qEIsswhy9dk+LH++cbK3ER2RF6qfZCtI 217Fe2xfv8Qqw== 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 Subject: [PATCH v2 16/35] KVM: arm64: Hook up reclaim hypercall to pkvm_pgtable_stage2_destroy() Date: Mon, 19 Jan 2026 12:46:09 +0000 Message-ID: <20260119124629.2563-17-will@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260119124629.2563-1-will@kernel.org> References: <20260119124629.2563-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. 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.52.0.457.g6b5491de43-goog