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 67002C5518E for ; Mon, 3 Aug 2026 10:12:07 +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-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-Owner; bh=/RjpfE+FJ37Ev6ign0yo/K+qLNpZCdAJBKXqZ1Mh2Lw=; b=FIqNiHzd5f/jH9W61LVH4nHILw eyI1RKZg8g2jNeY+SGBG2hf0wuRnQlzlsCPaVrFog5hhPcvQ3SjpXjMkMbzEIr4+23h7aJnQb3OIF 2bz8AtrOsXC37YpGp6IP01QCh+TMm6TeGv6Ghd7MxuLZh4LCGBFy8yQBxFH+kxbuIjeLrT93ChsaO paGKM9IMaqpf3gHGNk0ssR/3mGXZSLRXpoLL668QSIP9FuWybXdORUpHHFIKPY5AB9+VgJZkGGAYD bzWNfpUPsKZBO/PIu+zhpjNa4KKFa0VEid1bqAvxUK9hqrKxBaERVdOYlexF0tDqILSIzElQ2VJmv 1CivLQLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqpdV-0000000GmzY-0T0m; Mon, 03 Aug 2026 10:11:09 +0000 Received: from mail-wm1-x346.google.com ([2a00:1450:4864:20::346]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqpdS-0000000Gmt5-1nNy for linux-arm-kernel@lists.infradead.org; Mon, 03 Aug 2026 10:11:07 +0000 Received: by mail-wm1-x346.google.com with SMTP id 5b1f17b1804b1-4954fe32d6eso8253215e9.1 for ; Mon, 03 Aug 2026 03:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785751864; x=1786356664; 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=/RjpfE+FJ37Ev6ign0yo/K+qLNpZCdAJBKXqZ1Mh2Lw=; b=gNxuYkX+Z/sgn8/klsMAYEX1Rn0lAUtjPc0m04tyzpRujj+WGRsQjW81sGv3k2aWkl o49QqMWzbvZ2+6CVMvofZP/PeVOHUzw+Jkvs8Qytba1IhrI/T7by/oyyOUbtboAkWASu TzT9+v2SlBK2rzj52FbMaO7V998Ua4RFAf32uR+dSdi53BlYrpBjNaQ1RMWHuYrzVhaV /i3gAa6IDBF5Mvh0jACmmeuIxI+rMAXD4KJren+CFHb+qDuo95AMFZ1R2NfFub+X8YM9 D7/O61dbShitXYrTl48EpF16ATkrfcnf+g2UdFn524mZ5pFwd+Xot88HX5uf5DKYUPOu Egcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785751864; x=1786356664; 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=/RjpfE+FJ37Ev6ign0yo/K+qLNpZCdAJBKXqZ1Mh2Lw=; b=UhayQ7B4L2iaucZp+mdmNKFPKjm1/PvTwq//DfD4JxyFUwR66ajKNLCl9SSr8G0Zrz 1REC5Yq2sxET6DFM60ks6gGQI1QieOGNx395t2qX4HUFmAzrl1K0OliGWNhO8Fhgjmsb 4TzqJgpa7VXYs4EE8zEetu+ovBcppAnqDqnXm2zigwdWCWIjzAfL4aIcZuQ84yWxTvjO +Gzd61pmvcmnjIfbSsluhfQ3WEin4rUxETTlNVAWJ+XvpG30Z+tWnSXiPHMcdUopx+Bf kTZFby6L8gQYRlOrIFhLcz5XVHTgTOGll++gGE4gCQvYfy0E5vu6ty4KH+bwZdq6NFRm +5Sg== X-Forwarded-Encrypted: i=1; AHgh+RrQuy3rcuKiQt5qBnpXt6IWmqWkbuOPXuqa1R7PUXICOsmClS91t+Pj7rKry7JK4owWCtrJL0Zf813mc7ptVfQa@lists.infradead.org X-Gm-Message-State: AOJu0YwGKLICxEzPwIwgyG0jFt+XRB87DubxIACQ01AAKsmHeqRDYuM1 bebUdXimcjT4Lw9PY1i/OvT8IES/on43dEKQ93sISvSKiiQ0G03KwuZtkeYRTNpLgqGg8I7ItBs ou/pu15f1P965YMGeCkzwkQ== X-Received: from wmop13.prod.google.com ([2002:a05:600c:468d:b0:495:6163:c602]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:840f:b0:493:aa0a:45ad with SMTP id 5b1f17b1804b1-4980c64520fmr180963625e9.2.1785751863432; Mon, 03 Aug 2026 03:11:03 -0700 (PDT) Date: Mon, 3 Aug 2026 11:08:52 +0100 In-Reply-To: <20260803100904.3563942-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20260803100904.3563942-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260803100904.3563942-9-vdonnefort@google.com> Subject: [PATCH 08/20] KVM: arm64: Add a range to __pkvm_host_reclaim_page_guest() 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, keirf@google.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-20260803_031106_548895_82E0D8E0 X-CRM114-Status: GOOD ( 13.56 ) 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 In preparation for supporting stage-2 huge mappings for protected VMs, add a nr_pages argument to the __pkvm_host_reclaim_page_guest() hypercall. This range supports only two values: 1 or PMD_SIZE / PAGE_SIZE (that is 512 on a 4K-pages system). Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index c13f258fffb7..678bb55c694a 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -42,7 +42,7 @@ int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_donate_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu *vcpu); int __pkvm_vcpu_in_poison_fault(struct pkvm_hyp_vcpu *hyp_vcpu); int __pkvm_host_force_reclaim_page_guest(phys_addr_t phys); -int __pkvm_host_reclaim_page_guest(u64 gfn, struct pkvm_hyp_vm *vm); +int __pkvm_host_reclaim_page_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *vm); int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu *vcpu, enum kvm_pgtable_prot prot); int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *hyp_vm); diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h index f04cea5ff389..0d17e59d5335 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h @@ -74,7 +74,7 @@ int __pkvm_init_vm(struct kvm *host_kvm, unsigned long vm_hva, int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, unsigned long vcpu_hva); -int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn); +int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn, u64 nr_pages); int __pkvm_start_teardown_vm(pkvm_handle_t handle); int __pkvm_finalize_teardown_vm(pkvm_handle_t handle); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index c7a8c2eea157..18d314ea034c 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -624,8 +624,9 @@ static void handle___pkvm_reclaim_dying_guest_page(struct kvm_cpu_context *host_ { DECLARE_REG(pkvm_handle_t, handle, host_ctxt, 1); DECLARE_REG(u64, gfn, host_ctxt, 2); + DECLARE_REG(u64, nr_pages, host_ctxt, 3); - cpu_reg(host_ctxt, 1) = __pkvm_reclaim_dying_guest_page(handle, gfn); + cpu_reg(host_ctxt, 1) = __pkvm_reclaim_dying_guest_page(handle, gfn, nr_pages); } static void handle___pkvm_start_teardown_vm(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 9ea448895c15..ce637f1a55b3 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -891,7 +891,8 @@ static int __guest_check_page_state_range(struct pkvm_hyp_vm *vm, u64 addr, return check_page_state_range(&vm->pgt, addr, size, &d); } -static int get_valid_guest_pte(struct pkvm_hyp_vm *vm, u64 ipa, kvm_pte_t *ptep, u64 *physp) +static int __get_valid_guest_pte(struct pkvm_hyp_vm *vm, u64 ipa, + kvm_pte_t *ptep, u64 *physp, s8 *levelp) { kvm_pte_t pte; u64 phys; @@ -905,20 +906,32 @@ static int get_valid_guest_pte(struct pkvm_hyp_vm *vm, u64 ipa, kvm_pte_t *ptep, return -EHWPOISON; if (!kvm_pte_valid(pte)) return -ENOENT; - if (level != KVM_PGTABLE_LAST_LEVEL) - return -E2BIG; phys = kvm_pte_to_phys(pte); - ret = check_range_allowed_memory(phys, phys + PAGE_SIZE); + ret = check_range_allowed_memory(phys, phys + kvm_granule_size(level)); if (WARN_ON(ret)) return ret; *ptep = pte; *physp = phys; + *levelp = level; return 0; } +static int get_valid_guest_pte(struct pkvm_hyp_vm *vm, u64 ipa, u64 size, + kvm_pte_t *ptep, u64 *physp) +{ + s8 level; + int ret; + + ret = __get_valid_guest_pte(vm, ipa, ptep, physp, &level); + if (ret) + return ret; + + return kvm_granule_size(level) == size ? 0 : -E2BIG; +} + int __pkvm_vcpu_in_poison_fault(struct pkvm_hyp_vcpu *hyp_vcpu) { struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(hyp_vcpu); @@ -1001,7 +1014,7 @@ int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn) host_lock_component(); guest_lock_component(vm); - ret = get_valid_guest_pte(vm, ipa, &pte, &phys); + ret = get_valid_guest_pte(vm, ipa, PAGE_SIZE, &pte, &phys); if (ret) goto unlock; @@ -1033,7 +1046,7 @@ int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn) host_lock_component(); guest_lock_component(vm); - ret = get_valid_guest_pte(vm, ipa, &pte, &phys); + ret = get_valid_guest_pte(vm, ipa, PAGE_SIZE, &pte, &phys); if (ret) goto unlock; @@ -1285,6 +1298,14 @@ static void hyp_poison_page(phys_addr_t phys) hyp_fixmap_unmap(); } +static void hyp_poison_range(phys_addr_t phys, u64 size) +{ + u64 offset; + + for (offset = 0; offset < size; offset += PAGE_SIZE) + hyp_poison_page(phys + offset); +} + static int host_stage2_get_guest_info(phys_addr_t phys, struct pkvm_hyp_vm **vm, u64 *gfn) { @@ -1337,7 +1358,7 @@ int __pkvm_host_force_reclaim_page_guest(phys_addr_t phys) ipa = hyp_pfn_to_phys(gfn); guest_lock_component(vm); - ret = get_valid_guest_pte(vm, ipa, &pte, &pa); + ret = get_valid_guest_pte(vm, ipa, PAGE_SIZE, &pte, &pa); if (ret) goto unlock_guest; @@ -1365,35 +1386,40 @@ int __pkvm_host_force_reclaim_page_guest(phys_addr_t phys) return ret; } -int __pkvm_host_reclaim_page_guest(u64 gfn, struct pkvm_hyp_vm *vm) +int __pkvm_host_reclaim_page_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *vm) { u64 ipa = hyp_pfn_to_phys(gfn); kvm_pte_t pte; u64 phys; + u64 size; int ret; + ret = __guest_check_transition_size(0, ipa, nr_pages, &size); + if (ret) + return ret; + host_lock_component(); guest_lock_component(vm); - ret = get_valid_guest_pte(vm, ipa, &pte, &phys); + ret = get_valid_guest_pte(vm, ipa, size, &pte, &phys); if (ret) goto unlock; switch (guest_get_page_state(pte, ipa)) { case PKVM_PAGE_OWNED: - WARN_ON(__host_check_page_state_range(phys, PAGE_SIZE, PKVM_NOPAGE)); - hyp_poison_page(phys); + WARN_ON(__host_check_page_state_range(phys, size, PKVM_NOPAGE)); + hyp_poison_range(phys, size); break; case PKVM_PAGE_SHARED_OWNED: - WARN_ON(__host_check_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_SHARED_BORROWED)); + WARN_ON(__host_check_page_state_range(phys, size, PKVM_PAGE_SHARED_BORROWED)); break; default: ret = -EPERM; goto unlock; } - WARN_ON(kvm_pgtable_stage2_unmap(&vm->pgt, ipa, PAGE_SIZE)); - WARN_ON(host_stage2_set_owner_locked(phys, PAGE_SIZE, PKVM_ID_HOST)); + WARN_ON(kvm_pgtable_stage2_unmap(&vm->pgt, ipa, size)); + WARN_ON(host_stage2_set_owner_locked(phys, size, PKVM_ID_HOST)); unlock: guest_unlock_component(vm); @@ -1546,11 +1572,10 @@ static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ip s8 level; int ret; - ret = kvm_pgtable_get_leaf(&vm->pgt, ipa, &pte, &level); + ret = __get_valid_guest_pte(vm, ipa, &pte, &phys, &level); if (ret) return ret; - if (!kvm_pte_valid(pte)) - return -ENOENT; + if (size && kvm_granule_size(level) != size) return -E2BIG; @@ -1561,11 +1586,6 @@ static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, u64 ip if (state != PKVM_PAGE_SHARED_BORROWED) return -EPERM; - phys = kvm_pte_to_phys(pte); - ret = check_range_allowed_memory(phys, phys + size); - if (WARN_ON(ret)) - return ret; - for_each_hyp_page(page, phys, size) { if (get_host_state(page) != PKVM_PAGE_SHARED_OWNED) return -EPERM; @@ -1937,7 +1957,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.host = PKVM_PAGE_OWNED; selftest_state.guest[1] = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_reclaim_page_guest, gfn + 1, vm); + assert_transition_res(0, __pkvm_host_reclaim_page_guest, gfn + 1, 1, vm); assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index b7ec535da86b..8f5d32cdb4eb 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -952,7 +952,7 @@ teardown_donated_memory(struct kvm_hyp_memcache *mc, void *addr, size_t size) unmap_donated_memory_noclear(addr, size); } -int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn) +int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn, u64 nr_pages) { struct pkvm_hyp_vm *hyp_vm = get_pkvm_hyp_vm(handle); int ret = -EINVAL; @@ -961,7 +961,7 @@ int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn) return ret; if (hyp_vm->kvm.arch.pkvm.is_dying) - ret = __pkvm_host_reclaim_page_guest(gfn, hyp_vm); + ret = __pkvm_host_reclaim_page_guest(gfn, nr_pages, hyp_vm); put_pkvm_hyp_vm(hyp_vm); return ret; diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 58d8474b563e..a9645480d164 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -373,7 +373,8 @@ static int __pkvm_pgtable_stage2_reclaim(struct kvm_pgtable *pgt, u64 start, u64 struct page *page; ret = kvm_call_hyp_nvhe(__pkvm_reclaim_dying_guest_page, - handle, mapping->gfn); + handle, mapping->gfn, + mapping->nr_pages); if (WARN_ON(ret)) continue; -- 2.55.0.508.g3f0d502094-goog