From nobody Tue Dec 16 16:41:21 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B471C10F05 for ; Sat, 9 Dec 2023 23:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231285AbjLIW4m (ORCPT ); Sat, 9 Dec 2023 17:56:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbjLIW4i (ORCPT ); Sat, 9 Dec 2023 17:56:38 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34EA1F9 for ; Sat, 9 Dec 2023 14:56:42 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3089EC433C7; Sat, 9 Dec 2023 22:56:41 +0000 (UTC) Date: Sat, 9 Dec 2023 17:57:16 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers Subject: [PATCH] tracing: Increase size of trace_marker_raw to max ring buffer entry Message-ID: <20231209175716.09ac455b@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Steven Rostedt (Google)" There's no reason to give an arbitrary limit to the size of a raw trace marker. Just let it be as big as the size that is allowed by the ring buffer itself. And there's also no reason to artificially break up the write to TRACE_BUF_SIZE, as that's not even used. Signed-off-by: Steven Rostedt (Google) --- [ Depends on: https://lore.kernel.org/linux-trace-kernel/20231209175003.63d= b40ab@gandalf.local.home/ ] kernel/trace/trace.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index da837119a446..077b20e83e7c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7351,9 +7351,6 @@ tracing_mark_write(struct file *filp, const char __us= er *ubuf, return written; } =20 -/* Limit it for now to 3K (including tag) */ -#define RAW_DATA_MAX_SIZE (1024*3) - static ssize_t tracing_mark_raw_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *fpos) @@ -7375,18 +7372,16 @@ tracing_mark_raw_write(struct file *filp, const cha= r __user *ubuf, return -EINVAL; =20 /* The marker must at least have a tag id */ - if (cnt < sizeof(unsigned int) || cnt > RAW_DATA_MAX_SIZE) + if (cnt < sizeof(unsigned int)) return -EINVAL; =20 - if (cnt > TRACE_BUF_SIZE) - cnt =3D TRACE_BUF_SIZE; - - BUILD_BUG_ON(TRACE_BUF_SIZE >=3D PAGE_SIZE); - size =3D sizeof(*entry) + cnt; if (cnt < FAULT_SIZE_ID) size +=3D FAULT_SIZE_ID - cnt; =20 + if (size > ring_buffer_max_event_size(buffer)) + return -EINVAL; + buffer =3D tr->array_buffer.buffer; event =3D __trace_buffer_lock_reserve(buffer, TRACE_RAW_DATA, size, tracing_gen_ctx()); --=20 2.42.0