From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.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 DA1B734DCF3 for ; Mon, 20 Jul 2026 17:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784567743; cv=none; b=rrm+35ySkCkGIUcYvga8R6CR1xaM/hdBgPbmayHyrN2wHFLBWTl6aRKhOhKVUeL9TD4rgV9glkcXFo1CPIraIjRvx1grQ62M7aj2v/E+cUL+8X6CBqMqlxGeCE5M6pUaVREIVeDQld603aCh9GiuVgLJPW4xM8PBneORRbPx1DY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784567743; c=relaxed/simple; bh=uAb9Y/eDkIJ9JWHHpnybEXher2Vc0VJAlemUmjYw6hc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qFNJvKmKDTe3i8ZsLOOJH+bEydImCbFc9pXodJH2fF7IP503QsWT14CVF2GbDRHTjR8oZtGAsdrbAdGmZ2b3vbHjAIYI5mA9T+MktsX6MBxO2zAu+1jGgp9oErvKVWxqFQo+SnlMznnVjNk8RxaxbFJ9JiffCBu52JyNmgI8R50= 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=l0oTh1Mi; arc=none smtp.client-ip=209.85.221.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="l0oTh1Mi" Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-47407691804so7319151f8f.1 for ; Mon, 20 Jul 2026 10:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784567736; x=1785172536; 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=sfIttUHgktQpwdd/X5qWlTAhBk7HorU9xZiZDrBfx+Q=; b=l0oTh1Mit8TOOEIyhWZKGytZX04/aMMS6C0cK59XyXsEk8rnVoaEh4y7HrN2YR6PLf +kx1NuWkMALnc8VIPj78z/C3kdEcWP5X5bW2iFtBPExyBwn+n7Nv4UtHojsjKzzWDTc9 g0amXCcMqDwDmw7S2JpkwaNR5/MNmUpiEYgAKaxqj0Y/7ZYfQdhNeKbVamncBgLYoJBE j4ro96gFZdwdE+05aDLbo9LKVQWA1kV0LhZeVgGsJr0fRlAYgBu0px461/7ekmHbLsXN +sQZmRsVCJDbdGrllq2lFgWZMzZAwbzgzCzHF4JwZDa1MUvQwYdoJ3qL2UlxqLBNdVWp ka0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784567736; x=1785172536; 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=sfIttUHgktQpwdd/X5qWlTAhBk7HorU9xZiZDrBfx+Q=; b=cY2ycQb23aJQ4+JfO+s41WS35MT0eseRAKxRZD+9yTviOL5CFD7Uq53YbHvRAbWhip M9NHQXIpJOl21D9X510GwZVDwonvpsa4wvnVi0JWpkw+63jpXNQAepaMQU6fa9aat+iu LKfuNAFmJfF92SigveFRH5rjo5r27Hdr/JI2h9rAW1T1ua+IU9WI00vKQ323yRutjnHZ FhvTYycEFGm8Z2wrNEz2vNR3ZPnI4+I2g9jNupL3nWdWE/B4QNGAQNwF4btGQhdRGkgR tYjrPvvgRbNAdzfYCSKvtVpfuW5kg0l9Gmeq20UtBri9x17GkHBv7Wlj16+gOw5lW+Q+ uKcA== X-Forwarded-Encrypted: i=1; AHgh+RqjqeVlTaEwgpvmlDwZvLwQLJbWEQjDqvvcES+mHRlFHULj35crwahovOND2bIcdRkuefky4Qc=@lists.linux.dev X-Gm-Message-State: AOJu0YwJK8PztSjx4d7wv2rdcz7OoNQtYINKGEHb5Nfgfuik7Vcc3BUo R/NUgEGLIezE/qIre8TcFFrDM/olFXFx9uBKjZ8vpjfy+IU6GcwZv5L7+XWuaAV0rbPEaDVnt14 OsZheXUZG57l1AEFXzroIzA== X-Received: from wmpj5.prod.google.com ([2002:a05:600c:4885:b0:493:b328:830b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b1b:b0:495:443b:1bbb with SMTP id 5b1f17b1804b1-4954a50c473mr157674245e9.25.1784567736037; Mon, 20 Jul 2026 10:15:36 -0700 (PDT) Date: Mon, 20 Jul 2026 18:15:10 +0100 In-Reply-To: <20260720171513.1415357-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260720171513.1415357-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Message-ID: <20260720171513.1415357-15-vdonnefort@google.com> Subject: [PATCH v3 14/17] KVM: arm64: Alloc pkvm_hyp_vcpu using pKVM heap allocator 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, tabba@google.com, qperret@google.com, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" Transition the allocation of the hypervisor vCPU state structure (pkvm_hyp_vcpu) from the host to the hypervisor using the new pKVM heap allocator (hyp_alloc()). Previously, the host was responsible for calculating the size of, allocating, and donating memory for pkvm_hyp_vcpu during VM creation. With the heap allocator in place, the hypervisor now allocates this structure dynamically at EL2. Use the pkvm_call_hyp_req() wrapper in the host to invoke __pkvm_create_hyp_vcpu, which automatically handles any top-up requests if the hypervisor runs out of heap memory during allocation. Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index caea8e9986d1..95e05cee0f3a 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -268,7 +268,6 @@ typedef u16 pkvm_handle_t; struct kvm_protected_vm { pkvm_handle_t handle; - struct kvm_hyp_memcache teardown_mc; struct kvm_hyp_memcache stage2_teardown_mc; bool is_protected; bool is_created; diff --git a/arch/arm64/kvm/hyp/hyp-constants.c b/arch/arm64/kvm/hyp/hyp-constants.c index 501ab35a3840..b2caae21f271 100644 --- a/arch/arm64/kvm/hyp/hyp-constants.c +++ b/arch/arm64/kvm/hyp/hyp-constants.c @@ -7,6 +7,5 @@ int main(void) { DEFINE(STRUCT_HYP_PAGE_SIZE, sizeof(struct hyp_page)); - DEFINE(PKVM_HYP_VCPU_SIZE, sizeof(struct pkvm_hyp_vcpu)); return 0; } diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h index 8e930c8729af..cfb6e409bf49 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h @@ -83,8 +83,7 @@ void pkvm_hyp_vm_table_init(void *tbl); int __pkvm_reserve_vm(void); void __pkvm_unreserve_vm(pkvm_handle_t handle); int __pkvm_init_vm(struct kvm *host_kvm, void *pgd); -int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, - unsigned long vcpu_hva); +int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu); int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn); int __pkvm_start_teardown_vm(pkvm_handle_t handle); diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 595db3a936fe..01e7ffc489f5 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -605,10 +605,9 @@ static void handle___pkvm_init_vcpu(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(pkvm_handle_t, handle, host_ctxt, 1); DECLARE_REG(struct kvm_vcpu *, host_vcpu, host_ctxt, 2); - DECLARE_REG(unsigned long, vcpu_hva, host_ctxt, 3); host_vcpu = kern_hyp_va(host_vcpu); - cpu_reg(host_ctxt, 1) = __pkvm_init_vcpu(handle, host_vcpu, vcpu_hva); + errno_to_smccc(__pkvm_init_vcpu(handle, host_vcpu), host_ctxt); } static void handle___pkvm_vcpu_in_poison_fault(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 09f609db8556..fffd2f4bc071 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -645,30 +645,6 @@ static size_t pkvm_get_hyp_vm_size(unsigned int nr_vcpus) size_mul(sizeof(struct pkvm_hyp_vcpu *), nr_vcpus)); } -static void *map_donated_memory_noclear(unsigned long host_va, size_t size) -{ - void *va = (void *)kern_hyp_va(host_va); - - if (!PAGE_ALIGNED(va)) - return NULL; - - if (__pkvm_host_donate_hyp(hyp_virt_to_pfn(va), - PAGE_ALIGN(size) >> PAGE_SHIFT)) - return NULL; - - return va; -} - -static void *map_donated_memory(unsigned long host_va, size_t size) -{ - void *va = map_donated_memory_noclear(host_va, size); - - if (va) - memset(va, 0, size); - - return va; -} - static void __unmap_donated_memory(void *va, size_t size) { kvm_flush_dcache_to_poc(va, size); @@ -896,16 +872,15 @@ static int register_hyp_vcpu(struct pkvm_hyp_vm *hyp_vm, return 0; } -int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, - unsigned long vcpu_hva) +int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu) { struct pkvm_hyp_vcpu *hyp_vcpu; struct pkvm_hyp_vm *hyp_vm; int ret; - hyp_vcpu = map_donated_memory(vcpu_hva, sizeof(*hyp_vcpu)); + hyp_vcpu = hyp_alloc(sizeof(*hyp_vcpu)); if (!hyp_vcpu) - return -ENOMEM; + return hyp_alloc_errno(); hyp_spin_lock(&vm_table_lock); @@ -926,24 +901,12 @@ int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, } unlock: hyp_spin_unlock(&vm_table_lock); - if (ret) - unmap_donated_memory(hyp_vcpu, sizeof(*hyp_vcpu)); + hyp_free(hyp_vcpu); + return ret; } -static void -teardown_donated_memory(struct kvm_hyp_memcache *mc, void *addr, size_t size) -{ - size = PAGE_ALIGN(size); - memset(addr, 0, size); - - for (void *start = addr; start < addr + size; start += PAGE_SIZE) - push_hyp_memcache(mc, start, hyp_virt_to_phys); - - unmap_donated_memory_noclear(addr, size); -} - int __pkvm_reclaim_dying_guest_page(pkvm_handle_t handle, u64 gfn) { struct pkvm_hyp_vm *hyp_vm = get_pkvm_hyp_vm(handle); @@ -993,7 +956,7 @@ int __pkvm_start_teardown_vm(pkvm_handle_t handle) int __pkvm_finalize_teardown_vm(pkvm_handle_t handle) { - struct kvm_hyp_memcache *mc, *stage2_mc; + struct kvm_hyp_memcache *stage2_mc; struct pkvm_hyp_vm *hyp_vm; struct kvm *host_kvm; unsigned int idx; @@ -1014,7 +977,6 @@ int __pkvm_finalize_teardown_vm(pkvm_handle_t handle) hyp_spin_unlock(&vm_table_lock); /* Reclaim guest pages (including page-table pages) */ - mc = &host_kvm->arch.pkvm.teardown_mc; stage2_mc = &host_kvm->arch.pkvm.stage2_teardown_mc; reclaim_pgtable_pages(hyp_vm, stage2_mc); unpin_host_vcpus(hyp_vm->vcpus, hyp_vm->kvm.created_vcpus); @@ -1036,7 +998,7 @@ int __pkvm_finalize_teardown_vm(pkvm_handle_t handle) unmap_donated_memory_noclear(addr, PAGE_SIZE); } - teardown_donated_memory(mc, hyp_vcpu, sizeof(*hyp_vcpu)); + hyp_free(hyp_vcpu); } hyp_free(hyp_vm); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index a9b85ad37787..3b29b3f43ffa 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -153,28 +153,19 @@ static void __pkvm_destroy_hyp_vm(struct kvm *kvm) kvm->arch.pkvm.handle = 0; kvm->arch.pkvm.is_created = false; - free_hyp_memcache(&kvm->arch.pkvm.teardown_mc); free_hyp_memcache(&kvm->arch.pkvm.stage2_teardown_mc); } static int __pkvm_create_hyp_vcpu(struct kvm_vcpu *vcpu) { - size_t hyp_vcpu_sz = PAGE_ALIGN(PKVM_HYP_VCPU_SIZE); pkvm_handle_t handle = vcpu->kvm->arch.pkvm.handle; - void *hyp_vcpu; int ret; init_hyp_stage2_memcache(&vcpu->arch.pkvm_memcache); - hyp_vcpu = alloc_pages_exact(hyp_vcpu_sz, GFP_KERNEL_ACCOUNT); - if (!hyp_vcpu) - return -ENOMEM; - - ret = kvm_call_hyp_nvhe(__pkvm_init_vcpu, handle, vcpu, hyp_vcpu); + ret = pkvm_call_hyp_req(__pkvm_init_vcpu, handle, vcpu); if (!ret) vcpu_set_flag(vcpu, VCPU_PKVM_FINALIZED); - else - free_pages_exact(hyp_vcpu, hyp_vcpu_sz); return ret; } -- 2.55.0.229.g6434b31f56-goog