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 7D67BC5516D for ; Fri, 31 Jul 2026 14:36:57 +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=uG1uuKPkRVN2brFsEwVpSKL21oIHzytOILRu8uJWe7A=; b=V4BnoFMYCvx/ruRXXRNnDqVmL6 DN7iQO44o7E+8VIDIt03jzt3zPKnx8Zx/K8hIb2JidJKDB0JXeWDs/CKOsGtxFbLfzV0FZaiKgfta RofRd7ret9Lc3kza/V8xLYes7D8A8h+8AszGi2z7R+nJbpEHqXkEs6KZMW+AVJVmDGlOFBXc8cFzt nbcEd9BJZ0+lKoZVpqOhqOlJssOMmNLuVsWIc4YHm1f7983Y4G1dCMjO9CCj6zFXPXCVjLdHbL3Oc 9nHyu8sPjeS9zOcVTtVMvzPV3rdXtNQaPXR4r1pybzETcFa8/evpi+s1MrFCl1IQQgmtl4s/1m8JB xMkxdMqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpoLq-0000000Ck37-2hNK; Fri, 31 Jul 2026 14:36:42 +0000 Received: from mail-ed1-x548.google.com ([2a00:1450:4864:20::548]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpoLQ-0000000CjZF-2318 for linux-arm-kernel@lists.infradead.org; Fri, 31 Jul 2026 14:36:24 +0000 Received: by mail-ed1-x548.google.com with SMTP id 4fb4d7f45d1cf-6983e384c66so1083659a12.1 for ; Fri, 31 Jul 2026 07:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785508574; x=1786113374; 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=uG1uuKPkRVN2brFsEwVpSKL21oIHzytOILRu8uJWe7A=; b=UWrh5/3IX0sxzoiqFxhD83ch/giC8dVDwcErURcdMiwKvQCey0Jgd2SUje89ZxeLAA +BLk5ElXzoZfD3cK69+i4vPLuP4Th+JtyzrzzInJ1iZWpK00/MjI1OdhkLysSGn0jHb4 c2waXlUWfrNOgZExdA5/J9aBSALz5W0RfFUwLk0UO8K7q3ZFk6hOVPnlpEL0OlxxX36k S1LM7LSNPyPfZAwOIdTEl9bAasNN8hBH+AXVZzEa+3m8fWqIRXY6e0IfqMqDmctx/j67 SvjJZeEiB8MC8evne32uZxROQk/r3n4FvuaE1V1UdiUsaqsn0dA+4iTLe6APcaGygXMn MoiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785508574; x=1786113374; 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=uG1uuKPkRVN2brFsEwVpSKL21oIHzytOILRu8uJWe7A=; b=FnIqE2mx53U4KfuBWdEueM+GeCxTU2KVdwDeZBDC19sM+3PVpwMQlaQJaCh/0E21X+ eQTwgsUw1F/jWTnJVPWr3AF+6xCVkPoaRoPQJGd81vAl4Yc6DeeQZGW7OngKOONtATkm P7bPpRobM8SxTSby2qw/eYZ4yAxaCpwO8D0CkPLS86Sqx5I9lfUZpGPeJg2AQDSciHw6 vFKKUhfYgxH0LNTcUfQ8kA8BlpcrQgc0gbTFUAP8yk1X2KQrDveG4XDX7NJNn8WzID3K WsYWLBVrNAJd1Ltz/hLRgQqxv/Jg/ABhh1xZsLVvgJSHF0KSNwJRUpQyzZWRBwAK+7Z0 1D1g== X-Forwarded-Encrypted: i=1; AHgh+RpLlNKBQ0CVy3d/5PRO4yc6fI8pjTx7KOnsMg6dGRmXnKs8jtmK3xGAXYIOQR1qIr4PnGeE5DZhvOxJPgI1q4Yr@lists.infradead.org X-Gm-Message-State: AOJu0YzFAPNFTSDlaci9UYo58GJK8ckZSrmLDBJvwLWWmwwLNDe+6Y41 Eas1WYYDNE/IZDV/TERPIqkwuiuk54UDtNOqmwwf2LxXHqSInT2tDBS2VWcVLdk3ywKcVkTaZyJ lBRTojda/rdSLppx3xs3w2Q== X-Received: from wmma7.prod.google.com ([2002:a05:600c:2247:b0:493:ad14:710b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:e88:b0:6a0:4a9d:e388 with SMTP id 4fb4d7f45d1cf-6a098d1c714mr1245739a12.29.1785508573665; Fri, 31 Jul 2026 07:36:13 -0700 (PDT) Date: Fri, 31 Jul 2026 15:35:41 +0100 In-Reply-To: <20260731143541.956291-1-vdonnefort@google.com> Mime-Version: 1.0 References: <20260731143541.956291-1-vdonnefort@google.com> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260731143541.956291-18-vdonnefort@google.com> Subject: [PATCH v4 17/17] KVM: arm64: Alloc simple_buffer_page using pKVM hyp 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-20260731_073616_568731_77122427 X-CRM114-Status: GOOD ( 18.57 ) 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 In protected mode, transition the allocation of the simple_ring_buffer structures from the host to the hypervisor using the new pKVM heap allocator. Previously, the host allocated and donated a contiguous backing memory for these structures. In pKVM the hypervisor can now allocate them dynamically. Use the pkvm_call_hyp_req() wrapper in the host to invoke __tracing_load, which automatically handles any top-up requests if the hypervisor runs out of heap memory during allocation. Tested-by: Fuad Tabba Signed-off-by: Vincent Donnefort diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 9bab1e802281..ec5bb8541ceb 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -750,7 +750,7 @@ static void handle___tracing_load(struct kvm_cpu_context *host_ctxt) DECLARE_REG(unsigned long, desc_hva, host_ctxt, 1); DECLARE_REG(size_t, desc_size, host_ctxt, 2); - cpu_reg(host_ctxt, 1) = __tracing_load(desc_hva, desc_size); + errno_to_smccc(__tracing_load(desc_hva, desc_size), host_ctxt); } static void handle___tracing_unload(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trace.c index 96afa3d6de2f..5ff19d210508 100644 --- a/arch/arm64/kvm/hyp/nvhe/trace.c +++ b/arch/arm64/kvm/hyp/nvhe/trace.c @@ -4,6 +4,7 @@ * Author: Vincent Donnefort */ +#include #include #include #include @@ -62,18 +63,34 @@ static void __release_host_mem(void *start, u64 size) WARN_ON(__pkvm_hyp_donate_host(hyp_virt_to_pfn(start), size >> PAGE_SHIFT)); } -static int hyp_trace_buffer_load_bpage_backing(struct hyp_trace_buffer *trace_buffer, - struct hyp_trace_desc *desc) +static int hyp_trace_buffer_alloc_bpages(struct hyp_trace_buffer *trace_buffer, + struct hyp_trace_desc *desc) { - void *start = (void *)kern_hyp_va(desc->bpages_backing_start); - size_t size = desc->bpages_backing_size; + void *start; + size_t size; int ret; - ret = __admit_host_mem(start, size); - if (ret) - return ret; + if (is_protected_kvm_enabled()) { + struct ring_buffer_desc *rb_desc; + int cpu; - memset(start, 0, size); + size = 0; + for_each_ring_buffer_desc(rb_desc, cpu, &desc->trace_buffer_desc) + size += rb_desc->nr_page_va * sizeof(struct simple_buffer_page); + + start = hyp_alloc(size); + if (!start) + return hyp_alloc_errno(); + } else { + start = (void *)kern_hyp_va(desc->bpages_backing_start); + size = desc->bpages_backing_size; + + ret = __admit_host_mem(start, size); + if (ret) + return ret; + + memset(start, 0, size); + } trace_buffer->bpages_backing_start = start; trace_buffer->bpages_backing_size = size; @@ -81,7 +98,7 @@ static int hyp_trace_buffer_load_bpage_backing(struct hyp_trace_buffer *trace_bu return 0; } -static void hyp_trace_buffer_unload_bpage_backing(struct hyp_trace_buffer *trace_buffer) +static void hyp_trace_buffer_free_bpages(struct hyp_trace_buffer *trace_buffer) { void *start = trace_buffer->bpages_backing_start; size_t size = trace_buffer->bpages_backing_size; @@ -89,9 +106,12 @@ static void hyp_trace_buffer_unload_bpage_backing(struct hyp_trace_buffer *trace if (!size) return; - memset(start, 0, size); - - __release_host_mem(start, size); + if (is_protected_kvm_enabled()) { + hyp_free(start); + } else { + memset(start, 0, size); + __release_host_mem(start, size); + } trace_buffer->bpages_backing_start = 0; trace_buffer->bpages_backing_size = 0; @@ -128,7 +148,7 @@ static void hyp_trace_buffer_unload(struct hyp_trace_buffer *trace_buffer) simple_ring_buffer_unload_mm(per_cpu_ptr(trace_buffer->simple_rbs, cpu), __unpin_shared_page); - hyp_trace_buffer_unload_bpage_backing(trace_buffer); + hyp_trace_buffer_free_bpages(trace_buffer); } static int hyp_trace_buffer_load(struct hyp_trace_buffer *trace_buffer, @@ -143,7 +163,7 @@ static int hyp_trace_buffer_load(struct hyp_trace_buffer *trace_buffer, if (hyp_trace_buffer_loaded(trace_buffer)) return -EINVAL; - ret = hyp_trace_buffer_load_bpage_backing(trace_buffer, desc); + ret = hyp_trace_buffer_alloc_bpages(trace_buffer, desc); if (ret) return ret; @@ -168,18 +188,16 @@ static bool hyp_trace_desc_is_valid(struct hyp_trace_desc *desc, size_t desc_siz { struct ring_buffer_desc *rb_desc; unsigned int cpu; - size_t nr_bpages; void *desc_end; if (!is_protected_kvm_enabled()) return true; /* - * Both desc_size and bpages_backing_size are untrusted host-provided - * values. We rely on __pkvm_host_donate_hyp() to enforce their validity. + * desc_size is an untrusted host-provided value. We rely on + * __pkvm_host_donate_hyp() to enforce its validity. */ desc_end = (void *)desc + desc_size; - nr_bpages = desc->bpages_backing_size / sizeof(struct simple_buffer_page); if (desc->trace_buffer_desc.nr_cpus != hyp_nr_cpus) return false; @@ -197,17 +215,8 @@ static bool hyp_trace_desc_is_valid(struct hyp_trace_desc *desc, size_t desc_siz if ((void *)rb_desc + struct_size(rb_desc, page_va, rb_desc->nr_page_va) > desc_end) return false; - /* Overflow bpages backing memory? */ - if (nr_bpages < rb_desc->nr_page_va) - return false; - - if (cpu >= hyp_nr_cpus) - return false; - if (cpu != rb_desc->cpu) return false; - - nr_bpages -= rb_desc->nr_page_va; } return true; diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index 2411b4c32932..859a926c815f 100644 --- a/arch/arm64/kvm/hyp_trace.c +++ b/arch/arm64/kvm/hyp_trace.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "hyp_trace.h" @@ -157,10 +158,17 @@ static void __unshare_page(unsigned long va) static int hyp_trace_buffer_alloc_bpages_backing(struct hyp_trace_buffer *trace_buffer, size_t size) { - int nr_bpages = (PAGE_ALIGN(size) / PAGE_SIZE) + 1; size_t backing_size; + int nr_bpages; void *start; + if (is_protected_kvm_enabled()) { + trace_buffer->desc->bpages_backing_start = 0; + trace_buffer->desc->bpages_backing_size = 0; + return 0; + } + + nr_bpages = (PAGE_ALIGN(size) / PAGE_SIZE) + 1; backing_size = PAGE_ALIGN(sizeof(struct simple_buffer_page) * nr_bpages * num_possible_cpus()); @@ -176,6 +184,9 @@ static int hyp_trace_buffer_alloc_bpages_backing(struct hyp_trace_buffer *trace_ static void hyp_trace_buffer_free_bpages_backing(struct hyp_trace_buffer *trace_buffer) { + if (!trace_buffer->desc->bpages_backing_start) + return; + free_pages_exact((void *)trace_buffer->desc->bpages_backing_start, trace_buffer->desc->bpages_backing_size); } @@ -264,7 +275,7 @@ static struct trace_buffer_desc *hyp_trace_load(unsigned long size, void *priv) if (ret) goto err_free_buffer; - ret = kvm_call_hyp_nvhe(__tracing_load, (unsigned long)desc, desc_size); + ret = pkvm_call_hyp_req(__tracing_load, (unsigned long)desc, desc_size); if (ret) goto err_unload_pages; -- 2.55.0.508.g3f0d502094-goog