From nobody Wed Apr 1 09:43:22 2026 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 BD0881E9B35 for ; Wed, 1 Apr 2026 00:40:04 +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=1775004004; cv=none; b=Edkdb3QdrjBOhC6SFNG1vElxIxYmSwuhW8CJPIO538/Ldaom+OnTwDQjTAsDfhEkrg97LEBPnOJy6ksV266/n//EtbbrXw/qmZqDo6N6xpF3RtnKOR/itI//DFNn/LFnZv/hVQ4wGWBd+9CnFbEYgNnotTfkw7kyrULmJqM1g/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775004004; c=relaxed/simple; bh=yw6zAuv552PtwTsI5RFNlQveJ5N12+86Jkk44j6GFGM=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=YVzAq7i92879QVoTCVUj+mNKsXQiUstYW+Ts9fDgjUjjPi9o7bx7gKqZjizTZQPHcH3QSrn3ImFR+mnGyT2hTId3dFriaG1hmYJ9Nz3JhrbhB9l3RlYtIEmYq9CiMb5yWTYsv3iE7OfmPq+PypcmqBGmj8D5/6pFZ+xzY6GyVns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gEaPOn8f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gEaPOn8f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49351C2BCB2; Wed, 1 Apr 2026 00:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775004004; bh=yw6zAuv552PtwTsI5RFNlQveJ5N12+86Jkk44j6GFGM=; h=Date:From:To:Cc:Subject:References:From; b=gEaPOn8foBIP+3oR74mP5EjQTCYnKdmWNhBbbWQ0LiJMuvMM+xF7mmkc6J/QvgFDW TPKptD0NOmcq+dl8p3zjwassQ+8InOMBASMTEVgxGOPPT337Gwff+89/pg3EexxY26 ufVJsxnyowDIZbN/A+igsZMPhfIgpRg20Wsrvl/vGZ5YR5WQd534j1PiDu9eW1S24K pGsuZ4DxBSNBwU1rwnztFkmv/pH6PwJsCJCXjz+kyQXfsFtPWuIGyADsGJ6llWb/C0 fSO4AiIL4aJHFM1Wzh0ZsR/fy7glgfrqtFnpwxI3rhj+cBDd883y2BKaxy5Q1WOiil JzdpCUy4iSSjg== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1w7jdn-0000000HGfP-2WYa; Tue, 31 Mar 2026 20:41:03 -0400 Message-ID: <20260401004103.469829734@kernel.org> User-Agent: quilt/0.69 Date: Tue, 31 Mar 2026 20:40:49 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Wesley Atwell Subject: [for-next][PATCH 2/3] tracing: Preserve repeated trace_trigger boot parameters References: <20260401004047.963302108@kernel.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: Wesley Atwell trace_trigger=3D tokenizes bootup_trigger_buf in place and stores pointers into that buffer for later trigger registration. Repeated trace_trigger=3D parameters overwrite the buffer contents from earlier calls, leaving only the last set of parsed event and trigger strings. Keep each new trace_trigger=3D string at the end of bootup_trigger_buf and parse only the appended range. That preserves the earlier event and trigger strings while still letting repeated parameters queue additional boot-time triggers. This also lets Bootconfig array values work naturally when they expand to repeated trace_trigger=3D entries. Before this change, only the last trace_trigger=3D instance survived boot. Link: https://patch.msgid.link/20260330181103.1851230-2-atwellwea@gmail.com Signed-off-by: Wesley Atwell Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index de807a9e2371..5df08645396e 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -3675,20 +3675,27 @@ static struct boot_triggers { } bootup_triggers[MAX_BOOT_TRIGGERS]; =20 static char bootup_trigger_buf[COMMAND_LINE_SIZE]; +static int boot_trigger_buf_len; static int nr_boot_triggers; =20 static __init int setup_trace_triggers(char *str) { char *trigger; char *buf; + int len =3D boot_trigger_buf_len; int i; =20 - strscpy(bootup_trigger_buf, str, COMMAND_LINE_SIZE); + if (len >=3D COMMAND_LINE_SIZE) + return 1; + + strscpy(bootup_trigger_buf + len, str, COMMAND_LINE_SIZE - len); trace_set_ring_buffer_expanded(NULL); disable_tracing_selftest("running event triggers"); =20 - buf =3D bootup_trigger_buf; - for (i =3D 0; i < MAX_BOOT_TRIGGERS; i++) { + buf =3D bootup_trigger_buf + len; + boot_trigger_buf_len +=3D strlen(buf) + 1; + + for (i =3D nr_boot_triggers; i < MAX_BOOT_TRIGGERS; i++) { trigger =3D strsep(&buf, ","); if (!trigger) break; --=20 2.51.0