From nobody Thu Oct 2 06:14:37 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 3A5DA2868B; Mon, 22 Sep 2025 12:46:15 +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=1758545176; cv=none; b=BioCW/APO/rUgIep04HwmLAQhWlMCJa5r+XVNFS7wukksZsTX+unrdfQAWAj6bFrEw65YYriF23YHI6Np2rPvnfcIn1tjQk5cMv0zrID7wYrhcxybxMtrGhioifho4gfHhX8cruXYTAKi72nCBeU/f7kn/F+xE4LcKdybFOZtj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758545176; c=relaxed/simple; bh=LukFQ7CjjUfjPaYuiWSc/6j5Xu+maebDKuq4zyPQIEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VFmXQMp7FDABKrjl4NWr6Fw/tGBQTFcPXs3EcTB91Nxin/KwDkbkvUlDgyc5vXa4EsGMet5v7fsStVm6ckCqxU+GlVmkjCkmWb/mA/0lZCpDNOKVWvDZ0gFERHeXWImLhqp8foGH7zpIkJUI0lAi2MLcPi4BxofNCrfBdapWf4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kgsHW0EF; 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="kgsHW0EF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11CF0C4CEF0; Mon, 22 Sep 2025 12:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758545175; bh=LukFQ7CjjUfjPaYuiWSc/6j5Xu+maebDKuq4zyPQIEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kgsHW0EF1yyj72xTYQR7DG7Dh9ssc6d6DA1czbbvpp2Ci07vnPwozJvVh2lcqx5la KB70Htd88LK+hGTf6rTRvAHk6G/JQMeJNA9bXSR1ciQkEoNs0em+Pd4fJAsdRCOX6E mCez1D7yQZyeMMxBfqoB6hE7XCrG+CHSvlBmijx8r/4Mik0tgwKYW55uCkegwWxpfa zqxrcNLogyxj2Vl7rzYPa8Q76rFSYfO2wBzZ8n9iGxb2m2BytiPu0JEF98/IT1a8gM dKEVhGQknM9tD/WIEMhPYL0WJMwA0RAX1Kzf+EIImvxlYM37swa5NArkFGUiS6P4Et V+WiwQFP1Go7A== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH v2 1/2] tracing: Allow tracer to add more than 32 options Date: Mon, 22 Sep 2025 21:46:11 +0900 Message-ID: <175854517136.353182.4018685864707176851.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <175854516202.353182.1216978967046454932.stgit@devnote2> References: <175854516202.353182.1216978967046454932.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Since enum trace_iterator_flags is 32bit, the max number of the option flags is limited to 32 and it is fully used now. To add a new option, we need to expand it. This replaces trace_iterator_flags with just a list of `static const u64` so that we can add another 32 new options. Now all option masks are u64 instead of u32 or unsigned int. Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace.c | 19 +++++---- kernel/trace/trace.h | 81 +++++++++++++++++++--------------= ---- kernel/trace/trace_irqsoff.c | 2 - kernel/trace/trace_sched_wakeup.c | 2 - 4 files changed, 53 insertions(+), 51 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4283ed4e8f59..114098f7b06f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1736,7 +1736,7 @@ unsigned long nsecs_to_usecs(unsigned long nsecs) * of strings in the order that the evals (enum) were defined. */ #undef C -#define C(a, b) b +#define C(a, b) b, =20 /* These must match the bit positions in trace_iterator_flags */ static const char *trace_options[] =3D { @@ -5144,7 +5144,7 @@ static int tracing_trace_options_show(struct seq_file= *m, void *v) trace_opts =3D tr->current_trace->flags->opts; =20 for (i =3D 0; trace_options[i]; i++) { - if (tr->trace_flags & (1 << i)) + if (tr->trace_flags & (1ULL << i)) seq_printf(m, "%s\n", trace_options[i]); else seq_printf(m, "no%s\n", trace_options[i]); @@ -5197,7 +5197,7 @@ static int set_tracer_option(struct trace_array *tr, = char *cmp, int neg) } =20 /* Some tracers require overwrite to stay enabled */ -int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) +int trace_keep_overwrite(struct tracer *tracer, u64 mask, int set) { if (tracer->enabled && (mask & TRACE_ITER_OVERWRITE) && !set) return -1; @@ -5205,7 +5205,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 m= ask, int set) return 0; } =20 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled) +int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled) { if ((mask =3D=3D TRACE_ITER_RECORD_TGID) || (mask =3D=3D TRACE_ITER_RECORD_CMD) || @@ -5307,7 +5307,7 @@ int trace_set_options(struct trace_array *tr, char *o= ption) if (ret < 0) ret =3D set_tracer_option(tr, cmp, neg); else - ret =3D set_tracer_flag(tr, 1 << ret, !neg); + ret =3D set_tracer_flag(tr, 1ULL << ret, !neg); =20 mutex_unlock(&trace_types_lock); mutex_unlock(&event_mutex); @@ -9119,7 +9119,7 @@ trace_options_core_read(struct file *filp, char __use= r *ubuf, size_t cnt, =20 get_tr_index(tr_index, &tr, &index); =20 - if (tr->trace_flags & (1 << index)) + if (tr->trace_flags & (1ULL << index)) buf =3D "1\n"; else buf =3D "0\n"; @@ -9148,7 +9148,7 @@ trace_options_core_write(struct file *filp, const cha= r __user *ubuf, size_t cnt, =20 mutex_lock(&event_mutex); mutex_lock(&trace_types_lock); - ret =3D set_tracer_flag(tr, 1 << index, val); + ret =3D set_tracer_flag(tr, 1ULL << index, val); mutex_unlock(&trace_types_lock); mutex_unlock(&event_mutex); =20 @@ -9312,8 +9312,9 @@ static void create_trace_options_dir(struct trace_arr= ay *tr) =20 for (i =3D 0; trace_options[i]; i++) { if (top_level || - !((1 << i) & TOP_LEVEL_TRACE_FLAGS)) + !((1ULL << i) & TOP_LEVEL_TRACE_FLAGS)) { create_trace_option_core_file(tr, trace_options[i], i); + } } } =20 @@ -9997,7 +9998,7 @@ static int __remove_instance(struct trace_array *tr) /* Disable all the flags that were enabled coming in */ for (i =3D 0; i < TRACE_FLAGS_MAX_SIZE; i++) { if ((1 << i) & ZEROED_TRACE_FLAGS) - set_tracer_flag(tr, 1 << i, 0); + set_tracer_flag(tr, 1ULL << i, 0); } =20 if (printk_trace =3D=3D tr) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 1dbf1d3cf2f1..c2a41c2cafe5 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -216,7 +216,7 @@ struct array_buffer { int cpu; }; =20 -#define TRACE_FLAGS_MAX_SIZE 32 +#define TRACE_FLAGS_MAX_SIZE 64 =20 struct trace_options { struct tracer *tracer; @@ -390,7 +390,7 @@ struct trace_array { int buffer_percent; unsigned int n_err_log_entries; struct tracer *current_trace; - unsigned int trace_flags; + u64 trace_flags; unsigned char trace_flags_index[TRACE_FLAGS_MAX_SIZE]; unsigned int flags; raw_spinlock_t start_lock; @@ -631,7 +631,7 @@ struct tracer { u32 old_flags, u32 bit, int set); /* Return 0 if OK with change, else return non-zero */ int (*flag_changed)(struct trace_array *tr, - u32 mask, int set); + u64 mask, int set); struct tracer *next; struct tracer_flags *flags; int enabled; @@ -1323,22 +1323,22 @@ extern int trace_get_user(struct trace_parser *pars= er, const char __user *ubuf, */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER # define FGRAPH_FLAGS \ - C(DISPLAY_GRAPH, "display-graph"), + C(DISPLAY_GRAPH, "display-graph") #else # define FGRAPH_FLAGS #endif =20 #ifdef CONFIG_BRANCH_TRACER # define BRANCH_FLAGS \ - C(BRANCH, "branch"), + C(BRANCH, "branch") #else # define BRANCH_FLAGS #endif =20 #ifdef CONFIG_FUNCTION_TRACER # define FUNCTION_FLAGS \ - C(FUNCTION, "function-trace"), \ - C(FUNC_FORK, "function-fork"), + C(FUNCTION, "function-trace") \ + C(FUNC_FORK, "function-fork") # define FUNCTION_DEFAULT_FLAGS TRACE_ITER_FUNCTION #else # define FUNCTION_FLAGS @@ -1348,7 +1348,7 @@ extern int trace_get_user(struct trace_parser *parser= , const char __user *ubuf, =20 #ifdef CONFIG_STACKTRACE # define STACK_FLAGS \ - C(STACKTRACE, "stacktrace"), + C(STACKTRACE, "stacktrace") #else # define STACK_FLAGS #endif @@ -1361,33 +1361,33 @@ extern int trace_get_user(struct trace_parser *pars= er, const char __user *ubuf, * trace.c (this macro guarantees it). */ #define TRACE_FLAGS \ - C(PRINT_PARENT, "print-parent"), \ - C(SYM_OFFSET, "sym-offset"), \ - C(SYM_ADDR, "sym-addr"), \ - C(VERBOSE, "verbose"), \ - C(RAW, "raw"), \ - C(HEX, "hex"), \ - C(BIN, "bin"), \ - C(BLOCK, "block"), \ - C(FIELDS, "fields"), \ - C(PRINTK, "trace_printk"), \ - C(ANNOTATE, "annotate"), \ - C(USERSTACKTRACE, "userstacktrace"), \ - C(SYM_USEROBJ, "sym-userobj"), \ - C(PRINTK_MSGONLY, "printk-msg-only"), \ - C(CONTEXT_INFO, "context-info"), /* Print pid/cpu/time */ \ - C(LATENCY_FMT, "latency-format"), \ - C(RECORD_CMD, "record-cmd"), \ - C(RECORD_TGID, "record-tgid"), \ - C(OVERWRITE, "overwrite"), \ - C(STOP_ON_FREE, "disable_on_free"), \ - C(IRQ_INFO, "irq-info"), \ - C(MARKERS, "markers"), \ - C(EVENT_FORK, "event-fork"), \ - C(TRACE_PRINTK, "trace_printk_dest"), \ - C(COPY_MARKER, "copy_trace_marker"),\ - C(PAUSE_ON_TRACE, "pause-on-trace"), \ - C(HASH_PTR, "hash-ptr"), /* Print hashed pointer */ \ + C(PRINT_PARENT, "print-parent") \ + C(SYM_OFFSET, "sym-offset") \ + C(SYM_ADDR, "sym-addr") \ + C(VERBOSE, "verbose") \ + C(RAW, "raw") \ + C(HEX, "hex") \ + C(BIN, "bin") \ + C(BLOCK, "block") \ + C(FIELDS, "fields") \ + C(PRINTK, "trace_printk") \ + C(ANNOTATE, "annotate") \ + C(USERSTACKTRACE, "userstacktrace") \ + C(SYM_USEROBJ, "sym-userobj") \ + C(PRINTK_MSGONLY, "printk-msg-only") \ + C(CONTEXT_INFO, "context-info") /* Print pid/cpu/time */ \ + C(LATENCY_FMT, "latency-format") \ + C(RECORD_CMD, "record-cmd") \ + C(RECORD_TGID, "record-tgid") \ + C(OVERWRITE, "overwrite") \ + C(STOP_ON_FREE, "disable_on_free") \ + C(IRQ_INFO, "irq-info") \ + C(MARKERS, "markers") \ + C(EVENT_FORK, "event-fork") \ + C(TRACE_PRINTK, "trace_printk_dest") \ + C(COPY_MARKER, "copy_trace_marker")\ + C(PAUSE_ON_TRACE, "pause-on-trace") \ + C(HASH_PTR, "hash-ptr") /* Print hashed pointer */ \ FUNCTION_FLAGS \ FGRAPH_FLAGS \ STACK_FLAGS \ @@ -1398,7 +1398,7 @@ extern int trace_get_user(struct trace_parser *parser= , const char __user *ubuf, * that will define the bits for the flag masks. */ #undef C -#define C(a, b) TRACE_ITER_##a##_BIT +#define C(a, b) TRACE_ITER_##a##_BIT, =20 enum trace_iterator_bits { TRACE_FLAGS @@ -1411,9 +1411,10 @@ enum trace_iterator_bits { * use the bits as defined above. */ #undef C -#define C(a, b) TRACE_ITER_##a =3D (1 << TRACE_ITER_##a##_BIT) +#define C(a, b) static const u64 TRACE_ITER_##a =3D (1ULL << TRACE_ITER_##= a##_BIT); =20 -enum trace_iterator_flags { TRACE_FLAGS }; +TRACE_FLAGS +#undef C =20 /* * TRACE_ITER_SYM_MASK masks the options in trace_flags that @@ -2058,8 +2059,8 @@ extern const char *__stop___tracepoint_str[]; =20 void trace_printk_control(bool enabled); void trace_printk_start_comm(void); -int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled= ); +int trace_keep_overwrite(struct tracer *tracer, u64 mask, int set); +int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled); =20 /* Used from boot time tracer */ extern int trace_set_options(struct trace_array *tr, char *option); diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index 5496758b6c76..1a65f9f1075c 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -539,7 +539,7 @@ static inline int irqsoff_function_set(struct trace_arr= ay *tr, u32 mask, int set } #endif /* CONFIG_FUNCTION_TRACER */ =20 -static int irqsoff_flag_changed(struct trace_array *tr, u32 mask, int set) +static int irqsoff_flag_changed(struct trace_array *tr, u64 mask, int set) { struct tracer *tracer =3D tr->current_trace; =20 diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_w= akeup.c index bf1cb80742ae..45865b4f753f 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -328,7 +328,7 @@ __trace_function(struct trace_array *tr, trace_function(tr, ip, parent_ip, trace_ctx, NULL); } =20 -static int wakeup_flag_changed(struct trace_array *tr, u32 mask, int set) +static int wakeup_flag_changed(struct trace_array *tr, u64 mask, int set) { struct tracer *tracer =3D tr->current_trace;