| 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: <Ytmi4otIpXA+zNSx@kernel.org>
Date: Thu, 21 Jul 2022 16:02:58 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Namhyung Kim <namhyung@...nel.org>
Cc: Jiri Olsa <jolsa@...nel.org>, Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
LKML <linux-kernel@...r.kernel.org>,
Ian Rogers <irogers@...gle.com>,
linux-perf-users@...r.kernel.org, Will Deacon <will@...nel.org>,
Waiman Long <longman@...hat.com>,
Boqun Feng <boqun.feng@...il.com>,
Davidlohr Bueso <dave@...olabs.net>
Subject: Re: [PATCH 3/6] perf lock: Add lock aggregation enum
Em Wed, Jul 20, 2022 at 09:36:41PM -0700, Namhyung Kim escreveu:
> Introduce the aggr_mode variable to prepare the later code change.
> The default is LOCK_AGGR_ADDR which aggregate the result for the lock
> instances. When -t/--threads option is given, it'd be set to
> LOCK_AGGR_TASK. The LOCK_AGGR_CALLER is for the contention analysis
> and it'd aggregate the stat by comparing the callstacks.
builtin-lock.c: In function ‘report_lock_contention_end_event’:
builtin-lock.c:1113:13: error: variable ‘key’ set but not used [-Werror=unused-but-set-variable]
1113 | u64 key;
| ^~~
cc1: all warnings being treated as errors
trying to fix
> Signed-off-by: Namhyung Kim <namhyung@...nel.org>
> ---
> tools/perf/builtin-lock.c | 112 +++++++++++++++++++++++++++++++-------
> 1 file changed, 93 insertions(+), 19 deletions(-)
>
> diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
> index 1de459198b99..551bad905139 100644
> --- a/tools/perf/builtin-lock.c
> +++ b/tools/perf/builtin-lock.c
> @@ -126,6 +126,12 @@ static struct rb_root thread_stats;
> static bool combine_locks;
> static bool show_thread_stats;
>
> +static enum {
> + LOCK_AGGR_ADDR,
> + LOCK_AGGR_TASK,
> + LOCK_AGGR_CALLER,
> +} aggr_mode = LOCK_AGGR_ADDR;
> +
> /*
> * CONTENTION_STACK_DEPTH
> * Number of stack trace entries to find callers
> @@ -622,12 +628,22 @@ static int report_lock_acquire_event(struct evsel *evsel,
> const char *name = evsel__strval(evsel, sample, "name");
> u64 addr = evsel__intval(evsel, sample, "lockdep_addr");
> int flag = evsel__intval(evsel, sample, "flags");
> + u64 key;
>
> - /* abuse ls->addr for tid */
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> - ls = lock_stat_findnew(addr, name, 0);
> + ls = lock_stat_findnew(key, name, 0);
> if (!ls)
> return -ENOMEM;
>
> @@ -695,11 +711,22 @@ static int report_lock_acquired_event(struct evsel *evsel,
> u64 contended_term;
> const char *name = evsel__strval(evsel, sample, "name");
> u64 addr = evsel__intval(evsel, sample, "lockdep_addr");
> + u64 key;
>
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> - ls = lock_stat_findnew(addr, name, 0);
> + ls = lock_stat_findnew(key, name, 0);
> if (!ls)
> return -ENOMEM;
>
> @@ -757,11 +784,22 @@ static int report_lock_contended_event(struct evsel *evsel,
> struct lock_seq_stat *seq;
> const char *name = evsel__strval(evsel, sample, "name");
> u64 addr = evsel__intval(evsel, sample, "lockdep_addr");
> + u64 key;
>
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> - ls = lock_stat_findnew(addr, name, 0);
> + ls = lock_stat_findnew(key, name, 0);
> if (!ls)
> return -ENOMEM;
>
> @@ -812,11 +850,22 @@ static int report_lock_release_event(struct evsel *evsel,
> struct lock_seq_stat *seq;
> const char *name = evsel__strval(evsel, sample, "name");
> u64 addr = evsel__intval(evsel, sample, "lockdep_addr");
> + u64 key;
>
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> - ls = lock_stat_findnew(addr, name, 0);
> + ls = lock_stat_findnew(key, name, 0);
> if (!ls)
> return -ENOMEM;
>
> @@ -980,11 +1029,22 @@ static int report_lock_contention_begin_event(struct evsel *evsel,
> struct thread_stat *ts;
> struct lock_seq_stat *seq;
> u64 addr = evsel__intval(evsel, sample, "lock_addr");
> + u64 key;
>
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> - ls = lock_stat_find(addr);
> + ls = lock_stat_find(key);
> if (!ls) {
> char buf[128];
> const char *caller = buf;
> @@ -993,7 +1053,7 @@ static int report_lock_contention_begin_event(struct evsel *evsel,
> if (lock_contention_caller(evsel, sample, buf, sizeof(buf)) < 0)
> caller = "Unknown";
>
> - ls = lock_stat_findnew(addr, caller, flags);
> + ls = lock_stat_findnew(key, caller, flags);
> if (!ls)
> return -ENOMEM;
> }
> @@ -1050,9 +1110,20 @@ static int report_lock_contention_end_event(struct evsel *evsel,
> struct lock_seq_stat *seq;
> u64 contended_term;
> u64 addr = evsel__intval(evsel, sample, "lock_addr");
> + u64 key;
>
> - if (show_thread_stats)
> - addr = sample->tid;
> + switch (aggr_mode) {
> + case LOCK_AGGR_ADDR:
> + key = addr;
> + break;
> + case LOCK_AGGR_TASK:
> + key = sample->tid;
> + break;
> + case LOCK_AGGR_CALLER:
> + default:
> + pr_err("Invalid aggregation mode: %d\n", aggr_mode);
> + return -EINVAL;
> + }
>
> ls = lock_stat_find(addr);
> if (!ls)
> @@ -1416,6 +1487,9 @@ static int __cmd_report(bool display_info)
> if (select_key())
> goto out_delete;
>
> + if (show_thread_stats)
> + aggr_mode = LOCK_AGGR_TASK;
> +
> err = perf_session__process_events(session);
> if (err)
> goto out_delete;
> --
> 2.37.0.170.g444d1eabd0-goog
--
- Arnaldo
Powered by blists - more mailing lists