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 3791333ADB5 for ; Mon, 5 Jan 2026 15:50:33 +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=1767628234; cv=none; b=pWRAa/7tFm9IWz1h/kAfXkhqPKwD1SSa8+dg5Z/e8jUX1N+s+bljVbS5L9kxY7pipBW8zg8Tq2VmMbkROLA11487yV9dtHVUEbyvCFGQBuVWUVE9dT0+CDpN8+sbGH/ki036gJKU951VvJOGvfg9zQgGyHfQ2bhVMqhfMG1dGqo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767628234; c=relaxed/simple; bh=DzuRRLjnp/dVqJAn5lUOBuYxv+mblAF47GOa3IZTaBU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RTIzPUgLr5nko5p2VPwDgEV9SQiAi8zbOBFipkSyeMfDC+kimgUJikhHXU282ANcmbaUOf6DoQrSRJbsi/aRKcPdcukzuwt2eGDkCAjNXVpP+KqicBJ+IdGRTNAz8ER7cBlpG2Ej8vRpAVm8ohgR8kHIqTJ78KlBIqPUy8WVLPs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tNblaxEO; 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="tNblaxEO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08811C19421; Mon, 5 Jan 2026 15:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767628233; bh=DzuRRLjnp/dVqJAn5lUOBuYxv+mblAF47GOa3IZTaBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNblaxEOEmlEeSszWjRgnuGZElsejiKKqEJiDte5tlxFsXP9ZVnkaXbGfE2itosEN +3h3wuzhHCp9gqD0NmxInS9oAEX3K1207TRgStftYU6nJHIQ8fMNWxYGSqHOKRq6RB 4+rULFloPwvlefiVGJqmdAiVw6/7L/leb1LvjEPm/eVHj3tnuipXq9MnEPlgRlVqOj dvQdkn1rMYwQzco60xm3sbYiC6t4F8pdav5mnjK7JGAW4BHWQiz+wNQuOEj5kYMyDK 8qrhL0QNk0ytFRxZ1ApMyDal6lzpBpTzyB9TgVgteVU+55qjD8c2KbWQ4vzWva7bpX Se5s8UphEydmQ== 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 14/30] KVM: arm64: Hook up reclaim hypercall to pkvm_pgtable_stage2_destroy() Date: Mon, 5 Jan 2026 15:49:22 +0000 Message-ID: <20260105154939.11041-15-will@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260105154939.11041-1-will@kernel.org> References: <20260105154939.11041-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.351.gbe84eed79e-goog