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 C031F1061B07 for ; Mon, 30 Mar 2026 14:50:25 +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=uHlaJehZzupGIAs6NzVIRCvNn2EGa3LcmF6JpBclxd4=; b=Q/tjrp9hAlIHx8F7/qjrXo+skV alvaZFxIzOo4Mzxke8GsN1TiCkQumMG3otEMV2FPYy9sSJHMZdT4pp16mvqoDB9gHIUjp3l6+9pl2 XNqSztxgHXWEV8ab4b5U9fTLFK6VL1eDh4csetMIvLw/t9LozsPdczQP1Ay1tXyFmlrBTGK2nkZX+ kf3mo0NL4JU82ola3nrqp+7zYzol4SIaRAqKYmjW95C2uzQj83XB5jP2Tu8Rrdp+xUvirsdlHrIaB lhQCIA9b4kjbzcaIkqKeE1b7TRDoddr4S1KgUyFVPUoqBiyqvhiTZf+wIU1oIACdvm0MOXtb9j7z/ BYa9ZmpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w7DwW-0000000BTqb-44Lc; Mon, 30 Mar 2026 14:50:17 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w7DwK-0000000BTbV-1bAd for linux-arm-kernel@lists.infradead.org; Mon, 30 Mar 2026 14:50:06 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 172F940B8B; Mon, 30 Mar 2026 14:50:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 391D4C4CEF7; Mon, 30 Mar 2026 14:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774882204; bh=PEkITeoFsx5XhDmWodOqKWQXVGklwJbFcm8YS4Kt7I4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=igVVGoyVDZEDizKXMDr55ZxyL1JdTfkxRKvNg3yLELbK5jynmLs9rNN3j8Yn1cTyA saJAoegbh7ewXIhNevt+HHspLZOt9MEt8hm8+JkQsmQHAP6R0kXgRTwMI1OXlnUDyP 9P93hRc3wJM5m+CjJiUnpuC8uZZYukUDnIyp/8MCdLDIUwf9HaueCh4BecVK3/0Cwq TiG3iLbn+bsbu9mKrJSp0bXl/AUfkKJRgBTEAWnKOigupv9jgNy5ivUcLHXHmGSZPX FIrottMkY8S8AbPYckZJhEZiYSPHjlGxESvIYvEeqQomZ7LFsPzFnTMykgq2YIB/dX /T+N30CUvpcWw== 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 v5 22/38] KVM: arm64: Introduce host_stage2_set_owner_metadata_locked() Date: Mon, 30 Mar 2026 15:48:23 +0100 Message-ID: <20260330144841.26181-23-will@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260330144841.26181-1-will@kernel.org> References: <20260330144841.26181-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-20260330_075004_479621_3C2F5889 X-CRM114-Status: GOOD ( 11.77 ) 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 Rework host_stage2_set_owner_locked() to add a new helper function, host_stage2_set_owner_metadata_locked(), which will allow us to store additional metadata alongside a 3-bit owner ID for invalid host stage-2 entries. Tested-by: Fuad Tabba Tested-by: Mostafa Saleh Signed-off-by: Will Deacon --- arch/arm64/include/asm/kvm_pgtable.h | 2 -- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 47 ++++++++++++++++++--------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h index e36c2908bdb2..2df22640833c 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -99,8 +99,6 @@ typedef u64 kvm_pte_t; KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | \ KVM_PTE_LEAF_ATTR_HI_S2_XN) -#define KVM_INVALID_PTE_OWNER_MASK GENMASK(9, 2) - /* pKVM invalid pte encodings */ #define KVM_INVALID_PTE_TYPE_MASK GENMASK(63, 60) #define KVM_INVALID_PTE_ANNOT_MASK ~(KVM_PTE_VALID | \ diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index aea6ec981801..90003cbf5603 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -549,37 +549,54 @@ static void __host_update_page_state(phys_addr_t addr, u64 size, enum pkvm_page_ set_host_state(page, state); } -static kvm_pte_t kvm_init_invalid_leaf_owner(u8 owner_id) -{ - return FIELD_PREP(KVM_INVALID_PTE_OWNER_MASK, owner_id); -} - -int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) +#define KVM_HOST_DONATION_PTE_OWNER_MASK GENMASK(3, 1) +#define KVM_HOST_DONATION_PTE_EXTRA_MASK GENMASK(59, 4) +static int host_stage2_set_owner_metadata_locked(phys_addr_t addr, u64 size, + u8 owner_id, u64 meta) { kvm_pte_t annotation; - int ret = -EINVAL; + int ret; - if (!FIELD_FIT(KVM_INVALID_PTE_OWNER_MASK, owner_id)) + if (owner_id == PKVM_ID_HOST) return -EINVAL; if (!range_is_memory(addr, addr + size)) return -EPERM; + if (!FIELD_FIT(KVM_HOST_DONATION_PTE_OWNER_MASK, owner_id)) + return -EINVAL; + + if (!FIELD_FIT(KVM_HOST_DONATION_PTE_EXTRA_MASK, meta)) + return -EINVAL; + + annotation = FIELD_PREP(KVM_HOST_DONATION_PTE_OWNER_MASK, owner_id) | + FIELD_PREP(KVM_HOST_DONATION_PTE_EXTRA_MASK, meta); + ret = host_stage2_try(kvm_pgtable_stage2_annotate, &host_mmu.pgt, + addr, size, &host_s2_pool, + KVM_HOST_INVALID_PTE_TYPE_DONATION, annotation); + if (!ret) + __host_update_page_state(addr, size, PKVM_NOPAGE); + + return ret; +} + +int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) +{ + int ret = -EINVAL; + switch (owner_id) { case PKVM_ID_HOST: + if (!range_is_memory(addr, addr + size)) + return -EPERM; + 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: - annotation = kvm_init_invalid_leaf_owner(owner_id); - ret = host_stage2_try(kvm_pgtable_stage2_annotate, &host_mmu.pgt, - addr, size, &host_s2_pool, - KVM_HOST_INVALID_PTE_TYPE_DONATION, - annotation); - if (!ret) - __host_update_page_state(addr, size, PKVM_NOPAGE); + ret = host_stage2_set_owner_metadata_locked(addr, size, + owner_id, 0); break; } -- 2.53.0.1018.g2bb0e51243-goog