From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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 05F02315D49 for ; Fri, 11 Sep 2026 13:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134673; cv=none; b=QWAJWgT6/OWRGZ1i4dlE6/rLpg/TZ0IWA1NbiWLxlrDtOoJ2U8nUnkXL3k/rNYHChcf+ZsjFlK+8FKgJazdHKA+IDQAwYlMNOB/a9rLolRm+a50rm6U7uOXaUbJ7t7bPDzL6xErT5GppTvBwAVBaPILG0mg6ZF/w8nDYTlhaaBQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134673; c=relaxed/simple; bh=oIvvePDeRh9Ep0fCgsxCKNLkg1wtd6vYoSq5VGl6gKA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MPA++ntgZPBKEuDPBsmiZoF6j1g43+1aYBpXaPDx2G3zH24m/yqR0j3oTN1BuTR4ZRkVIiSpj9HwxlKuXbwnoSDbBEZpuLx/nWWRtSjI+OSoRIm8nSbHAERP8au1Zuf2j0GbfsYinS3RBFhmNpR/VsPGSIbPA9vQxKG3g4Ke8BQ= 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=dzC1vWWp; arc=none smtp.client-ip=209.85.128.71 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="dzC1vWWp" Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-49d2951089fso6889385e9.2 for ; Fri, 11 Sep 2026 06:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789134670; x=1789739470; darn=lists.linux.dev; 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=p2Msz0mvqil4WqPj2cKyWRpEWk04Wm49RwlDEE43Qsg=; b=dzC1vWWpkJZkjWXU0XUfALsPm3/Vwk5Qpz5qm1VtVrZoYIAETvCRrk6dFiUyTYUsN0 qTW5Bj6TiCMJS3GDYRF5tqQhL3JxsA+x++DQkbVyvf+JbjION+QxKzvlNSj5SQ2tjGEI pxzXq9LRK53rOqb3hm9IfkpQof3DKCZCkPdWF1sgucC1dnIX5C3PE3j7GZ+0Aw7l3U37 5oj5TKaVpWNCPLipcFeoQw1EvwoGB57y+RMZTRl2itSegULLl8Slh9U7dBW3Sjceh/7r Y8ZZc4sJmNB72Hi9WUrGsmLu7F87wrN/n+3rXwlmLUXiUdVV6nd0i7NrblqEdL2gI2gl hNSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789134670; x=1789739470; 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=p2Msz0mvqil4WqPj2cKyWRpEWk04Wm49RwlDEE43Qsg=; b=R/x2I8N20k4Xt44nnp8aRyN5YGFgtbX8gGqqPV2PXAJRyw8+HELLjGWglv7o4pBB3l NjyDX4PCRExbhoSP9qdep5ZTLOp4ZxCSW+9ZR7E53PwtxBey5XXRoUG84zavGe0swmw9 g8qwFfdHAMwkqopSVQXya6GaQzcXByewXvuJHdM11m6Rx2l+1s0BlogIodr+R577Q542 MMSX1C+9B7YD7Nk97uVV+H+oIxWkOi/CoW0K46U8Dammr//1nQTLT/rlzarMVXLb8UKj qIHYVx5y/3YJD/D6fnwFMoDnpIgfsf5Y7oK5JwMxdtYZJuFcaGRmGLmTEEbSx7pKnaBG /NFg== X-Forwarded-Encrypted: i=1; AKwUvBzG47QNdiozfG/p3XirUA2KcmcdyOpDyQs1Z9clopKsV1y/0YgGGZa37zyDks6kPGEC+5Us2ZQ=@lists.linux.dev X-Gm-Message-State: AFuF++l2m8Ee78dZudwUzOrYYobJFcQQcysQVGfYyFHDk2P0DeJjxv87 YUUcV1oh6GKiuCjw2t4SA7Sfjma+j1abEtCNRmvSfvVtCyrjp4Cu7arR9VjV9hq3HVC/x8ut2Ab TN/Ri4ZMrKUpdSxz3If00lA== X-Received: from wrdf15.prod.google.com ([2002:a5d:58ef:0:b0:482:dfac:89db]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:290f:b0:486:f36e:28c4 with SMTP id ffacd0b85a97d-486f36e2a84mr1587626f8f.5.1789134669911; Fri, 11 Sep 2026 06:51:09 -0700 (PDT) Date: Fri, 11 Sep 2026 14:50:38 +0100 In-Reply-To: <20260911135053.146435-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260911135053.146435-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260911135053.146435-8-vdonnefort@google.com> Subject: [PATCH v2 07/22] KVM: arm64: Add a range to __pkvm_host_donate_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, weilin.chang@arm.com, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" In preparation for supporting stage-2 huge mappings for protected VMs, add a nr_pages argument to the __pkvm_host_donate_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 --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 3 +- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 48 +++++++++++-------- arch/arm64/kvm/pkvm.c | 2 +- 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 1f70162fa625..c13f258fffb7 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -39,7 +39,7 @@ int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); int __pkvm_hyp_donate_host(u64 pfn, u64 nr_pages); int __pkvm_host_share_ffa(u64 pfn, u64 nr_pages); int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages); -int __pkvm_host_donate_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu); +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); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index bb23006e60c4..84ff87d4e18d 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -415,6 +415,7 @@ static void handle___pkvm_host_donate_guest(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(u64, pfn, host_ctxt, 1); DECLARE_REG(u64, gfn, host_ctxt, 2); + DECLARE_REG(u64, nr_pages, host_ctxt, 3); struct pkvm_hyp_vcpu *hyp_vcpu; int ret = -EINVAL; @@ -426,7 +427,7 @@ static void handle___pkvm_host_donate_guest(struct kvm_cpu_context *host_ctxt) if (ret) goto out; - ret = __pkvm_host_donate_guest(pfn, gfn, hyp_vcpu); + ret = __pkvm_host_donate_guest(pfn, gfn, nr_pages, hyp_vcpu); out: cpu_reg(host_ctxt, 1) = ret; } diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index fb01f6129217..58ea0fa62226 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1429,22 +1429,30 @@ static int __guest_check_pgtable_memcache(struct pkvm_hyp_vcpu *vcpu) return 0; } -int __pkvm_host_donate_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu) +int __pkvm_host_donate_guest(u64 pfn, u64 gfn, u64 nr_pages, struct pkvm_hyp_vcpu *vcpu) { struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); u64 phys = hyp_pfn_to_phys(pfn); u64 ipa = hyp_pfn_to_phys(gfn); + u64 size; u64 meta; int ret; + if (!pfn_range_is_valid(pfn, nr_pages)) + return -EINVAL; + + ret = __guest_check_transition_size(phys, ipa, nr_pages, &size); + if (ret) + return ret; + host_lock_component(); guest_lock_component(vm); - ret = __host_check_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_OWNED); + ret = __host_check_page_state_range(phys, size, PKVM_PAGE_OWNED); if (ret) goto unlock; - ret = __guest_check_page_state_range(vm, ipa, PAGE_SIZE, PKVM_NOPAGE); + ret = __guest_check_page_state_range(vm, ipa, size, PKVM_NOPAGE); if (ret) goto unlock; @@ -1453,9 +1461,9 @@ int __pkvm_host_donate_guest(u64 pfn, u64 gfn, struct pkvm_hyp_vcpu *vcpu) goto unlock; meta = host_stage2_encode_gfn_meta(vm, gfn); - WARN_ON(host_stage2_set_owner_metadata_locked(phys, PAGE_SIZE, + WARN_ON(host_stage2_set_owner_metadata_locked(phys, size, PKVM_ID_GUEST, meta)); - WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, PAGE_SIZE, phys, + WARN_ON(kvm_pgtable_stage2_map(&vm->pgt, ipa, size, phys, pkvm_mkstate(KVM_PGTABLE_PROT_RWX, PKVM_PAGE_OWNED), &vcpu->vcpu.arch.pkvm_memcache, 0)); @@ -1797,7 +1805,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); selftest_state.host = PKVM_PAGE_OWNED; selftest_state.hyp = PKVM_NOPAGE; @@ -1817,7 +1825,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); assert_transition_res(0, hyp_pin_shared_mem, virt, virt + size); assert_transition_res(0, hyp_pin_shared_mem, virt, virt + size); @@ -1830,7 +1838,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); hyp_unpin_shared_mem(virt, virt + size); assert_page_state(); @@ -1850,7 +1858,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); selftest_state.host = PKVM_PAGE_OWNED; @@ -1867,7 +1875,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); selftest_state.guest[1] = PKVM_PAGE_SHARED_BORROWED; @@ -1883,9 +1891,9 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.host = PKVM_NOPAGE; selftest_state.guest[0] = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, vcpu); + assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); @@ -1898,8 +1906,8 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.guest[0] = PKVM_PAGE_SHARED_OWNED; assert_transition_res(0, __pkvm_guest_share_host, vcpu, gfn); assert_transition_res(-EPERM, __pkvm_guest_share_host, vcpu, gfn); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); @@ -1912,8 +1920,8 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.guest[0] = PKVM_PAGE_OWNED; assert_transition_res(0, __pkvm_guest_unshare_host, vcpu, gfn); assert_transition_res(-EPERM, __pkvm_guest_unshare_host, vcpu, gfn); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); @@ -1925,19 +1933,19 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.host = PKVM_PAGE_OWNED; selftest_state.guest[0] = PKVM_POISON; assert_transition_res(0, __pkvm_host_force_reclaim_page_guest, phys); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + 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); assert_transition_res(-EHWPOISON, __pkvm_guest_share_host, vcpu, gfn); assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn); selftest_state.host = PKVM_NOPAGE; selftest_state.guest[1] = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn + 1, vcpu); + assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); 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(-EPERM, __pkvm_host_donate_guest, pfn, gfn, vcpu); + 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); selftest_state.host = PKVM_NOPAGE; diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index b88c1fcaadbd..99100204b093 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -462,7 +462,7 @@ int pkvm_pgtable_stage2_map(struct kvm_pgtable *pgt, u64 addr, u64 size, return ret ? -EFAULT : -EAGAIN; } - ret = kvm_call_hyp_nvhe(__pkvm_host_donate_guest, pfn, gfn); + ret = kvm_call_hyp_nvhe(__pkvm_host_donate_guest, pfn, gfn, 1); } else { if (WARN_ON_ONCE(size != PAGE_SIZE && size != PMD_SIZE)) return -EINVAL; -- 2.55.0.1007.g17ff1f9808-goog