| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <175854517136.353182.4018685864707176851.stgit@devnote2>
Date: Mon, 22 Sep 2025 21:46:11 +0900
From: "Masami Hiramatsu (Google)" <mhiramat@...nel.org>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: Masami Hiramatsu <mhiramat@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
linux-kernel@...r.kernel.org,
linux-trace-kernel@...r.kernel.org
Subject: [PATCH v2 1/2] tracing: Allow tracer to add more than 32 options
From: Masami Hiramatsu (Google) <mhiramat@...nel.org>
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) <mhiramat@...nel.org>
---
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,
/* These must match the bit positions in trace_iterator_flags */
static const char *trace_options[] = {
@@ -5144,7 +5144,7 @@ static int tracing_trace_options_show(struct seq_file *m, void *v)
trace_opts = tr->current_trace->flags->opts;
for (i = 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)
}
/* 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 mask, int set)
return 0;
}
-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 == TRACE_ITER_RECORD_TGID) ||
(mask == TRACE_ITER_RECORD_CMD) ||
@@ -5307,7 +5307,7 @@ int trace_set_options(struct trace_array *tr, char *option)
if (ret < 0)
ret = set_tracer_option(tr, cmp, neg);
else
- ret = set_tracer_flag(tr, 1 << ret, !neg);
+ ret = set_tracer_flag(tr, 1ULL << ret, !neg);
mutex_unlock(&trace_types_lock);
mutex_unlock(&event_mutex);
@@ -9119,7 +9119,7 @@ trace_options_core_read(struct file *filp, char __user *ubuf, size_t cnt,
get_tr_index(tr_index, &tr, &index);
- if (tr->trace_flags & (1 << index))
+ if (tr->trace_flags & (1ULL << index))
buf = "1\n";
else
buf = "0\n";
@@ -9148,7 +9148,7 @@ trace_options_core_write(struct file *filp, const char __user *ubuf, size_t cnt,
mutex_lock(&event_mutex);
mutex_lock(&trace_types_lock);
- ret = set_tracer_flag(tr, 1 << index, val);
+ ret = set_tracer_flag(tr, 1ULL << index, val);
mutex_unlock(&trace_types_lock);
mutex_unlock(&event_mutex);
@@ -9312,8 +9312,9 @@ static void create_trace_options_dir(struct trace_array *tr)
for (i = 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);
+ }
}
}
@@ -9997,7 +9998,7 @@ static int __remove_instance(struct trace_array *tr)
/* Disable all the flags that were enabled coming in */
for (i = 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);
}
if (printk_trace == 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;
};
-#define TRACE_FLAGS_MAX_SIZE 32
+#define TRACE_FLAGS_MAX_SIZE 64
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 *parser, 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
#ifdef CONFIG_BRANCH_TRACER
# define BRANCH_FLAGS \
- C(BRANCH, "branch"),
+ C(BRANCH, "branch")
#else
# define BRANCH_FLAGS
#endif
#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,
#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 *parser, 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,
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 = (1 << TRACE_ITER_##a##_BIT)
+#define C(a, b) static const u64 TRACE_ITER_##a = (1ULL << TRACE_ITER_##a##_BIT);
-enum trace_iterator_flags { TRACE_FLAGS };
+TRACE_FLAGS
+#undef C
/*
* TRACE_ITER_SYM_MASK masks the options in trace_flags that
@@ -2058,8 +2059,8 @@ extern const char *__stop___tracepoint_str[];
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);
/* 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_array *tr, u32 mask, int set
}
#endif /* CONFIG_FUNCTION_TRACER */
-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 = tr->current_trace;
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.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);
}
-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 = tr->current_trace;
Powered by blists - more mailing lists