From: Ian Rogers <irogers@google.com>
To: irogers@google.com, acme@kernel.org
Cc: adrian.hunter@intel.com, ajones@ventanamicro.com,
ak@linux.intel.com, alex@ghiti.fr,
alexander.shishkin@linux.intel.com, anup@brainfault.org,
aou@eecs.berkeley.edu, atrajeev@linux.ibm.com,
blakejones@google.com, ctshao@google.com,
dapeng1.mi@linux.intel.com, derek.foreman@collabora.com,
dvyukov@google.com, howardchu95@gmail.com,
hrishikesh123s@gmail.com, james.clark@linaro.org,
jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com,
leo.yan@arm.com, linux-kernel@vger.kernel.org,
linux-perf-users@vger.kernel.org, linux@treblig.org,
mingo@redhat.com, namhyung@kernel.org, nichen@iscas.ac.cn,
palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org,
ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn,
thomas.falcon@intel.com, tianyou.li@intel.com,
yujie.liu@intel.com, zhouquan@iscas.ac.cn
Subject: [PATCH v13 04/32] perf trace: Don't pass evsel with sample
Date: Tue, 12 May 2026 15:29:33 -0700 [thread overview]
Message-ID: <20260512223001.2952848-5-irogers@google.com> (raw)
In-Reply-To: <20260512223001.2952848-1-irogers@google.com>
The sample now contains the evsel and so don't unnecessarily pass the
evsel.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-trace.c | 55 +++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index f05782f03d6c..7f40cc81fd21 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -535,12 +535,12 @@ static struct evsel *perf_evsel__raw_syscall_newtp(const char *direction, void *
return NULL;
}
-#define perf_evsel__sc_tp_uint(evsel, name, sample) \
- ({ struct syscall_tp *fields = __evsel__syscall_tp(evsel); \
+#define perf_evsel__sc_tp_uint(name, sample) \
+ ({ struct syscall_tp *fields = __evsel__syscall_tp(sample->evsel); \
fields->name.integer(&fields->name, sample); })
-#define perf_evsel__sc_tp_ptr(evsel, name, sample) \
- ({ struct syscall_tp *fields = __evsel__syscall_tp(evsel); \
+#define perf_evsel__sc_tp_ptr(name, sample) \
+ ({ struct syscall_tp *fields = __evsel__syscall_tp(sample->evsel); \
fields->name.pointer(&fields->name, sample); })
size_t strarray__scnprintf_suffix(struct strarray *sa, char *bf, size_t size, const char *intfmt, bool show_suffix, int val)
@@ -2721,8 +2721,8 @@ static int trace__printf_interrupted_entry(struct trace *trace)
return printed;
}
-static int trace__fprintf_sample(struct trace *trace, struct evsel *evsel,
- struct perf_sample *sample, struct thread *thread)
+static int trace__fprintf_sample(struct trace *trace, struct perf_sample *sample,
+ struct thread *thread)
{
int printed = 0;
@@ -2730,7 +2730,7 @@ static int trace__fprintf_sample(struct trace *trace, struct evsel *evsel,
double ts = (double)sample->time / NSEC_PER_MSEC;
printed += fprintf(trace->output, "%22s %10.3f %s %d/%d [%d]\n",
- evsel__name(evsel), ts,
+ evsel__name(sample->evsel), ts,
thread__comm_str(thread),
sample->pid, sample->tid, sample->cpu);
}
@@ -2785,7 +2785,7 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
void *args;
int printed = 0;
struct thread *thread;
- int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1;
+ int id = perf_evsel__sc_tp_uint(id, sample), err = -1;
int augmented_args_size = 0, e_machine;
void *augmented_args = NULL;
struct syscall *sc;
@@ -2800,9 +2800,9 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
if (ttrace == NULL)
goto out_put;
- trace__fprintf_sample(trace, evsel, sample, thread);
+ trace__fprintf_sample(trace, sample, thread);
- args = perf_evsel__sc_tp_ptr(evsel, args, sample);
+ args = perf_evsel__sc_tp_ptr(args, sample);
if (ttrace->entry_str == NULL) {
ttrace->entry_str = malloc(trace__entry_str_size);
@@ -2857,12 +2857,11 @@ static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
return err;
}
-static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
- struct perf_sample *sample)
+static int trace__fprintf_sys_enter(struct trace *trace, struct perf_sample *sample)
{
struct thread_trace *ttrace;
struct thread *thread;
- int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1;
+ int id = perf_evsel__sc_tp_uint(id, sample), err = -1;
struct syscall *sc;
char msg[1024];
void *args, *augmented_args = NULL;
@@ -2872,7 +2871,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
e_machine = thread__e_machine(thread, trace->host, /*e_flags=*/NULL);
- sc = trace__syscall_info(trace, evsel, e_machine, id);
+ sc = trace__syscall_info(trace, sample->evsel, e_machine, id);
if (sc == NULL)
goto out_put;
ttrace = thread__trace(thread, trace);
@@ -2883,7 +2882,7 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
if (ttrace == NULL)
goto out_put;
- args = perf_evsel__sc_tp_ptr(evsel, args, sample);
+ args = perf_evsel__sc_tp_ptr(args, sample);
augmented_args = syscall__augmented_args(sc, sample, &augmented_args_size, trace->raw_augmented_syscalls_args_size);
printed += syscall__scnprintf_args(sc, msg, sizeof(msg), args, augmented_args, augmented_args_size, trace, thread);
fprintf(trace->output, "%.*s", (int)printed, msg);
@@ -2893,10 +2892,11 @@ static int trace__fprintf_sys_enter(struct trace *trace, struct evsel *evsel,
return err;
}
-static int trace__resolve_callchain(struct trace *trace, struct evsel *evsel,
+static int trace__resolve_callchain(struct trace *trace,
struct perf_sample *sample,
struct callchain_cursor *cursor)
{
+ struct evsel *evsel = sample->evsel;
struct addr_location al;
int max_stack = evsel->core.attr.sample_max_stack ?
evsel->core.attr.sample_max_stack :
@@ -2931,7 +2931,7 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
u64 duration = 0;
bool duration_calculated = false;
struct thread *thread;
- int id = perf_evsel__sc_tp_uint(evsel, id, sample), err = -1, callchain_ret = 0, printed = 0;
+ int id = perf_evsel__sc_tp_uint(id, sample), err = -1, callchain_ret = 0, printed = 0;
int alignment = trace->args_alignment, e_machine;
struct syscall *sc;
struct thread_trace *ttrace;
@@ -2945,9 +2945,9 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
if (ttrace == NULL)
goto out_put;
- trace__fprintf_sample(trace, evsel, sample, thread);
+ trace__fprintf_sample(trace, sample, thread);
- ret = perf_evsel__sc_tp_uint(evsel, ret, sample);
+ ret = perf_evsel__sc_tp_uint(ret, sample);
if (trace->summary)
thread__update_stats(thread, ttrace, id, sample, ret, trace);
@@ -2969,7 +2969,7 @@ static int trace__sys_exit(struct trace *trace, struct evsel *evsel,
if (sample->callchain) {
struct callchain_cursor *cursor = get_tls_callchain_cursor();
- callchain_ret = trace__resolve_callchain(trace, evsel, sample, cursor);
+ callchain_ret = trace__resolve_callchain(trace, sample, cursor);
if (callchain_ret == 0) {
if (cursor->nr < trace->min_stack)
goto out;
@@ -3184,9 +3184,10 @@ static void bpf_output__fprintf(struct trace *trace,
++trace->nr_events_printed;
}
-static size_t trace__fprintf_tp_fields(struct trace *trace, struct evsel *evsel, struct perf_sample *sample,
+static size_t trace__fprintf_tp_fields(struct trace *trace, struct perf_sample *sample,
struct thread *thread, void *augmented_args, int augmented_args_size)
{
+ struct evsel *evsel = sample->evsel;
char bf[2048];
size_t size = sizeof(bf);
const struct tep_event *tp_format = evsel__tp_format(evsel);
@@ -3269,7 +3270,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
if (sample->callchain) {
struct callchain_cursor *cursor = get_tls_callchain_cursor();
- callchain_ret = trace__resolve_callchain(trace, evsel, sample, cursor);
+ callchain_ret = trace__resolve_callchain(trace, sample, cursor);
if (callchain_ret == 0) {
if (cursor->nr < trace->min_stack)
goto out;
@@ -3287,7 +3288,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
trace__fprintf_comm_tid(trace, thread, trace->output);
if (evsel == trace->syscalls.events.bpf_output) {
- int id = perf_evsel__sc_tp_uint(evsel, id, sample);
+ int id = perf_evsel__sc_tp_uint(id, sample);
int e_machine = thread
? thread__e_machine(thread, trace->host, /*e_flags=*/NULL)
: EM_HOST;
@@ -3295,7 +3296,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
if (sc) {
fprintf(trace->output, "%s(", sc->name);
- trace__fprintf_sys_enter(trace, evsel, sample);
+ trace__fprintf_sys_enter(trace, sample);
fputc(')', trace->output);
goto newline;
}
@@ -3315,13 +3316,13 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
const struct tep_event *tp_format = evsel__tp_format(evsel);
if (tp_format && (strncmp(tp_format->name, "sys_enter_", 10) ||
- trace__fprintf_sys_enter(trace, evsel, sample))) {
+ trace__fprintf_sys_enter(trace, sample))) {
if (trace->libtraceevent_print) {
event_format__fprintf(tp_format, sample->cpu,
sample->raw_data, sample->raw_size,
trace->output);
} else {
- trace__fprintf_tp_fields(trace, evsel, sample, thread, NULL, 0);
+ trace__fprintf_tp_fields(trace, sample, thread, NULL, 0);
}
}
}
@@ -3380,7 +3381,7 @@ static int trace__pgfault(struct trace *trace,
if (sample->callchain) {
struct callchain_cursor *cursor = get_tls_callchain_cursor();
- callchain_ret = trace__resolve_callchain(trace, evsel, sample, cursor);
+ callchain_ret = trace__resolve_callchain(trace, sample, cursor);
if (callchain_ret == 0) {
if (cursor->nr < trace->min_stack)
goto out_put;
--
2.54.0.563.g4f69b47b94-goog
next prev parent reply other threads:[~2026-05-12 22:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260413041143.1736055-1-irogers@google.com>
2026-05-12 22:29 ` [PATCH v13 00/32] perf tool: Add evsel to perf_sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 01/32] perf tool: Remove evsel from tool APIs that pass the sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 02/32] perf kvm: Don't pass evsel with sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 03/32] perf evsel: Refactor evsel tracepoint sample accessors perf_sample Ian Rogers
2026-05-12 22:29 ` Ian Rogers [this message]
2026-05-12 22:29 ` [PATCH v13 05/32] perf callchain: Don't pass evsel and sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 06/32] perf lock: Only pass sample to handlers Ian Rogers
2026-05-12 22:29 ` [PATCH v13 07/32] perf hist: Remove evsel parameter from inc samples functions Ian Rogers
2026-05-12 22:29 ` [PATCH v13 08/32] perf db-export: Remove evsel from struct export_sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 09/32] perf hist: Remove evsel from struct hist_entry_iter Ian Rogers
2026-05-12 22:29 ` [PATCH v13 10/32] perf report: Directly use sample->evsel to avoid computing from sample->id Ian Rogers
2026-05-12 22:29 ` [PATCH v13 11/32] perf annotate: Don't pass evsel to add_sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 12/32] perf inject: Don't pass evsel with sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 13/32] perf kmem: " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 14/32] perf kwork: " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 15/32] perf sched: " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 16/32] perf timechart: " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 17/32] perf trace: " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 18/32] perf evlist: Try to avoid computing evsel from sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 19/32] perf script: Don't pass evsel with sample Ian Rogers
2026-05-12 22:29 ` [PATCH v13 20/32] perf s390-sample-raw: Don't pass evsel or its PMU " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 21/32] perf evsel: Don't pass evsel " Ian Rogers
2026-05-12 22:29 ` [PATCH v13 22/32] perf lock: Constify trace_lock_handler variables Ian Rogers
2026-05-12 22:29 ` [PATCH v13 23/32] perf lock: Avoid segv if event is missing a callchain Ian Rogers
2026-05-12 22:29 ` [PATCH v13 24/32] perf timechart: Fix memory leaks Ian Rogers
2026-05-12 22:29 ` [PATCH v13 25/32] perf kmem: Fix memory leaks on error path and when skipping Ian Rogers
2026-05-12 22:29 ` [PATCH v13 26/32] perf synthetic-events: Bound check when synthesizing mmap2 and build_id events Ian Rogers
2026-05-12 22:29 ` [PATCH v13 27/32] perf kmem: Add bounds checks to tracepoint read values Ian Rogers
2026-05-12 22:29 ` [PATCH v13 28/32] perf sched: Bounds check CPU in sched switch events Ian Rogers
2026-05-12 22:29 ` [PATCH v13 29/32] perf timechart: Bounds check CPU Ian Rogers
2026-05-12 22:29 ` [PATCH v13 30/32] perf evsel: Add bounds checking to trace point raw data accessors Ian Rogers
2026-05-12 22:30 ` [PATCH v13 31/32] perf kwork: Fix address sanitizer issues Ian Rogers
2026-05-12 22:30 ` [PATCH v13 32/32] perf kwork: Fix memory management of kwork_work Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260512223001.2952848-5-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ajones@ventanamicro.com \
--cc=ak@linux.intel.com \
--cc=alex@ghiti.fr \
--cc=alexander.shishkin@linux.intel.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=atrajeev@linux.ibm.com \
--cc=blakejones@google.com \
--cc=ctshao@google.com \
--cc=dapeng1.mi@linux.intel.com \
--cc=derek.foreman@collabora.com \
--cc=dvyukov@google.com \
--cc=howardchu95@gmail.com \
--cc=hrishikesh123s@gmail.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=krzysztof.m.lopatowski@gmail.com \
--cc=leo.yan@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux@treblig.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=nichen@iscas.ac.cn \
--cc=palmer@dabbelt.com \
--cc=peterz@infradead.org \
--cc=pjw@kernel.org \
--cc=ravi.bangoria@amd.com \
--cc=swapnil.sapkal@amd.com \
--cc=tanze@kylinos.cn \
--cc=thomas.falcon@intel.com \
--cc=tianyou.li@intel.com \
--cc=yujie.liu@intel.com \
--cc=zhouquan@iscas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox