From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (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 944E647D477 for ; Fri, 11 Sep 2026 13:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134678; cv=none; b=lnpNNuIbKG+ont1Drq3okUjE7s5zbo36TgSknhNzzO1D5b/Y74vbQk4s1hmsxONxFYhGCJbEZIiJsyMGD/rt3mm8WHhjX86jzKmz4nStCKSnhuf/9wyD52gaFno+1x7ArWAADNER0CPmONbg5Xr51kvQpjmwqS5+TeZ34XZsaAo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789134678; c=relaxed/simple; bh=O+JVFnLztzHCylz0QutgwcF3VNqRSW8VuzIeW8iU1TY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fFWJ/dhEGFZpHuWz3/wh3hK0CJPM4DYnOhhaQRfrNEU4r3MVcjG8dgzwdvkiIHqPEeR38XejnqUMIWtGiJQpzAyClw7etpT+7u9NJxh9NC3SGPtjGrZH02jq+6y3DppGkD3h+OlWZd7RDjr4z/hDrc4Z+kIBLGRsBds7hIvJVD0= 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=WzS/25A4; arc=none smtp.client-ip=209.85.221.69 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="WzS/25A4" Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-486e9338393so599159f8f.0 for ; Fri, 11 Sep 2026 06:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789134675; x=1789739475; 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=GhPOxKl4TlxzRPfpK2hpc3GObTW6Ccux2swcxze2iEI=; b=WzS/25A4Ne+djvoRbA6loUYufnLiJaBdEvh+kbn3idPagedXpPfuugWcfWUy9l8f2v ehAu0nP48E0ImHQqqUWmumv8+QIocRUbK5PbQ3oGLMsLWjOz/S1CPXrJeoCKaMhQPXAW mqMrZKOdER5cZGb08HmZs8Yzz2+O97YsPu1YJEjEJ3ecPrHjEVXlEMtKoFsWxOHs+Tjt j/SqI1Q/nBPQdHZhgWORSuAfmDvf+GOJyhiWO0OUhG9HMFyRXAn/LgizAq+F1D/UCe8L qsrXHc2uMgEMLlAKbZdEsgeiuXGUOYD30WFI+/J2Bqxyq4IcPpLxT+adeAslJU4kk/2k CWiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789134675; x=1789739475; 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=GhPOxKl4TlxzRPfpK2hpc3GObTW6Ccux2swcxze2iEI=; b=ckaJbWdRKNGC91KXQJpwKqnxC6vTblxqWfElTTqco+HZkvpO8h6n2UFamaF/i7LJoZ kPpxUZmUYKUtltxknlKGv31vBTpMV4sOZJp0JySQAzOxWRsw7szWnEhRt+A7s1G/IDfs xinTnay15QIjSC995fvJG9xO3ihdf3i36ys0kRY4AYXyn5hwipqikfgydG+IPtuumish UIIyXhMbCGTTntlaj7rejdp3YMskliCXO5gyqHNqe4m3EIYTya9m/9/c51h5i6L9x8JI GD/c7tjhch2pps5pmPK7730AxmL1bE1T9iFC0XuHaa/rtGEAVsktMcxQMUSn0/0r9ZyN ifuQ== X-Forwarded-Encrypted: i=1; AKwUvBwG5QDaAlqhobuVK3umtYYb9+YnOvhf8/uCUQM3IM4eejhmpAC88vZPa/Z8C+mIBQ2DHiN+j5I=@lists.linux.dev X-Gm-Message-State: AFuF++msq9lY3FWqwj7s74LtrWvEWOyZGcOySkD7SDGIek9Usj8rkpE8 U+5l26H2NNRjhXz8vQUxO9m6btamAzfq/pHVLOt0krwDlbnkCBJ27vHBMi2qPdzRAOzKx7JstT2 BIjhuAxnHAvOP4Fvu7oP83Q== X-Received: from wmnp7.prod.google.com ([2002:a05:600c:2e87:b0:495:5ec9:83bb]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3515:b0:49d:16dc:e721 with SMTP id 5b1f17b1804b1-49e61a74140mr46318465e9.24.1789134674499; Fri, 11 Sep 2026 06:51:14 -0700 (PDT) Date: Fri, 11 Sep 2026 14:50:42 +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-12-vdonnefort@google.com> Subject: [PATCH v2 11/22] KVM: arm64: Add a range to __pkvm_guest_unshare_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_unshare_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 | 22 +++++++++++-------- arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- 3 files changed, 15 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 b00a14c5ed9d..33f2d1824614 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -33,7 +33,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, u64 nr_pages); -int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn); +int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn, u64 nr_pages); int __pkvm_host_unshare_hyp(u64 pfn, u64 nr_pages); int __pkvm_host_donate_hyp(u64 pfn, u64 nr_pages); int __pkvm_hyp_donate_host(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 619dde4f576b..7e6882ce51f6 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1049,31 +1049,35 @@ int __pkvm_guest_share_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn, u64 nr_pages) return ret; } -int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn) +int __pkvm_guest_unshare_host(struct pkvm_hyp_vcpu *vcpu, u64 gfn, u64 nr_pages) { struct pkvm_hyp_vm *vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); - u64 meta, phys, ipa = hyp_pfn_to_phys(gfn); + u64 size, meta, 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_SHARED_OWNED) goto unlock; - if (__host_check_page_state_range(phys, PAGE_SIZE, PKVM_PAGE_SHARED_BORROWED)) + if (__host_check_page_state_range(phys, size, PKVM_PAGE_SHARED_BORROWED)) goto unlock; ret = 0; 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)); unlock: @@ -1938,8 +1942,8 @@ 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_guest_unshare_host, vcpu, gfn); - assert_transition_res(-EPERM, __pkvm_guest_unshare_host, vcpu, gfn); + assert_transition_res(0, __pkvm_guest_unshare_host, vcpu, gfn, 1); + assert_transition_res(-EPERM, __pkvm_guest_unshare_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); @@ -1956,7 +1960,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr 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, 1); - assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn); + assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn, 1); selftest_state.host = PKVM_NOPAGE; selftest_state.guest[1] = PKVM_PAGE_OWNED; diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 8f5c87ece728..2b0b0bc3064c 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -1132,7 +1132,7 @@ static void pkvm_memunshare_call(u64 *ret, struct kvm_vcpu *vcpu) return; hyp_vcpu = container_of(vcpu, struct pkvm_hyp_vcpu, vcpu); - if (!__pkvm_guest_unshare_host(hyp_vcpu, hyp_phys_to_pfn(ipa))) + if (!__pkvm_guest_unshare_host(hyp_vcpu, hyp_phys_to_pfn(ipa), 1)) ret[0] = SMCCC_RET_SUCCESS; } -- 2.55.0.1007.g17ff1f9808-goog