| 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: <20260209174032.4142096-10-irogers@google.com>
Date: Mon, 9 Feb 2026 09:40:16 -0800
From: Ian Rogers <irogers@...gle.com>
To: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>, Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>,
Ian Rogers <irogers@...gle.com>, Adrian Hunter <adrian.hunter@...el.com>,
James Clark <james.clark@...aro.org>, Paul Walmsley <pjw@...nel.org>,
Palmer Dabbelt <palmer@...belt.com>, Albert Ou <aou@...s.berkeley.edu>,
Alexandre Ghiti <alex@...ti.fr>, Leo Yan <leo.yan@....com>, Tianyou Li <tianyou.li@...el.com>,
Athira Rajeev <atrajeev@...ux.ibm.com>, Derek Foreman <derek.foreman@...labora.com>,
Thomas Falcon <thomas.falcon@...el.com>, Howard Chu <howardchu95@...il.com>,
Dmitry Vyukov <dvyukov@...gle.com>, Andi Kleen <ak@...ux.intel.com>, tanze <tanze@...inos.cn>,
Hrishikesh Suresh <hrishikesh123s@...il.com>, Quan Zhou <zhouquan@...as.ac.cn>,
Andrew Jones <ajones@...tanamicro.com>, Anup Patel <anup@...infault.org>,
Dapeng Mi <dapeng1.mi@...ux.intel.com>, "Dr. David Alan Gilbert" <linux@...blig.org>,
"Krzysztof Łopatowski" <krzysztof.m.lopatowski@...il.com>, Chun-Tse Shao <ctshao@...gle.com>,
Ravi Bangoria <ravi.bangoria@....com>, Swapnil Sapkal <swapnil.sapkal@....com>,
Chen Ni <nichen@...as.ac.cn>, Blake Jones <blakejones@...gle.com>,
Yujie Liu <yujie.liu@...el.com>, linux-perf-users@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v1 09/25] perf lock: Only pass sample to handlers
The evsel is within the sample and so only the sample needs to be
passed. Remove the parameter and fix call site.
Signed-off-by: Ian Rogers <irogers@...gle.com>
---
tools/perf/builtin-lock.c | 65 ++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 39 deletions(-)
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index a35e8ea4e2ef..78fb39d06e7c 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -473,28 +473,22 @@ static struct lock_stat *pop_from_result(void)
struct trace_lock_handler {
/* it's used on CONFIG_LOCKDEP */
- int (*acquire_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*acquire_event)(struct perf_sample *sample);
/* it's used on CONFIG_LOCKDEP && CONFIG_LOCK_STAT */
- int (*acquired_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*acquired_event)(struct perf_sample *sample);
/* it's used on CONFIG_LOCKDEP && CONFIG_LOCK_STAT */
- int (*contended_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*contended_event)(struct perf_sample *sample);
/* it's used on CONFIG_LOCKDEP */
- int (*release_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*release_event)(struct perf_sample *sample);
/* it's used when CONFIG_LOCKDEP is off */
- int (*contention_begin_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*contention_begin_event)(struct perf_sample *sample);
/* it's used when CONFIG_LOCKDEP is off */
- int (*contention_end_event)(struct evsel *evsel,
- struct perf_sample *sample);
+ int (*contention_end_event)(struct perf_sample *sample);
};
static struct lock_seq_stat *get_seq(struct thread_stat *ts, u64 addr)
@@ -563,8 +557,7 @@ static int get_key_by_aggr_mode(u64 *key, u64 addr,
return get_key_by_aggr_mode_simple(key, addr, sample->tid);
}
-static int report_lock_acquire_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_acquire_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -638,8 +631,7 @@ static int report_lock_acquire_event(struct evsel *evsel __maybe_unused,
return 0;
}
-static int report_lock_acquired_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_acquired_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -704,8 +696,7 @@ static int report_lock_acquired_event(struct evsel *evsel __maybe_unused,
return 0;
}
-static int report_lock_contended_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_contended_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -762,8 +753,7 @@ static int report_lock_contended_event(struct evsel *evsel __maybe_unused,
return 0;
}
-static int report_lock_release_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_release_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -963,8 +953,7 @@ static u64 *get_callstack(struct perf_sample *sample, int max_stack)
return callstack;
}
-static int report_lock_contention_begin_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_contention_begin_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -1127,8 +1116,7 @@ static int report_lock_contention_begin_event(struct evsel *evsel __maybe_unused
return 0;
}
-static int report_lock_contention_end_event(struct evsel *evsel __maybe_unused,
- struct perf_sample *sample)
+static int report_lock_contention_end_event(struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
@@ -1208,45 +1196,45 @@ static struct trace_lock_handler contention_lock_ops = {
static struct trace_lock_handler *trace_handler;
-static int evsel__process_lock_acquire(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_lock_acquire(struct perf_sample *sample)
{
if (trace_handler->acquire_event)
- return trace_handler->acquire_event(evsel, sample);
+ return trace_handler->acquire_event(sample);
return 0;
}
-static int evsel__process_lock_acquired(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_lock_acquired(struct perf_sample *sample)
{
if (trace_handler->acquired_event)
- return trace_handler->acquired_event(evsel, sample);
+ return trace_handler->acquired_event(sample);
return 0;
}
-static int evsel__process_lock_contended(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_lock_contended(struct perf_sample *sample)
{
if (trace_handler->contended_event)
- return trace_handler->contended_event(evsel, sample);
+ return trace_handler->contended_event(sample);
return 0;
}
-static int evsel__process_lock_release(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_lock_release(struct perf_sample *sample)
{
if (trace_handler->release_event)
- return trace_handler->release_event(evsel, sample);
+ return trace_handler->release_event(sample);
return 0;
}
-static int evsel__process_contention_begin(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_contention_begin(struct perf_sample *sample)
{
if (trace_handler->contention_begin_event)
- return trace_handler->contention_begin_event(evsel, sample);
+ return trace_handler->contention_begin_event(sample);
return 0;
}
-static int evsel__process_contention_end(struct evsel *evsel, struct perf_sample *sample)
+static int evsel__process_contention_end(struct perf_sample *sample)
{
if (trace_handler->contention_end_event)
- return trace_handler->contention_end_event(evsel, sample);
+ return trace_handler->contention_end_event(sample);
return 0;
}
@@ -1424,8 +1412,7 @@ static int process_event_update(const struct perf_tool *tool,
return 0;
}
-typedef int (*tracepoint_handler)(struct evsel *evsel,
- struct perf_sample *sample);
+typedef int (*tracepoint_handler)(struct perf_sample *sample);
static int process_sample_event(const struct perf_tool *tool __maybe_unused,
union perf_event *event,
@@ -1445,7 +1432,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,
if (evsel->handler != NULL) {
tracepoint_handler f = evsel->handler;
- err = f(evsel, sample);
+ err = f(sample);
}
thread__put(thread);
--
2.53.0.239.g8d8fc8a987-goog
Powered by blists - more mailing lists