From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB003348C71 for ; Sat, 20 Jun 2026 18:01:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781978512; cv=none; b=GIK2gMzMSDSoNoi6v8sB2E7Ga0KDGC6ne05s8tlPjpMpGyxY/9K5d2J1IJiNSr8KUd9hb3NaW+glFn2H9smQSVT+gyv6iE9XCcsQLwt16q89k65cRGhoR83tssXBy9ZMkwEe2X0Q3GqQaqqFMVqSUV3Ohj608GNrIN93gEzZNjQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781978512; c=relaxed/simple; bh=81qX+qAPsLCiqIdHPLg1+JhVNjcZxVE57fRIFw3hA+8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Kcpe1sZdMQgHez+BYm409T43oYxDz04Y7goXEj/77kGB7JDe2028YR4LQkr7usScRumrguRg+xxYudsL7kw34Of5EvBQePa9HnMon3kTWix4ktGsgwR3WH4g7HOu8cLfXOWGsZm1vXVQ4pffmT1ysx9efknPmwKmWMOl3PhgtLc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YqZq5B9Y; arc=none smtp.client-ip=74.125.82.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YqZq5B9Y" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-13986d61b4fso3546002c88.0 for ; Sat, 20 Jun 2026 11:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781978508; x=1782583308; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TU1KHjg1xw4SOUVLZNaBDJ/t1F+t4VC9J/t07Bu+tLw=; b=YqZq5B9YZ/8aNQ543wv/K3X7t66V/M7Ou/RnXbYLPlYojaAqADP8dJqx+FsPSZwF7i qI1SoCkY47sDM2j/SZnXl4Qn56eFv/QioNgNWa4w/Fsic/QNpM0aQ7vH/CgSleihZNj2 JsVti0YeWI3vJl5l8Hxia6R9/k76KmrwgCsWNMRALl6zYC/YzZxHPG1nv41z/3AzSEZt HGroct1CkP3LImxJrYRrWhY+muGyMR6H3bfMplC0RpngtMu8GScHsDteIuT5yqCsfJsk QI/9jMmUXdAcLd4gxiC8bfm6326Bet/50abc84PncZJ+VAk4vNuuXh8Lm7temN8yfCwL hDCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781978508; x=1782583308; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TU1KHjg1xw4SOUVLZNaBDJ/t1F+t4VC9J/t07Bu+tLw=; b=ZsLBRj0138FwE2mhN/cWW7XFlXVd37e1sRgX2ef0YosB1w7m1Qzhro3D1Rq5/K4Ob8 WOZn6c6Tewex80JmeRH75dj3SQz3aFppVmax0346PwLlWXhMs0S0FXan30ZvQ+B1/EGW +fjevl3pvRhals76IisaRC3h0mo7+Vfv94G6W7j/uQz8HGKHFMLxgPMR7mSU2HOjT7lY N+SQ90NJX+lWR6WWa+YxN2pQvzaHZInh1KQHxuf9WJs8EJ3eq7QYbjuta3cNmGLMVM++ 531IewamxnvKixqPpkqpDX5nxzewDM/hg8MF5BcPJxGjRcpmAtvMUUVxS0kYfc4iynKs 7VFA== X-Forwarded-Encrypted: i=1; AFNElJ/MVBTq+LTBeVfqcfYmGqAJlOH0g6GV4TMjabEidC/Si2GQBqKcBwqYcHDervCCC716OlxKsWc2orcmbeM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9DUnl3Mfl69mHXI/7O4AtYOl4mYDPwRRu8HSlpcQFF1KkW/qh WSYXi26JGmgk1TW7p3aBYW7st63YZqBpVesQaJhWCcVL8xHpifX1cnv3 X-Gm-Gg: AfdE7cl/QmILg9JpMGlvzgkal7d+kn3E1HVfnypsUbAqzSTfMtn5UYGPORWnf9G3fsS 7K/TL5s03dW4K6Kw8HJ+QM4g7H/4aZBsLYLiigQq4qfDRpwuIgXdynsDGKB6trFoThrXWfmyQNj pVUj0LMN7VRngl7x/9mveDhnnpXJlXaK0zDQngt8OEthv9TV8jwxyTEeCcM8Am2+6NkolyL0lmg 66Jj2D9JrFT8G66GfJ0H4yezAPCAq9WUjAnwRt87tElmHJLgpE7pRcVhbU2nkhfqG1cm2BLbJcj HHKANAGUhfvAhvkr/+oSh6zwfFL86K1u4f6IZKC/XcuYx5FiL5XTYZ9rhPxj5QnAffV1kA8Ezso OihgUoMytl6Qic4qBwpNJIa+28YQ0LnviRJVdsUVZBO8+3fWM3hvuOpize9936bzZk8y7fT/8mL VEa/ztx9OVuNoXbtWA7bSYqEnojw== X-Received: by 2002:a05:7300:1826:b0:2f3:5266:fdfc with SMTP id 5a478bee46e88-30c071a7ff2mr5939362eec.33.1781978507455; Sat, 20 Jun 2026 11:01:47 -0700 (PDT) Received: from mo-Inspiron-5559.. ([2001:fb1:da:4242:fb25:44f6:726:5eda]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30c1ba57db7sm4025121eec.7.2026.06.20.11.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jun 2026 11:01:46 -0700 (PDT) From: Woradorn Laodhanadhaworn To: rostedt@goodmis.org Cc: mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, linux-kernel-mentees@lists.linux.dev, shuah@kernel.org, skhan@linuxfoundation.org, me@brighamcampbell.com, jkoolstra@xs4all.nl, woradorn.laon@gmail.com Subject: [PATCH] tracing: Use seq_buf for string concatenation Date: Sun, 21 Jun 2026 00:54:41 +0700 Message-ID: <20260620175441.223342-1-woradorn.laon@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In preparation for removing the strlcat API[1], replace the string concatenation logic with a struct seq_buf, which tracks the current position and the remaining space internally. The backing buffer bootup_event_buf allocation is unchanged. Use seq_buf_str() to NUL-terminate before passing to early_enable_events(). Link: https://github.com/KSPP/linux/issues/370 [1] Signed-off-by: Woradorn Laodhanadhaworn --- kernel/trace/trace_events.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index c46e623e7e0d..15164723e028 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -4501,13 +4502,23 @@ extern struct trace_event_call *__start_ftrace_events[]; extern struct trace_event_call *__stop_ftrace_events[]; static char bootup_event_buf[COMMAND_LINE_SIZE] __initdata; +static struct seq_buf bootup_event_seq; +static bool bootup_event_seq_initialized; static __init int setup_trace_event(char *str) { - if (bootup_event_buf[0] != '\0') - strlcat(bootup_event_buf, ",", COMMAND_LINE_SIZE); + if (!bootup_event_seq_initialized) { + seq_buf_init(&bootup_event_seq, bootup_event_buf, COMMAND_LINE_SIZE); + bootup_event_seq_initialized = true; + } + + if (seq_buf_used(&bootup_event_seq) > 0) + seq_buf_puts(&bootup_event_seq, ","); - strlcat(bootup_event_buf, str, COMMAND_LINE_SIZE); + seq_buf_puts(&bootup_event_seq, str); + + if (seq_buf_has_overflowed(&bootup_event_seq)) + return -ENOMEM; trace_set_ring_buffer_expanded(NULL); disable_tracing_selftest("running event tracing"); @@ -4766,7 +4777,7 @@ static __init int event_trace_enable(void) */ __trace_early_add_events(tr); - early_enable_events(tr, bootup_event_buf, false); + early_enable_events(tr, (char *)seq_buf_str(&bootup_event_seq), false); trace_printk_start_comm(); @@ -4794,7 +4805,7 @@ static __init int event_trace_enable_again(void) if (!tr) return -ENODEV; - early_enable_events(tr, bootup_event_buf, true); + early_enable_events(tr, (char *)seq_buf_str(&bootup_event_seq), true); return 0; } -- 2.43.0