From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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 8A9E62E8B67 for ; Fri, 11 Sep 2026 13:51:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134677; cv=none; b=X8UT4Z6DjqRycXgLidJ3RfueFa5urdvjT5bXX/z9U5KlZM+29uXtvJBh0mFmTDWj8GTDaLlsTAnE1T/7d8I2ivaDtgHO6YlIGKHCgKOV+hQz2lJwfuR85P8dKOoeUYEO9oqbLH6qCRX6FY2TYFHr91ZcJFvY/QQ5J+6S/0I6Z9Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134677; c=relaxed/simple; bh=BQKD3JC7QDECjKZeJjUgkOZzYJbN7dBVwits/awejgQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=kExFeq6QcEoiSCrxRA7VJ/vLbEUEX1fSk0FQ7cJfxDq3S9wDOJbjoR438ymvNziwUChAMfXv1y92YB6iJQioFhp9rYxygPIjpnWXPAI1GgaEfpqdtlUB9UnVwtyCrNETVB+E+6B6EQrx15EBFbCFWU7dGvWXWCXn8WFiCnyfDLA= 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=Can8yts3; arc=none smtp.client-ip=209.85.128.70 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="Can8yts3" Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-49e6422198fso6121675e9.1 for ; Fri, 11 Sep 2026 06:51:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789134674; x=1789739474; 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=9FcQYlhVjdKJ/HjkPJaoU1lb6LXGKy2A6yCoD9ioS0s=; b=Can8yts3j9vwNkDgNJrjx000/ZOPYX5JJrRBzeJilOjCkw0Yxlz2N+aePibYHbzlCP HP5zB8DKfAfC3LFHHUcGvca38yRQW92sEzXA22pDuWuj9dqS6XWkjnzzAX8Mk06jxMF7 6lETjd+AqnxpMKY3n8EzLLcl7p8Uefo6OewFx0lAaIEBAFIz41O2+f/TG8qyzS20h6oR Z7kKtuLs+7HwDDNQ5eYGn0rGOMe70YTyPYtX/17K/gGdSHN4UOKi3/zG+lSPcka9YOAv mVtS4duXGcWyYvuYEb51T3h1f5pOArC2M9uEncLOhI3Q84YyT79JnJC8PBMeShV1Vmt3 hXmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789134674; x=1789739474; 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=9FcQYlhVjdKJ/HjkPJaoU1lb6LXGKy2A6yCoD9ioS0s=; b=owA6RrHgDudx6guCnaiiBZ7OP9OXhrFJwg9UDnS1Tv8y7+aH5OD1+6stlCDRBf2WBJ jTCAN4PcQPVPEVWo8b2qc4Io8ByH1ixDbAl2FuEQo57S0xpi+C/jPtPWXCr6bDNMQRUk xE51T8DadX6GTe97pGUXCDL2XC5z1kLjP3xzCRE4KEoCCu2V7hC3Tbd2yINKs7r/ApFJ nJFTvafIlUkw/wRxaUG72qmCiAScw9nO5MvewQaOCYSMxyxp8tzzmzF6X4RLEEC724TZ tfkOa3UmU4n5A1cHuqNChYAI4ATuTgkFHN3rkAgfEEyHXOV9rVq3pA91k89sfP7r0fgW PthA== X-Forwarded-Encrypted: i=1; AKwUvBwBoJRSXTar6HxBgHGgyIi7ZMk+gx/KuXE54/o5IdMQvyu4VO2ndvuXEYvnecpCRnx0QzMUUoM=@lists.linux.dev X-Gm-Message-State: AFuF++m5z1QBmwxtpERcTNZJ/FXtojUw3m9DbIiEFwj/FOtirK8zcy9Y jNpX/uOtRdTWx+mieScmIjvSyTbQwv6RTP6b5frLpmRcsOQUmfDR3TWlAe8/CWGmrzD+FsufgO5 QMnDfvTfv/CEewrNuttb+eg== X-Received: from wmhn12.prod.google.com ([2002:a05:600c:304c:b0:49d:a6b5:e823]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1385:b0:499:a5c8:c6f3 with SMTP id 5b1f17b1804b1-49e61878ab9mr76588395e9.3.1789134673450; Fri, 11 Sep 2026 06:51:13 -0700 (PDT) Date: Fri, 11 Sep 2026 14:50:41 +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-11-vdonnefort@google.com> Subject: [PATCH v2 10/22] 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" 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 646d2335e5c1..b00a14c5ed9d 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 25a86b318dfc..619dde4f576b 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1011,31 +1011,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.pkvm_memcache, 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(); @@ -1918,8 +1924,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); @@ -1949,7 +1955,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 6590c4de7fd2..8f5c87ece728 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -1104,7 +1104,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.55.0.1007.g17ff1f9808-goog