From nobody Wed Feb 11 05:40:59 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 E16682C21CC for ; Mon, 9 Feb 2026 02:20:06 +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=1770603607; cv=none; b=QzOMr3S5h4rHK7L70GbubS1nSFydh0W0pS8zGfOdOgkkilUhyWHJT6/rMpXB2tMQrpHVx7Co6AaUAsePk3ayYf24x15XcesAro5BY+Enci44pclK+Mbrv44QNRAwTIm+fLAx30GD7zkQNd5d69EY5nczJaxP+a/rTw9fz1ivbN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770603607; c=relaxed/simple; bh=xUwMGF4Jzywu6ornQqphdCr2uHMPD7KLVnBeYSdAgR4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=XJKl8gzgbYIWcFAVWfYxqVXGHCzShNRp96mi3beDU4WrMh6qemVpsb6gqa1y7ubPT4YfdfDUIKblBzOdexYvs/dZFrQR32Zxrg8/+BtuLSxSHgZ73hF77JTC+PWoruLQ0smGGj/CYZwLYIKsEezJh1cgsHmyFato6882BL7ruqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bAUBuMDT; 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="bAUBuMDT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C584DC2BC86; Mon, 9 Feb 2026 02:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770603606; bh=xUwMGF4Jzywu6ornQqphdCr2uHMPD7KLVnBeYSdAgR4=; h=Date:From:To:Cc:Subject:References:From; b=bAUBuMDTnGWXn3iKwUAD3VWdzhKigyvDQR9LCBarLc8DbXyWg6FKw9YwFOI1I8jJW vE2R7bTZ2dk2ZIVNW843sF0qOoauy/J1zBPdgwlZKplNWD3wTlXdeGlP/97089asxA qEu5ljX/dxF0oFx5Zqym9uwFIa3TJlFZHNzSUOSz1eyitdpl9X6nPQ57L52RtXk0It SDznQXg1wpe68ArKfwQ+0LkOStZhYAJ+UZX3Tgs6EBi3qHkjJthICuhN9Bh882CB27 U4aXSqbmDEB2f4NK1442grE+c/46AfYfgi0Xm2ZoyG1KoYshqeH+NXxvRPpj3J0cMa giVm8XnQL9muQ== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vpGtR-0000000Aa3L-1SjY; Sun, 08 Feb 2026 21:20:53 -0500 Message-ID: <20260209022053.197351792@kernel.org> User-Agent: quilt/0.68 Date: Sun, 08 Feb 2026 21:20:33 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 07/20] tracing: Clean up use of trace_create_maxlat_file() References: <20260209022026.627895421@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: Steven Rostedt In trace.c, the function trace_create_maxlat_file() is defined behind the #ifdef CONFIG_TRACER_MAX_TRACE block. The #else part defines it as: #define trace_create_maxlat_file(tr, d_tracer) \ trace_create_file("tracing_max_latency", TRACE_MODE_WRITE, \ d_tracer, tr, &tracing_max_lat_fops) But the one place that it it used has: #ifdef CONFIG_TRACER_MAX_TRACE trace_create_maxlat_file(tr, d_tracer); #endif Which is pointless and also wrong! It only gets created when both CONFIG_TRACE_MAX_TRACE and CONFIG_FS_NOTIFY is defined, but the file itself should not be dependent on CONFIG_FS_NOTIFY. Always create that file when TRACE_MAX_TRACE is defined regardless if FS_NOTIFY is or is not. Cc: Mathieu Desnoyers Acked-by: Masami Hiramatsu (Google) Link: https://patch.msgid.link/20260207191101.0e014abd@robin Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 702ef851db45..d02c4004c718 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1912,10 +1912,7 @@ static ssize_t trace_seq_to_buffer(struct trace_seq = *s, void *buf, size_t cnt) unsigned long __read_mostly tracing_thresh; =20 #ifdef CONFIG_TRACER_MAX_TRACE -static const struct file_operations tracing_max_lat_fops; - #ifdef LATENCY_FS_NOTIFY - static struct workqueue_struct *fsnotify_wq; =20 static void latency_fsnotify_workfn(struct work_struct *work) @@ -1932,17 +1929,6 @@ static void latency_fsnotify_workfn_irq(struct irq_w= ork *iwork) queue_work(fsnotify_wq, &tr->fsnotify_work); } =20 -static void trace_create_maxlat_file(struct trace_array *tr, - struct dentry *d_tracer) -{ - INIT_WORK(&tr->fsnotify_work, latency_fsnotify_workfn); - init_irq_work(&tr->fsnotify_irqwork, latency_fsnotify_workfn_irq); - tr->d_max_latency =3D trace_create_file("tracing_max_latency", - TRACE_MODE_WRITE, - d_tracer, tr, - &tracing_max_lat_fops); -} - __init static int latency_fsnotify_init(void) { fsnotify_wq =3D alloc_workqueue("tr_max_lat_wq", @@ -1967,14 +1953,22 @@ void latency_fsnotify(struct trace_array *tr) */ irq_work_queue(&tr->fsnotify_irqwork); } +#endif /* !LATENCY_FS_NOTIFY */ =20 -#else /* !LATENCY_FS_NOTIFY */ - -#define trace_create_maxlat_file(tr, d_tracer) \ - trace_create_file("tracing_max_latency", TRACE_MODE_WRITE, \ - d_tracer, tr, &tracing_max_lat_fops) +static const struct file_operations tracing_max_lat_fops; =20 +static void trace_create_maxlat_file(struct trace_array *tr, + struct dentry *d_tracer) +{ +#ifdef LATENCY_FS_NOTIFY + INIT_WORK(&tr->fsnotify_work, latency_fsnotify_workfn); + init_irq_work(&tr->fsnotify_irqwork, latency_fsnotify_workfn_irq); #endif + tr->d_max_latency =3D trace_create_file("tracing_max_latency", + TRACE_MODE_WRITE, + d_tracer, tr, + &tracing_max_lat_fops); +} =20 /* * Copy the new maximum trace into the separate maximum-trace @@ -2109,7 +2103,9 @@ update_max_tr_single(struct trace_array *tr, struct t= ask_struct *tsk, int cpu) __update_max_tr(tr, tsk, cpu); arch_spin_unlock(&tr->max_lock); } - +#else /* !CONFIG_TRACER_MAX_TRACE */ +static inline void trace_create_maxlat_file(struct trace_array *tr, + struct dentry *d_tracer) { } #endif /* CONFIG_TRACER_MAX_TRACE */ =20 struct pipe_wait { @@ -10664,9 +10660,7 @@ init_tracer_tracefs(struct trace_array *tr, struct = dentry *d_tracer) =20 create_trace_options_dir(tr); =20 -#ifdef CONFIG_TRACER_MAX_TRACE trace_create_maxlat_file(tr, d_tracer); -#endif =20 if (ftrace_create_function_files(tr, d_tracer)) MEM_FAIL(1, "Could not allocate function filter files"); --=20 2.51.0