From nobody Fri Dec 19 19:02:50 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BBF21F666B for ; Wed, 2 Apr 2025 22:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743634651; cv=none; b=jrdxPiWuq6ojbcg9qYL9KjPMlPBVrqNtKLHERW9AcCQxOMsneTLVFWKb4c3WtqY22+l1B+WlK80BfkR9J9KfcwPOddm6d5jWos4Z0l5+g/7y6d+y7HuVRR+XRTuNBTWWttGK0+Yb0EpnUuf/7jcTgUJtvpwn1/V+g7r0NWUa7Jw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743634651; c=relaxed/simple; bh=8cfZK7u5YIArgQw04uKHNNH1jfFUGYfWfdcdVFKqeE0=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=YEHI5Ir5twd9XggG0YRqjp/6Qby5vLqvewyj36ek5uM1qGIFiG+ebd+3JwOF7wlRtXF5gx9hObIbgyYC9/yBQgzEyZ1w6AbVFgDyYnx2TnAG4TVYbPI8EouCQOeiA7TkowTsB5IN8NlL/DTBiIYKaY90xefct/eCCSqrW8HW68g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2583C4CEEA; Wed, 2 Apr 2025 22:57:30 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1u072Z-00000006Z1W-19gh; Wed, 02 Apr 2025 18:58:35 -0400 Message-ID: <20250402225835.125868572@goodmis.org> User-Agent: quilt/0.68 Date: Wed, 02 Apr 2025 18:57:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Linus Torvalds , Vincent Donnefort , Vlastimil Babka , Jann Horn , Mike Rapoport Subject: [for-linus][PATCH 2/4] tracing: Have reserve_mem use phys_to_virt() and separate from memmap buffer References: <20250402225735.849814084@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt The reserve_mem kernel command line option may pass back a physical address, but the memory is still part of the normal memory just like using memblock_alloc() would be. This means that the physical memory returned by the reserve_mem command line option can be converted directly to virtual memory by simply using phys_to_virt(). When freeing the buffer there's no need to call vunmap() anymore as the memory allocated by reserve_mem is freed by the call to reserve_mem_release_by_name(). Because the persistent ring buffer can also be allocated via the memmap option, which *is* different than normal memory as it cannot be added back to the buddy system, it must be treated differently. It still needs to be virtually mapped to have access to it. It also can not be freed nor can it ever be memory mapped to user space. Create a new trace_array flag called TRACE_ARRAY_FL_MEMMAP which gets set if the buffer is created by the memmap option, and this will prevent the buffer from being memory mapped by user space. Also increment the ref count for memmap'ed buffers so that they can never be freed. Link: https://lore.kernel.org/all/Z-wFszhJ_9o4dc8O@kernel.org/ Cc: Linus Torvalds Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Vincent Donnefort Cc: Vlastimil Babka Cc: Jann Horn Link: https://lore.kernel.org/20250402144953.583750106@goodmis.org Suggested-by: Mike Rapoport Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 23 ++++++++++++++++------- kernel/trace/trace.h | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 96129985e81c..e58b72e61573 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8492,6 +8492,10 @@ static int tracing_buffers_mmap(struct file *filp, s= truct vm_area_struct *vma) struct trace_iterator *iter =3D &info->iter; int ret =3D 0; =20 + /* A memmap'ed buffer is not supported for user space mmap */ + if (iter->tr->flags & TRACE_ARRAY_FL_MEMMAP) + return -ENODEV; + /* Currently the boot mapped buffer is not supported for mmap */ if (iter->tr->flags & TRACE_ARRAY_FL_BOOT) return -ENODEV; @@ -9600,9 +9604,6 @@ static void free_trace_buffers(struct trace_array *tr) #ifdef CONFIG_TRACER_MAX_TRACE free_trace_buffer(&tr->max_buffer); #endif - - if (tr->range_addr_start) - vunmap((void *)tr->range_addr_start); } =20 static void init_trace_flags_index(struct trace_array *tr) @@ -10696,6 +10697,7 @@ static inline void do_allocate_snapshot(const char = *name) { } __init static void enable_instances(void) { struct trace_array *tr; + bool memmap_area =3D false; char *curr_str; char *name; char *str; @@ -10764,6 +10766,7 @@ __init static void enable_instances(void) name); continue; } + memmap_area =3D true; } else if (tok) { if (!reserve_mem_find_by_name(tok, &start, &size)) { start =3D 0; @@ -10784,7 +10787,10 @@ __init static void enable_instances(void) continue; } =20 - addr =3D map_pages(start, size); + if (memmap_area) + addr =3D map_pages(start, size); + else + addr =3D (unsigned long)phys_to_virt(start); if (addr) { pr_info("Tracing: mapped boot instance %s at physical memory %pa of si= ze 0x%lx\n", name, &start, (unsigned long)size); @@ -10811,10 +10817,13 @@ __init static void enable_instances(void) update_printk_trace(tr); =20 /* - * If start is set, then this is a mapped buffer, and - * cannot be deleted by user space, so keep the reference - * to it. + * memmap'd buffers can not be freed. */ + if (memmap_area) { + tr->flags |=3D TRACE_ARRAY_FL_MEMMAP; + tr->ref++; + } + if (start) { tr->flags |=3D TRACE_ARRAY_FL_BOOT | TRACE_ARRAY_FL_LAST_BOOT; tr->range_name =3D no_free_ptr(rname); diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index ab7c7a1930cc..9d9dcfad6269 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -446,6 +446,7 @@ enum { TRACE_ARRAY_FL_BOOT =3D BIT(1), TRACE_ARRAY_FL_LAST_BOOT =3D BIT(2), TRACE_ARRAY_FL_MOD_INIT =3D BIT(3), + TRACE_ARRAY_FL_MEMMAP =3D BIT(4), }; =20 #ifdef CONFIG_MODULES --=20 2.47.2