From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DDF8606A32C for ; Tue, 17 Nov 2026 17:44:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=G+owN4Py; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=ORY3gP3E 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-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=vTaHZCSWdFFTXqo9G5D3lZQ7MAOWE28tCTSPWpkrVJs=; b=G+owN4PyrDEGtRWIdF0sBSQqI/ hzO9ohxzw7f8Q2KyLYkN9A5r2SZ+GbF2prg1UmQXZiEogYO3Fg0qGjVV21KSTg4CvMZ7sFfMfEy8+ FVSft0XqGF0EqBPqhDoBr6p4TSuU5kkW7oohpeWfGBdI32gHDsuPZodpDQZHwfcHGnu9V2mx9TaEF gz2TNFBG0l7jUjn9EZ7oQz2pYbpjCZG6zlb7R15sJXbWgSmUB9nRh9AysLTnDMZUQzK/dAIchvwMz lR4tBFiY64m3QYZ4TlzW89oYITASB1aPkas3hee/O3ubMr900rETKc8s1mEW1oDaojOWQn05kjWdQ wjh7myOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTNEJ-00000006drt-3yDa; Tue, 17 Nov 2026 17:44:27 +0000 Received: from mail-ej1-x645.google.com ([2a00:1450:4864:20::645]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTNEF-00000006dnk-3L9Y for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2026 17:44:25 +0000 Received: by mail-ej1-x645.google.com with SMTP id a640c23a62f3a-c504991a35eso497718266b.3 for ; Tue, 17 Nov 2026 09:44:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794937461; x=1795542261; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vTaHZCSWdFFTXqo9G5D3lZQ7MAOWE28tCTSPWpkrVJs=; b=ORY3gP3E8pIY+/wUPIAao3W4YAYboLfD0FfuRoBUiP/ItuV0SnZaDWAmLMFnZXvdCB MaRYG3TQowAEXMTcvVKdaX60arT0/iE3LBTFWjkxCmJDZNEGuwijNV6n7jUeaYLRxEtM FKfHPak4rE1dtheSWxDp6rM5be8d0Sk4sf/zoEpvegHhUtr1Ta8cVcC+3xYTYNHqlMmN yEkFWrPI23fiEeW8G+RWz1UVb9WHY3UD3NkhInlrEGtKI/2JfW5mSMea+SLj5uy29C4L hFwLrVjUZb0K+9AyMa7wVzSQh8n7vKXZ55i2mq7LhBAaq75apkDqXgqeSj2EPgmcNmJX f8dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794937461; x=1795542261; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vTaHZCSWdFFTXqo9G5D3lZQ7MAOWE28tCTSPWpkrVJs=; b=oMY5nBgt3LVZgs6PWJJU5sy8j73apEFjpPXXb0zV9O0Ll5BLqBPwQIiEw6rkRyngU8 L+TU3QslnLPu2loeDC4tDLR7ZQ042U4HJUbUp0FcTt3BXQvy5UjbO9sAuhxgifW6rHGe U/1V6ZvDdmFfk3haYBH36oUs2Ok9Q9NcfQbvpGYWyebMKsNaAxVawuYsl29qiPBQ8DlC e8Kw8a7i/JME8aUifdRplgGxd91ubfqvu589RR2hzu8634bKrkNLScBqear5Z+Yfe+0R OWttzXCzKgww9oHlb6vMGtNM+MMBNy520vr51yvuR3tcuPU+d7PpU1Xwbc2oxsuY0oSx e4ug== X-Forwarded-Encrypted: i=1; AL+hErHxJ8tkdduJq2jN5Y7RVDeyv7GYXY+IecL58ClQ/ba1XE8hp+cfS8uXRdDZlmZENpYUzDB6dpBvvK+DJW2wQH30@lists.infradead.org X-Gm-Message-State: APuU4Z+j6iNiAQoyk0mqWzVqQWCQkuMQkbQH9iXT2xk8JEkxz/H0BkmY rkltFiLbr9XnNEKt+Y+46TZNhKaJLy3qRgHSpP1sMZ8Z+IHCfK/1OAoU3rMqRJO+hg/17B3t/Tv zcNoeapxG+hAj3gyafloeCQ== X-Received: from ejbd8.prod.google.com ([2002:a17:906:3448:b0:c31:9613:6217]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:96a4:b0:c50:8ff9:4f40 with SMTP id a640c23a62f3a-c510e28ff9amr99766b.11.1794937461280; Tue, 17 Nov 2026 09:44:21 -0800 (PST) Date: Tue, 17 Nov 2026 17:43:43 +0000 In-Reply-To: <20261117174403.58762-1-vdonnefort@google.com> X-Archived-By: Mime-Version: 1.0 References: <20261117174403.58762-1-vdonnefort@google.com> X-Mailer: git-send-email 2.56.1.708.g77570a6a1d-goog Message-ID: <20261117174403.58762-5-vdonnefort@google.com> Subject: [PATCH v4 04/23] KVM: arm64: Use block-level annotations when setting up the host stage-2 From: Vincent Donnefort To: maz@kernel.org, oupton@kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, kernel-team@android.com, fuad.tabba@linux.dev, qperret@google.com, weilin.chang@arm.com, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261117_094423_876510_EAB9910C X-CRM114-Status: GOOD ( 20.84 ) X-Spam-Score: -9.5 (---------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-26.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 During pKVM initialisation, fix_host_ownership() configures the host stage-2 mappings to match the hypervisor stage-1. Previously this was done page-by-page. Now that the host stage-2 supports block-level annotations, refactor the walker to apply the ownership state to an entire range at once. This reduces host stage-2 page-table fragmentation and memory usage by avoiding allocation of intermediate page-table pages. Signed-off-by: Vincent Donnefort --- arch/arm64/kvm/hyp/include/nvhe/memory.h | 5 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 5 - arch/arm64/kvm/hyp/nvhe/setup.c | 157 ++++++++++++++--------- 3 files changed, 104 insertions(+), 63 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h index b50712d47f6d..86a51cf1d590 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -122,6 +122,11 @@ static inline void set_hyp_state(struct hyp_page *p, enum pkvm_page_state state) p->__hyp_state_comp = state ^ PKVM_PAGE_STATE_VMEMMAP_MASK; } +#define for_each_hyp_page(__p, __st, __sz) \ + for (struct hyp_page *__p = hyp_phys_to_page(__st), \ + *__e = __p + ((__sz) >> PAGE_SHIFT); \ + __p < __e; __p++) + /* * Refcounting for 'struct hyp_page'. * hyp_pool::lock must be held if atomic access to the refcount is required. diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index d4c332a91803..58094d52b8a2 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -76,11 +76,6 @@ static void hyp_unlock_component(void) hyp_spin_unlock(&pkvm_pgd_lock); } -#define for_each_hyp_page(__p, __st, __sz) \ - for (struct hyp_page *__p = hyp_phys_to_page(__st), \ - *__e = __p + ((__sz) >> PAGE_SHIFT); \ - __p < __e; __p++) - static void *host_s2_zalloc_pages_exact(size_t size) { void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size)); diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 7bbc26b28faa..e72b7626799d 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -187,50 +187,46 @@ static void hpool_put_page(void *addr) hyp_put_page(&hpool, addr); } -static int fix_host_ownership_walker(const struct kvm_pgtable_visit_ctx *ctx, - enum kvm_pgtable_walk_flags visit) +struct fix_host_ownership_data { + phys_addr_t phys; + size_t size; + enum kvm_pgtable_prot prot; +}; + +static int __fix_host_ownership(const struct fix_host_ownership_data *data) { - enum pkvm_page_state state; - struct hyp_page *page; - phys_addr_t phys; - enum kvm_pgtable_prot prot; + enum pkvm_page_state state = pkvm_getstate(data->prot); - if (!kvm_pte_valid(ctx->old)) + if (!data->prot) return 0; - if (ctx->level != KVM_PGTABLE_LAST_LEVEL) - return -EINVAL; - - phys = kvm_pte_to_phys(ctx->old); - if (!addr_is_memory(phys)) - return -EINVAL; - - page = hyp_phys_to_page(phys); - /* * Adjust the host stage-2 mappings to match the ownership attributes * configured in the hypervisor stage-1, and make sure to propagate them * to the hyp_vmemmap state. */ - prot = kvm_pgtable_hyp_pte_prot(ctx->old); - state = pkvm_getstate(prot); switch (state) { case PKVM_PAGE_OWNED: - set_hyp_state(page, PKVM_PAGE_OWNED); - /* hyp text is RO in the host stage-2 to be inspected on panic. */ - if (addr_is_hyp_text(phys)) { + for_each_hyp_page(page, data->phys, data->size) { + set_hyp_state(page, PKVM_PAGE_OWNED); set_host_state(page, PKVM_NOPAGE); - return host_stage2_idmap_locked(phys, PAGE_SIZE, KVM_PGTABLE_PROT_R); - } else { - return host_stage2_set_owner_locked(phys, PAGE_SIZE, PKVM_ID_HYP); } + /* hyp text is RO in the host stage-2 to be inspected on panic. */ + if (addr_is_hyp_text(data->phys)) + return host_stage2_idmap_locked(data->phys, data->size, KVM_PGTABLE_PROT_R); + else + return host_stage2_set_owner_locked(data->phys, data->size, PKVM_ID_HYP); case PKVM_PAGE_SHARED_OWNED: - set_hyp_state(page, PKVM_PAGE_SHARED_OWNED); - set_host_state(page, PKVM_PAGE_SHARED_BORROWED); + for_each_hyp_page(page, data->phys, data->size) { + set_hyp_state(page, PKVM_PAGE_SHARED_OWNED); + set_host_state(page, PKVM_PAGE_SHARED_BORROWED); + } break; case PKVM_PAGE_SHARED_BORROWED: - set_hyp_state(page, PKVM_PAGE_SHARED_BORROWED); - set_host_state(page, PKVM_PAGE_SHARED_OWNED); + for_each_hyp_page(page, data->phys, data->size) { + set_hyp_state(page, PKVM_PAGE_SHARED_BORROWED); + set_host_state(page, PKVM_PAGE_SHARED_OWNED); + } break; default: return -EINVAL; @@ -239,6 +235,81 @@ static int fix_host_ownership_walker(const struct kvm_pgtable_visit_ctx *ctx, return 0; } +static int fix_host_ownership_walker(const struct kvm_pgtable_visit_ctx *ctx, + enum kvm_pgtable_walk_flags visit) +{ + struct fix_host_ownership_data *data = ctx->arg; + enum kvm_pgtable_prot prot = 0; + phys_addr_t phys = 0; + int ret; + + if (kvm_pte_valid(ctx->old)) { + prot = kvm_pgtable_hyp_pte_prot(ctx->old); + phys = kvm_pte_to_phys(ctx->old); + if (!addr_is_memory(phys)) + return -EINVAL; + } + + if (prot == data->prot && + phys == data->phys + data->size) { + data->size += kvm_granule_size(ctx->level); + + return 0; + } + + ret = __fix_host_ownership(data); + if (ret) + return ret; + + data->phys = phys; + data->size = kvm_granule_size(ctx->level); + data->prot = prot; + + return 0; +} + +static int fix_host_ownership(void) +{ + struct fix_host_ownership_data data; + struct kvm_pgtable_walker walker = { + .cb = fix_host_ownership_walker, + .flags = KVM_PGTABLE_WALK_LEAF, + .arg = &data, + }; + int i, ret; + + for (i = 0; i < hyp_memblock_nr; i++) { + struct memblock_region *reg = &hyp_memory[i]; + u64 start = (u64)hyp_phys_to_virt(reg->base); + + data = (struct fix_host_ownership_data){ 0 }; + ret = kvm_pgtable_walk(&pkvm_pgtable, start, reg->size, &walker); + if (ret) + return ret; + + ret = __fix_host_ownership(&data); + if (ret) + return ret; + } + + /* The stacks sit in the private VA range, not the linear map. */ + for (i = 0; i < hyp_nr_cpus; i++) { + struct kvm_nvhe_init_params *params = per_cpu_ptr(&kvm_init_params, i); + u64 start = params->stack_hyp_va - NVHE_STACK_SIZE; + + data = (struct fix_host_ownership_data){ 0 }; + ret = kvm_pgtable_walk(&pkvm_pgtable, start, NVHE_STACK_SIZE, &walker); + if (ret) + return ret; + + ret = __fix_host_ownership(&data); + if (ret) + return ret; + } + + return 0; +} + static int fix_hyp_pgtable_refcnt_walker(const struct kvm_pgtable_visit_ctx *ctx, enum kvm_pgtable_walk_flags visit) { @@ -253,36 +324,6 @@ static int fix_hyp_pgtable_refcnt_walker(const struct kvm_pgtable_visit_ctx *ctx return 0; } -static int fix_host_ownership(void) -{ - struct kvm_pgtable_walker walker = { - .cb = fix_host_ownership_walker, - .flags = KVM_PGTABLE_WALK_LEAF, - }; - int i, ret; - - for (i = 0; i < hyp_memblock_nr; i++) { - struct memblock_region *reg = &hyp_memory[i]; - u64 start = (u64)hyp_phys_to_virt(reg->base); - - ret = kvm_pgtable_walk(&pkvm_pgtable, start, reg->size, &walker); - if (ret) - return ret; - } - - /* The stacks sit in the private VA range, not the linear map. */ - for (i = 0; i < hyp_nr_cpus; i++) { - struct kvm_nvhe_init_params *params = per_cpu_ptr(&kvm_init_params, i); - u64 start = params->stack_hyp_va - NVHE_STACK_SIZE; - - ret = kvm_pgtable_walk(&pkvm_pgtable, start, NVHE_STACK_SIZE, &walker); - if (ret) - return ret; - } - - return 0; -} - static int fix_hyp_pgtable_refcnt(void) { struct kvm_pgtable_walker walker = { -- 2.56.1.708.g77570a6a1d-goog