From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F070CA5FCB for ; Thu, 1 Oct 2026 14:29:44 +0000 (UTC) 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-Owner; bh=IgB8IIPXmAJrVZAPAshZMvG1RwUCRUSQ4TIIxFuHVGE=; b=g0+9S8/tOaQmDYikAdBq3f01As nPTKR4vUY/n+mFYAPdtwup5LhZtXnHATcmhoj1n28EFZTbWR9PV/wV0/F3Pi6xw3M27SDcDwQNbiJ NQDJyAJ78ccOVH+NSOQCFDlBMbw8niEp47uiXPqXaHxLXIb8p5EzoOSA/XxlP9X/QUC6xC+OD1CQ5 lWchNxKSH2Ps53qBGH1OVQgUJBOlbA0Bdm9nPZ/DC7R3a7vc6wn4W38K9DtisIs1i0zxMVMsgzt8P Mjdjci73iL+U7RdRnQmvtEvatYpYj8eo87AnhxrejPyKHU5X3iXIjyhCgm2b6TfHorU4T1Dji2p5z C/ivzcAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xCHms-00000009Nh6-10O3; Thu, 01 Oct 2026 14:29:30 +0000 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xCHmh-00000009NNJ-0zr9 for linux-arm-kernel@lists.infradead.org; Thu, 01 Oct 2026 14:29:26 +0000 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a01b112fa2so19137415e9.1 for ; Thu, 01 Oct 2026 07:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790864955; x=1791469755; 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=IgB8IIPXmAJrVZAPAshZMvG1RwUCRUSQ4TIIxFuHVGE=; b=b33PG3NFCjluIfM3OJdVAS1i/ETrejng3KNIg8uyTKf6MmEvoo73pHeVIEN+pqp2/u nP4LgXEghUkV6Mebybbpb2sHt9KqxZlCP2HWJ8Kf8TGrGQ2t5VrtZGIS1xxfNR3kEYFn ljS48o5X3Hl7jN9WS1gHC8mYX/lL8+XlM/L2vTMIyuv7grsU97WFkZ90hkkfdiRu8LzM GgOpM5Jf7yvubepo9/0zrqaeFEmVhSxz9xCsVUt2w/YLvtA2nG4PnZq4McXJo++qYId8 obcWCo0zvlIJjQ8eUmWWghGqda5Okzk+F98uKoKJBDbkQ2o47qF2XmKlFCiYD0vU7Rgm 4DgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790864955; x=1791469755; 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=IgB8IIPXmAJrVZAPAshZMvG1RwUCRUSQ4TIIxFuHVGE=; b=FYzunEWxM2H17ZZpIoBc0/deXoFiVGL4gd2A4AfDXMIj9h/kMeTfEPm3zF536VRxa4 XFyWSjbV7VAAHpq5adY0ZotGoWnxV+xUIsONKt4R6wOvwNZnAjFjMbe7kGk8XX3s7CHm nt2NIHBUhy/8TXap45iacrwSPKSpGms9w/s55KwX98rDRso6uXI7KgpuOYbA8etcJoBl XTybEr3Vln8HHraUjE7sjpkohp+ZLRlwoO03c82jAKah2MdE8Izm0y4+IUoVet+cpzu2 bEpZUjXFgf2XWklQt6iV90/9Dir6c+CmFMjBQEofW+7yKfavJn0p+IOQXk4e3/koXKnd 8Aqw== X-Forwarded-Encrypted: i=1; AKwUvBwnTDVt31EWf9j/Q62M9JCY8LfMq4h8HqXpKitY4sv935qVVwD4bT4EmmUNh3A9C1uE8j90E/7xFy0crx3WBTUh@lists.infradead.org X-Gm-Message-State: AFuF++k5grYiaZAMYeFS19ivyfOAfrVjJ1R4O5qqF42mdpNijfgUVyUL TI7T+Yy10ERVgyLGPVr8vixGUfvQF3dApOF6sWwq+taVNKPu5sezNqe5AxMHe0OEBgBq7WSIx0T RSuTuHoQmm+S6z7D7pXgXFg== X-Received: from wmdv11.prod.google.com ([2002:a05:600c:12cb:b0:4a0:2a5:ce1a]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:c16f:b0:49f:c1a1:5222 with SMTP id 5b1f17b1804b1-4a0257b13c2mr15444775e9.33.1790864954623; Thu, 01 Oct 2026 07:29:14 -0700 (PDT) Date: Thu, 1 Oct 2026 15:28:45 +0100 In-Reply-To: <20261001142849.3367614-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20261001142849.3367614-1-vdonnefort@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20261001142849.3367614-15-vdonnefort@google.com> Subject: [PATCH v6 14/18] 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, fuad.tabba@linux.dev, 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-20261001_072919_455354_7B01E1A4 X-CRM114-Status: GOOD ( 16.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 vCPU 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 Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba --- arch/arm64/include/asm/kvm_hcall.h | 3 +- arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/hyp/hyp-constants.c | 1 - arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 3 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 5 ++-- arch/arm64/kvm/hyp/nvhe/pkvm.c | 38 +++++--------------------- arch/arm64/kvm/pkvm.c | 11 +------- 7 files changed, 12 insertions(+), 50 deletions(-) diff --git a/arch/arm64/include/asm/kvm_hcall.h b/arch/arm64/include/asm/kvm_hcall.h index c98243e79e31..7dd176b4bea4 100644 --- a/arch/arm64/include/asm/kvm_hcall.h +++ b/arch/arm64/include/asm/kvm_hcall.h @@ -232,8 +232,7 @@ DECLARE_KVM_HOST_HCALL(void, __pkvm_unreserve_vm, DECLARE_KVM_HOST_HCALL(int, __pkvm_init_vm, struct kvm __kern *, host_kvm, void __kern *, pgd_hva) DECLARE_KVM_HOST_HCALL(int, __pkvm_init_vcpu, - pkvm_handle_t, handle, struct kvm_vcpu __kern *, host_vcpu, - void __kern *, vcpu_hva) + pkvm_handle_t, handle, struct kvm_vcpu __kern *, host_vcpu) DECLARE_KVM_HOST_HCALL0(int, __pkvm_vcpu_in_poison_fault) DECLARE_KVM_HOST_HCALL(int, __pkvm_force_reclaim_guest_page, phys_addr_t, phys) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 64cd6233b439..3cca9f3b2eeb 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -267,7 +267,6 @@ struct kvm_smccc_features { 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 c5fd7315c0e3..866961c3bacb 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h @@ -84,8 +84,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 __kern *pgd_hva); -int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_vcpu *host_vcpu, - void __kern *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 7eecac7c7fbe..281d1359606a 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -789,10 +789,9 @@ DEFINE_KVM_HOST_HCALL(int, __pkvm_init_vm, } DEFINE_KVM_HOST_HCALL(int, __pkvm_init_vcpu, - pkvm_handle_t, handle, struct kvm_vcpu __kern *, host_vcpu, - void __kern *, vcpu_hva) + pkvm_handle_t, handle, struct kvm_vcpu __kern *, host_vcpu) { - return __pkvm_init_vcpu(handle, kern_hyp_va_host(host_vcpu), vcpu_hva); + return errno_to_smccc(__pkvm_init_vcpu(handle, kern_hyp_va_host(host_vcpu))); } DEFINE_KVM_HOST_HCALL0(int, __pkvm_vcpu_in_poison_fault) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index c29a25cae8e8..5031ef9e6fe9 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -672,16 +672,6 @@ static void *map_donated_memory_noclear(void __kern *host_va, size_t size) return va; } -static void *map_donated_memory(void __kern *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); @@ -910,16 +900,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, - void __kern *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); @@ -940,24 +929,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); @@ -1007,7 +984,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; @@ -1028,7 +1005,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); @@ -1050,7 +1026,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 8505965dbfb2..36e677e51f7d 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -174,28 +174,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.56.0.rc1.315.gc6ed9934b7-goog