From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ECEDDCCF2F6 for ; Mon, 19 Jan 2026 12:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yv3WMuOy1loLfX6YGd1Tly+r9gfuf9IEAOZ7/RV6fOg=; b=iTj2HMWTSwcsOr1PXTuhuKYbhJ i5QePLgDCtiMRZMbqTif4LrTDVKauJZV1sN3Ln6cfkcSnYu3gKcOsKmsp5EOVble83uQWwKSnM4rY +9M6dy0zQYwAjPmIBdMYrra2VzPgXSZaeIKlxmZwHJ34PDYbZgYVEYSDJ7T6arFeWxBHHGb96p8RU UEi20+yh6LdcEgD7Lk1uQ2An8fwdl82f92VAE/g2iBizhOAfGUE8L/qI3Brn1lUnkMLLYiSx3X3du ZzBXZVAckVd9kaBR6Wb6UlaKlCHr2mQE2fr2zUGJmL0ejCnLB/WA9aA70BghCqiSw34RBuVvmm4qE uuNXIRXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vhogF-0000000244w-2fEs; Mon, 19 Jan 2026 12:48:30 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vhofg-000000023cL-10hY for linux-arm-kernel@lists.infradead.org; Mon, 19 Jan 2026 12:47:56 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id DB30E406D3; Mon, 19 Jan 2026 12:47:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3797BC19423; Mon, 19 Jan 2026 12:47:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768826871; bh=dho1o9707vRIbiqjbtmi+2dtTxVC+p5ANdKHPSqzL+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CClp33LSTps8j+f3Zl6NBnYjMGl87VUUMqOB7iCOIg5HrkkQib4Mo1KFjwphK12Ig m5KXk6XVnnxlw/Y7x7Rsr+6JrSf/MdHsSOHZl3VftR0dnJsIpFi72yxgLbIlwKm5+k w3g6M6NYitHCz6OnxAdmCE8JQvhtUW7NoTOdmH7tXJYccDzWHxOI+XecHpePgLGYJp StHpiLFYqt8gVSxGwUGZw6ApoGLU0nM1GoAlpJ69FVUi0hjIS6cYEkZLirRwGmjbNI VllbEloDQPr0x1zgUZi0RhWgClm+FiV9oiQyLCyBMREtySQsAaPlwNvMs3XC/Unzp/ VkfrP8iD07pqg== 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 19/35] KVM: arm64: Avoid pointless annotation when mapping host-owned pages Date: Mon, 19 Jan 2026 12:46:12 +0000 Message-ID: <20260119124629.2563-20-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260119_044752_337962_69C316F1 X-CRM114-Status: GOOD ( 13.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When a page is transitioned to host ownership, we can eagerly map it into the host stage-2 page-table rather than going via the convoluted step of a faulting annotation to trigger the mapping. Call host_stage2_idmap_locked() directly when transitioning a page to be owned by the host. Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 41469df46e09..55df0c45b0f2 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -548,23 +548,27 @@ static void __host_update_page_state(phys_addr_t addr, u64 size, enum pkvm_page_ int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) { - int ret; + int ret = -EINVAL; if (!range_is_memory(addr, addr + size)) return -EPERM; - ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_mmu.pgt, - addr, size, &host_s2_pool, owner_id); - if (ret) - return ret; + switch (owner_id) { + case PKVM_ID_HOST: + ret = host_stage2_idmap_locked(addr, size, PKVM_HOST_MEM_PROT); + if (!ret) + __host_update_page_state(addr, size, PKVM_PAGE_OWNED); + break; + case PKVM_ID_GUEST: + case PKVM_ID_HYP: + ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_mmu.pgt, + addr, size, &host_s2_pool, owner_id); + if (!ret) + __host_update_page_state(addr, size, PKVM_NOPAGE); + break; + } - /* Don't forget to update the vmemmap tracking for the host */ - if (owner_id == PKVM_ID_HOST) - __host_update_page_state(addr, size, PKVM_PAGE_OWNED); - else - __host_update_page_state(addr, size, PKVM_NOPAGE); - - return 0; + return ret; } static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot) -- 2.52.0.457.g6b5491de43-goog