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 2F956C624D3 for ; Tue, 1 Sep 2026 08:10:21 +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=bjcSVwbVLsAT4JeBPjMW/8NzKi2n/DkRjc8BGUj88V4=; b=aAmdfHt6XNhLBe9RtlIizsR+Y4 Dk10kK6dQMEoFd+ve6SAEle+REr3QqAOIrh8ONVmYRFfU1w7Rd/3W9MF025bcb5LCy8+DisZY7SmA zFhEKiLuRCW4lP975GbLlxCYfsf0xzRm4rtdwkLtE+neC0nO/5R2NPrmMxI1dggZItmGiSfkyVL2u 5dJ+bB622UiW/l5H0rzWB8BuXPeIubD//pBTQFGTRCN4CibW+9pe5Jxk2t7hrkWasOwMLoP6HATrI MLKmtG7r9KK2pf7GZZdeSFDjh9vwliYP47uuAxTu50U1WrkNZbksEQUPbzYXZD/notxW2IDxd9U4u gmORVO/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x1JZJ-0000000BD25-1NDD; Tue, 01 Sep 2026 08:10:09 +0000 Received: from mail-ed1-x545.google.com ([2a00:1450:4864:20::545]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x1JZG-0000000BCvj-37EC for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2026 08:10:07 +0000 Received: by mail-ed1-x545.google.com with SMTP id 4fb4d7f45d1cf-6a5f2b256aeso5358710a12.3 for ; Tue, 01 Sep 2026 01:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788250205; x=1788855005; 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=bjcSVwbVLsAT4JeBPjMW/8NzKi2n/DkRjc8BGUj88V4=; b=vcKdsQXdgSX11nK1bwaiwOpz77esPiX4VmRl9ObZM1VF+1/QkK+liBppS8kCBjEZNs 93ZI7OTtuOd50zhpiJOhopQbwy8urzrZcJh2qY3H3RRHoOa+9EpGgjz7jgXhtRENKZa4 6bTf+7cCIim1bxuM2RxbOwwLtM2RhuTxq1WQ9+hw1VTFxiD93tPYe+Qt+E+GrWdZa+za RPeu7AkVU3xS40X3D+6eMHGVwtj6dkaOH7OIuvDzA/wsC1ZdRC1wY1g/lU8AVVEvemXa 7NJxv/Nt0Eg26DKVMpEl1jT0s+IvDOhqcIKtfFamiKkXaxdJRPlKO4G5t7juEtWppYgr k9jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788250205; x=1788855005; 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=bjcSVwbVLsAT4JeBPjMW/8NzKi2n/DkRjc8BGUj88V4=; b=ZZILXGNVuUWg2p64zNVFHBbBXc+Ako+P9qPQZuCXkcMeivauIfb6zHkaXv7ouuIcO6 /92CdqZgP/w+xnk2paD4Frie0TI2GjmYXnICuO60U6IDLCftmT/3SmFctCiEZ92MvVnG eJ4/sk4/aId6LSAgrjN378IhAjWJBgBtzrGQgvYL0/DSglaemgXrdZ7cG4f+HTkMbtAz A0gY7uzqbgQPDPTiH8hBXCDe3VIcMiZY4opdkCIA4S7WlfqWFTHtQSYI4rosr485aOCe w6Epx0FikKcSHFuVFXedKW8l+BCGcSCxZTMBDdlf8hNmSSfQU+XCpcTkA2x83PwpkeUT 67Qg== X-Forwarded-Encrypted: i=1; AKwUvBy4Vf4KawZU/aLOkqV1MJGLqTkeIuyCejady+/yK8ks69fB9haDyb4Hu84XO3KrtcEE3eQgjy+SEPxyXmQwmGT0@lists.infradead.org X-Gm-Message-State: AFuF++k23Emjr5ymX9cZlMENlZxUduwBwfCmilKgoSHWA08hOVZtKWOe Vt+5rrItLDNPJwPEJR+yNooQmv8RjACJqUHmydvuuTe2PodI6Ekrp3NhD+fy4p1dOC9zkiqRdPa //qJjGTqDG4YeiO97vgnIoQ== X-Received: from edaa16.prod.google.com ([2002:a05:6402:24d0:b0:6a1:2464:d8d1]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3223:b0:6a6:584:d9e7 with SMTP id 4fb4d7f45d1cf-6a60d3bc75fmr20508329a12.15.1788250204777; Tue, 01 Sep 2026 01:10:04 -0700 (PDT) Date: Tue, 1 Sep 2026 09:09:37 +0100 In-Reply-To: <20260901080941.997769-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20260901080941.997769-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.897.gb25b4bd76c-goog Message-ID: <20260901080941.997769-15-vdonnefort@google.com> Subject: [PATCH v5 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, qperret@google.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-20260901_011006_846325_C950BDE0 X-CRM114-Status: GOOD ( 14.48 ) 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 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. Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 3ab41330c94f..fe5364b507f9 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 c9960ac1a803..bc54f477c147 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -804,10 +804,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 cabcfb59a89d..ee2060aa1131 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -658,30 +658,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); @@ -909,16 +885,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); @@ -939,24 +914,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); @@ -1006,7 +969,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; @@ -1027,7 +990,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); @@ -1049,7 +1011,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.55.0.897.gb25b4bd76c-goog