| 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: <YumRXcxc5XIUwlBO@kernel.org>
Date: Tue, 2 Aug 2022 18:04:29 -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>,
Song Liu <songliubraving@...com>,
Blake Jones <blakejones@...gle.com>
Subject: Re: [PATCH v2 1/3] perf lock: Introduce struct lock_contention
Em Tue, Aug 02, 2022 at 12:10:02PM -0700, Namhyung Kim escreveu:
> The lock_contention struct is to carry related fields together and to
> minimize the change when we add new config options.
Thanks, applied. Forgot the cover letter? :-)
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@...nel.org>
> ---
> tools/perf/builtin-lock.c | 23 ++++++++++++++---------
> tools/perf/util/bpf_lock_contention.c | 9 ++++++---
> tools/perf/util/lock-contention.h | 17 +++++++++++------
> 3 files changed, 31 insertions(+), 18 deletions(-)
>
> diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
> index 7897a33fec1b..eef778b7d33d 100644
> --- a/tools/perf/builtin-lock.c
> +++ b/tools/perf/builtin-lock.c
> @@ -1594,7 +1594,10 @@ static int __cmd_contention(int argc, const char **argv)
> .mode = PERF_DATA_MODE_READ,
> .force = force,
> };
> - struct evlist *evlist = NULL;
> + struct lock_contention con = {
> + .target = &target,
> + .result = &lockhash_table[0],
> + };
>
> session = perf_session__new(use_bpf ? NULL : &data, &eops);
> if (IS_ERR(session)) {
> @@ -1620,24 +1623,26 @@ static int __cmd_contention(int argc, const char **argv)
> signal(SIGCHLD, sighandler);
> signal(SIGTERM, sighandler);
>
> - evlist = evlist__new();
> - if (evlist == NULL) {
> + con.machine = &session->machines.host;
> +
> + con.evlist = evlist__new();
> + if (con.evlist == NULL) {
> err = -ENOMEM;
> goto out_delete;
> }
>
> - err = evlist__create_maps(evlist, &target);
> + err = evlist__create_maps(con.evlist, &target);
> if (err < 0)
> goto out_delete;
>
> if (argc) {
> - err = evlist__prepare_workload(evlist, &target,
> + err = evlist__prepare_workload(con.evlist, &target,
> argv, false, NULL);
> if (err < 0)
> goto out_delete;
> }
>
> - if (lock_contention_prepare(evlist, &target) < 0) {
> + if (lock_contention_prepare(&con) < 0) {
> pr_err("lock contention BPF setup failed\n");
> goto out_delete;
> }
> @@ -1672,13 +1677,13 @@ static int __cmd_contention(int argc, const char **argv)
> if (use_bpf) {
> lock_contention_start();
> if (argc)
> - evlist__start_workload(evlist);
> + evlist__start_workload(con.evlist);
>
> /* wait for signal */
> pause();
>
> lock_contention_stop();
> - lock_contention_read(&session->machines.host, &lockhash_table[0]);
> + lock_contention_read(&con);
> } else {
> err = perf_session__process_events(session);
> if (err)
> @@ -1691,7 +1696,7 @@ static int __cmd_contention(int argc, const char **argv)
> print_contention_result();
>
> out_delete:
> - evlist__delete(evlist);
> + evlist__delete(con.evlist);
> lock_contention_finish();
> perf_session__delete(session);
> return err;
> diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lock_contention.c
> index 16b7451b4b09..f5e2b4f19a72 100644
> --- a/tools/perf/util/bpf_lock_contention.c
> +++ b/tools/perf/util/bpf_lock_contention.c
> @@ -27,10 +27,12 @@ struct lock_contention_data {
> u32 flags;
> };
>
> -int lock_contention_prepare(struct evlist *evlist, struct target *target)
> +int lock_contention_prepare(struct lock_contention *con)
> {
> int i, fd;
> int ncpus = 1, ntasks = 1;
> + struct evlist *evlist = con->evlist;
> + struct target *target = con->target;
>
> skel = lock_contention_bpf__open();
> if (!skel) {
> @@ -102,12 +104,13 @@ int lock_contention_stop(void)
> return 0;
> }
>
> -int lock_contention_read(struct machine *machine, struct hlist_head *head)
> +int lock_contention_read(struct lock_contention *con)
> {
> int fd, stack;
> u32 prev_key, key;
> struct lock_contention_data data;
> struct lock_stat *st;
> + struct machine *machine = con->machine;
> u64 stack_trace[CONTENTION_STACK_DEPTH];
>
> fd = bpf_map__fd(skel->maps.lock_stat);
> @@ -163,7 +166,7 @@ int lock_contention_read(struct machine *machine, struct hlist_head *head)
> return -1;
> }
>
> - hlist_add_head(&st->hash_entry, head);
> + hlist_add_head(&st->hash_entry, con->result);
> prev_key = key;
> }
>
> diff --git a/tools/perf/util/lock-contention.h b/tools/perf/util/lock-contention.h
> index 092c84441f9f..a0df5308cca4 100644
> --- a/tools/perf/util/lock-contention.h
> +++ b/tools/perf/util/lock-contention.h
> @@ -107,18 +107,24 @@ struct evlist;
> struct machine;
> struct target;
>
> +struct lock_contention {
> + struct evlist *evlist;
> + struct target *target;
> + struct machine *machine;
> + struct hlist_head *result;
> +};
> +
> #ifdef HAVE_BPF_SKEL
>
> -int lock_contention_prepare(struct evlist *evlist, struct target *target);
> +int lock_contention_prepare(struct lock_contention *con);
> int lock_contention_start(void);
> int lock_contention_stop(void);
> -int lock_contention_read(struct machine *machine, struct hlist_head *head);
> +int lock_contention_read(struct lock_contention *con);
> int lock_contention_finish(void);
>
> #else /* !HAVE_BPF_SKEL */
>
> -static inline int lock_contention_prepare(struct evlist *evlist __maybe_unused,
> - struct target *target __maybe_unused)
> +static inline int lock_contention_prepare(struct lock_contention *con __maybe_unused)
> {
> return 0;
> }
> @@ -127,8 +133,7 @@ static inline int lock_contention_start(void) { return 0; }
> static inline int lock_contention_stop(void) { return 0; }
> static inline int lock_contention_finish(void) { return 0; }
>
> -static inline int lock_contention_read(struct machine *machine __maybe_unused,
> - struct hlist_head *head __maybe_unused)
> +static inline int lock_contention_read(struct lock_contention *con __maybe_unused)
> {
> return 0;
> }
> --
> 2.37.1.455.g008518b4e5-goog
--
- Arnaldo
Powered by blists - more mailing lists