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 F0813606A32A for ; Tue, 17 Nov 2026 17:45:14 +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=GitUKvJC; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=P6oDjnsY 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=qdRKQpbsRP9zrrkZiZbgzrcMMF3Np0SEAzl5LV93atc=; b=GitUKvJCp6SUkZeTpqmiNcmGsG r7SPtbOUB07lRIc4BGP21NAoT7nnMHYeSctOgHZz9Inq6SABZeI5nuwUehujS0Sj81d9vGx96eJ0z LQ0GMsMKU4TFy9fbk+maoPPRvdxcM3TjbS19mySODla7VVdlhbqhfABB4khQK2WWSSfzwC8bT1juO 8FeiM8N0o0PVaDOb+sieemS37JeC0I+TfAIqLkfleLt8zTfq3OOoXHJRZOK2QVKmowoHO7YJaTKx8 /cJdPYeFuHIXSsT5zjofwgsYP2ug2PoJCrfg0+ZVSQIPM1vSj0azVideh0cEvaHDgTlkJN0DmKbBg iTTMe5dw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTNEw-00000006eSx-0h8Y; Tue, 17 Nov 2026 17:45:06 +0000 Received: from mail-ed1-x548.google.com ([2a00:1450:4864:20::548]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xTNEN-00000006dvl-26mB for linux-arm-kernel@lists.infradead.org; Tue, 17 Nov 2026 17:44:32 +0000 Received: by mail-ed1-x548.google.com with SMTP id 4fb4d7f45d1cf-6b586b0a795so86897a12.1 for ; Tue, 17 Nov 2026 09:44:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794937469; x=1795542269; 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=qdRKQpbsRP9zrrkZiZbgzrcMMF3Np0SEAzl5LV93atc=; b=P6oDjnsYwRd+gTJhqlby29r1BtUzioyrqE0Vdw7YUof3jFOmf/cSowrX17vPZc98D3 +QAf8WrLW05FRv02s0Fr5QNoz1Ci3oDMs0Uqd09TadhNH4EVZ0JBKlzDmIlinZ1F61G4 lI6U3l9RGvVDTkNB4p/8rKtJWnFmS15ZhsOskBwj24OBnWUW1tTQCAEmEeV1uYIdX8df IE/kx9cQXqHpDFdVJLb5emO1CkEhBAos3zh1uUdQcjYCRz75B0RYZyuJMoJPjU1xPj0J 4EQ3KEE2p9u+SMK72HIbxMi7ZebNFjx3JTdfgkun5Ty9A7hiOF/Ov6VQ1GXmHe/JTn/L 0+8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794937469; x=1795542269; 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=qdRKQpbsRP9zrrkZiZbgzrcMMF3Np0SEAzl5LV93atc=; b=AUWC3skdsm9YUQvZ/58mzQrJ6GZQPDO9Ib9lJn+D1dfrwmpqCD1bMunMx9uHYb6aM/ 6XzwqXqCJhHepybgsYIch0r74xcnGJGe7zDVWp9p1UF0a2s3l5ZhrSMs8HhRiPsh+IFL 0ik7HLo7WHvdgGq4o2JEN61WvBJ5fKgGT1HVLHHic88fW6rOP2rdVXOnxduvDNbpBtYZ D8vNjrf7i4XqNKSmLoDy2CWmkRaz6c+wAbZed7oD/toY88G7R+mon4QzDJrz+NRdwgch KQhUc3/yugb9xaC47gEEgR6QX4P4NhfJcY4ocSzM+IhFjErDjaHzlvFOjeK8LN//MBgN IOOQ== X-Forwarded-Encrypted: i=1; AL+hErHIUMLky6rjCtQ2NHDVxf3S37mVPBu6KyAfKgBsB+gaywLWrZcV/uyx/aGd/K+ltdWBr9lz3o/cBZR+BzdYTwVk@lists.infradead.org X-Gm-Message-State: APuU4Z+C2//9kWTmMX5ioCoZ3OkGLCr+o16/vyMx9/QpEgTDq9ZA7aUU WB4qPUjEc1/18k306S/Tbu00rqJCczM28Vau8kV4c75bkQDlTU8KqOW6HTo5Mygy6Wk0aigbHgD mMrCwuhVB7gEly9ewmDaSsQ== X-Received: from edv17.prod.google.com ([2002:a05:6402:15d1:b0:6b4:20bc:f6a]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:11cf:b0:6b4:201f:17b6 with SMTP id 4fb4d7f45d1cf-6b887ca11a1mr27948a12.6.1794937468560; Tue, 17 Nov 2026 09:44:28 -0800 (PST) Date: Tue, 17 Nov 2026 17:43:50 +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-12-vdonnefort@google.com> Subject: [PATCH v4 11/23] KVM: arm64: Add a range to __pkvm_guest_share_host() 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_094431_610816_6BAFC11F X-CRM114-Status: GOOD ( 14.23 ) 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 In preparation for supporting stage-2 huge mappings for protected VMs, add a nr_pages argument to the __pkvm_guest_share_host() 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/mem_protect.c | 24 ++++++++++++------- arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index b05b0bcc3f2d..6741c9ecb879 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -32,7 +32,7 @@ enum pkvm_component_id { int __pkvm_prot_finalize(void); int __pkvm_host_share_hyp(u64 pfn, u64 nr_pages); -int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn); +int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn, u64 nr_pages); int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn); int __pkvm_host_unshare_hyp(u64 pfn, u64 nr_pages); int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index d5dcfbb59b7c..9183406ae04b 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1034,31 +1034,37 @@ int __pkvm_host_share_hyp(u64 pfn, u64 nr_pages) return ret; } -int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn) +static int __guest_check_transition_size(u64 phys, u64 ipa, u64 nr_pages, u64 *size); + +int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn, u64 nr_pages) { struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); - u64 phys, ipa = hyp_pfn_to_phys(gfn); + u64 size, phys, ipa = hyp_pfn_to_phys(gfn); kvm_pte_t pte; 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, PAGE_SIZE, &pte, &phys); + ret = get_valid_guest_pte(vm, ipa, size, &pte, &phys); if (ret) goto unlock; ret = -EPERM; if (pkvm_getstate(kvm_pgtable_stage2_pte_prot(pte)) != PKVM_PAGE_OWNED) goto unlock; - if (__host_check_page_state_range(phys, PAGE_SIZE, PKVM_NOPAGE)) + if (__host_check_page_state_range(phys, size, PKVM_NOPAGE)) goto unlock; ret = 0; - 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_SHARED_OWNED), &vcpu->vcpu.arch.stage2_mc, 0)); - WARN_ON(__host_set_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_SHARED_BORROWED)); + WARN_ON(__host_set_page_state_range(phys, size, PKVM_PAGE_SHARED_BORROWED)); unlock: guest_unlock_component(vm); host_unlock_component(); @@ -1941,8 +1947,8 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.host = PKVM_PAGE_SHARED_BORROWED; 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(0, __pkvm_guest_share_host, vcpu, gfn, 1); + assert_transition_res(-EPERM, __pkvm_guest_share_host, vcpu, gfn, 1); 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); @@ -1972,7 +1978,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr assert_transition_res(0, __pkvm_host_force_reclaim_page_guest, phys); 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_share_host, vcpu, gfn, 1); assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn); selftest_state.host = PKVM_NOPAGE; diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 2a73e63e8f81..66d7493a6549 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -1178,7 +1178,7 @@ static bool pkvm_memshare_call(u64 *ret, struct kvm_vcpu *vcpu, u64 *exit_code) goto out_guest; hyp_vcpu = container_of(vcpu, struct pkvm_hyp_vcpu, vcpu); - switch (__pkvm_guest_share_host(hyp_vcpu, hyp_phys_to_pfn(ipa))) { + switch (__pkvm_guest_share_host(hyp_vcpu, hyp_phys_to_pfn(ipa), 1)) { case 0: ret[0] = SMCCC_RET_SUCCESS; goto out_guest; -- 2.56.1.708.g77570a6a1d-goog