From nobody Mon Feb 9 16:16:42 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB7FA209F2E for ; Thu, 6 Mar 2025 11:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741258854; cv=none; b=iScF5+KTKfa9woWl3WAFopuYJ+TsWJyhRWJLEyy66+mv8UDk6Een3EpXoWrrs4KZGsP8O6dVhwlqlM/Nv3IRe6ZhFQTmAcvBPCrxSi6MHOovPp/oz1atRMvrI/1lUS+LfyY79mhVfAxGcULmxKFGxdot+0NeYMHMl8gAYCBYbjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741258854; c=relaxed/simple; bh=/5FjjMmpohgE0vJ/DnpliouDVxkymhFemjMNW5YdXTY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dgDWqaG5Ib9uDCt7XjPh0T9hBbjghjuMYrzJX3M7b69lhSWJcHZPgAMRbOqU45gkyfQJ7UN2qIPN5rplG6dneGNfinsn1ZanC7fGI1Gb4oGc1rcD1lqHFUODFSJgI1LtVztrf1gOZih+TXAr1YVp4RTGi6dkKKFDmODaUOcBZdM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vrgpUEI1; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vrgpUEI1" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4394c489babso2266505e9.1 for ; Thu, 06 Mar 2025 03:00:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741258851; x=1741863651; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6m5bqbS5De2414rudA+6hni5oX136rUbEPTOwyZJ3oE=; b=vrgpUEI1DIuyUnJcLMkQlW58HYAczsRTIoU3nBR1AJKBTy10uCNO1nu92xcfVJJEOQ afd1HsPNjNfvpAA/6VfrKVmoST1V/5J6afVphV2FMT1CbCJ0YKDYMvfHEzL240LFsfFX JvdZeNTaJ7rq+WlwEahkD1KRY/gSbRJ3631SAaCjHrtk6PtD3IwFy38Dxw0AFr2uBo7j pzyM33C5xM03G6NuJ8rulZBuwnXIzlmGvRdOydzQ8goVbIcjET4gKpa7Uqo7+hpBkk5q iwp2l5H2j1Vlsv40bPRJye/Tezni2r+gwMz+kc8slRlQVxV2Rzm9cPeYJHwbnnJhSvDm C3uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741258851; x=1741863651; h=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; bh=6m5bqbS5De2414rudA+6hni5oX136rUbEPTOwyZJ3oE=; b=i47OXrSzwEyxq6wledvHjIeQjtYEe95LdN/UklJ3Ig0adUyJOF0jUrM7O/RONBddZC YjF+UFyDkQ0glpIUurQG24PV6QLOFuKWx8pRhOF51noROYqzw16ryq/YoLZ+K1Bgrlpq DgL5Db09TKmtVCXHx7f/U3k3DzdxKKjrraYSIMJuXMZ7+y9tuPDhAdCcGZ/OdjUr1/TE +hNbyTBtUDh2sINudvFux7A878Qs9noGdDINrD5SJZSoctGJi6B44XvSdOACNQzBeFY8 o+vdqaOD2tU5SEMM0K06DAJJTXmVLiki+Di/0JG2znh8j/UyoP1sCvCN/QNg17jAWcME zWSQ== X-Forwarded-Encrypted: i=1; AJvYcCUyLvOcUrspaYeYw6Sq/29iHiTCM/UcavByJegCJw6gHqgCogvTF6OQ0AaqWpfPbtU0WWiaTsWS7C+Lx0E=@vger.kernel.org X-Gm-Message-State: AOJu0YyVOluabOQ07EDEsOua2rbbn1M9xnYZfRVKQyt0Gmn9eWfHUl9g B0P1a6M2gQocLZTFbxk4i/WTu60YTlrktnXCe7aTTDvooXa6HAb5wBFYMcz5Utaj5DAQ692kjWe OY2To2L0YPuWi2XCuMQ== X-Google-Smtp-Source: AGHT+IGZUqYVdIQcMkVSVKvjHliXkD+ge0vVye+cOo8Dd1sDdxpdmjqRMSVgh2kbfPadmJR/0CYkDABlridM7EGM X-Received: from wmqa17.prod.google.com ([2002:a05:600c:3491:b0:43b:bf84:7e47]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c9f:b0:43b:c0fa:f9c5 with SMTP id 5b1f17b1804b1-43bd2aed752mr44314515e9.21.1741258851559; Thu, 06 Mar 2025 03:00:51 -0800 (PST) Date: Thu, 6 Mar 2025 11:00:32 +0000 In-Reply-To: <20250306110038.3733649-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250306110038.3733649-1-vdonnefort@google.com> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: <20250306110038.3733649-4-vdonnefort@google.com> Subject: [PATCH v2 3/9] KVM: arm64: Add a range to __pkvm_host_unshare_guest() From: Vincent Donnefort To: maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Cc: qperret@google.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-team@android.com, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for supporting stage-2 huge mappings for np-guest. Add a nr_pages argument to the __pkvm_host_unshare_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 1abbab5e2ff8..343569e4bdeb 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -41,7 +41,7 @@ int __pkvm_host_share_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hy= p_vcpu *vcpu, enum kvm_pgtable_prot prot); -int __pkvm_host_unshare_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); +int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *h= yp_vm); int __pkvm_host_relax_perms_guest(u64 gfn, struct pkvm_hyp_vcpu *vcpu, enu= m kvm_pgtable_prot prot); int __pkvm_host_wrprotect_guest(u64 gfn, struct pkvm_hyp_vm *hyp_vm); int __pkvm_host_test_clear_young_guest(u64 gfn, bool mkold, struct pkvm_hy= p_vm *vm); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index e71601746935..7f22d104c1f1 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -274,6 +274,7 @@ static void handle___pkvm_host_unshare_guest(struct kvm= _cpu_context *host_ctxt) { DECLARE_REG(pkvm_handle_t, handle, host_ctxt, 1); DECLARE_REG(u64, gfn, host_ctxt, 2); + DECLARE_REG(u64, nr_pages, host_ctxt, 3); struct pkvm_hyp_vm *hyp_vm; int ret =3D -EINVAL; =20 @@ -284,7 +285,7 @@ static void handle___pkvm_host_unshare_guest(struct kvm= _cpu_context *host_ctxt) if (!hyp_vm) goto out; =20 - ret =3D __pkvm_host_unshare_guest(gfn, hyp_vm); + ret =3D __pkvm_host_unshare_guest(gfn, nr_pages, hyp_vm); put_pkvm_hyp_vm(hyp_vm); out: cpu_reg(host_ctxt, 1) =3D ret; diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvh= e/mem_protect.c index 7e3a249149a0..7b9b112e3ebf 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -998,13 +998,12 @@ int __pkvm_host_share_guest(u64 pfn, u64 gfn, u64 nr_= pages, struct pkvm_hyp_vcpu return ret; } =20 -static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, = u64 ipa) +static int __check_host_shared_guest(struct pkvm_hyp_vm *vm, u64 *__phys, = u64 ipa, u64 size) { - enum pkvm_page_state state; struct hyp_page *page; kvm_pte_t pte; - u64 phys; s8 level; + u64 phys; int ret; =20 ret =3D kvm_pgtable_get_leaf(&vm->pgt, ipa, &pte, &level); @@ -1012,51 +1011,52 @@ static int __check_host_shared_guest(struct pkvm_hy= p_vm *vm, u64 *__phys, u64 ip return ret; if (!kvm_pte_valid(pte)) return -ENOENT; - if (level !=3D KVM_PGTABLE_LAST_LEVEL) + if (kvm_granule_size(level) !=3D size) return -E2BIG; =20 - state =3D guest_get_page_state(pte, ipa); - if (state !=3D PKVM_PAGE_SHARED_BORROWED) - return -EPERM; + ret =3D __guest_check_page_state_range(vm, ipa, size, PKVM_PAGE_SHARED_BO= RROWED); + if (ret) + return ret; =20 phys =3D kvm_pte_to_phys(pte); - ret =3D check_range_allowed_memory(phys, phys + PAGE_SIZE); + ret =3D check_range_allowed_memory(phys, phys + size); if (WARN_ON(ret)) return ret; =20 - page =3D hyp_phys_to_page(phys); - if (page->host_state !=3D PKVM_PAGE_SHARED_OWNED) - return -EPERM; - if (WARN_ON(!page->host_share_guest_count)) - return -EINVAL; + for_each_hyp_page(phys, size, page) { + if (page->host_state !=3D PKVM_PAGE_SHARED_OWNED) + return -EPERM; + if (WARN_ON(!page->host_share_guest_count)) + return -EINVAL; + } =20 *__phys =3D phys; =20 return 0; } =20 -int __pkvm_host_unshare_guest(u64 gfn, struct pkvm_hyp_vm *vm) +int __pkvm_host_unshare_guest(u64 gfn, u64 nr_pages, struct pkvm_hyp_vm *v= m) { u64 ipa =3D hyp_pfn_to_phys(gfn); - struct hyp_page *page; - u64 phys; + u64 size, phys; int ret; =20 + ret =3D __guest_check_transition_size(0, ipa, nr_pages, &size); + if (ret) + return ret; + host_lock_component(); guest_lock_component(vm); =20 - ret =3D __check_host_shared_guest(vm, &phys, ipa); + ret =3D __check_host_shared_guest(vm, &phys, ipa, size); if (ret) goto unlock; =20 - ret =3D kvm_pgtable_stage2_unmap(&vm->pgt, ipa, PAGE_SIZE); + ret =3D kvm_pgtable_stage2_unmap(&vm->pgt, ipa, size); if (ret) goto unlock; =20 - page =3D hyp_phys_to_page(phys); - page->host_share_guest_count--; - if (!page->host_share_guest_count) - WARN_ON(__host_set_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_OWNED)); + __host_update_share_guest_count(phys, size, false); =20 unlock: guest_unlock_component(vm); @@ -1076,7 +1076,7 @@ static void assert_host_shared_guest(struct pkvm_hyp_= vm *vm, u64 ipa) host_lock_component(); guest_lock_component(vm); =20 - ret =3D __check_host_shared_guest(vm, &phys, ipa); + ret =3D __check_host_shared_guest(vm, &phys, ipa, PAGE_SIZE); =20 guest_unlock_component(vm); host_unlock_component(); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 00fd9a524bf7..b65fcf245fc9 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -385,7 +385,7 @@ int pkvm_pgtable_stage2_unmap(struct kvm_pgtable *pgt, = u64 addr, u64 size) =20 lockdep_assert_held_write(&kvm->mmu_lock); for_each_mapping_in_range_safe(pgt, addr, addr + size, mapping) { - ret =3D kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gf= n); + ret =3D kvm_call_hyp_nvhe(__pkvm_host_unshare_guest, handle, mapping->gf= n, 1); if (WARN_ON(ret)) break; rb_erase(&mapping->node, &pgt->pkvm_mappings); --=20 2.48.1.711.g2feabab25a-goog