From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andi Kleen <andi@firstfloor.org>,
Alexey Budankov <alexey.budankov@linux.intel.com>
Subject: Re: [PATCH 29/48] perf callchain: Maintain libunwind's address space in map_groups
Date: Fri, 14 Sep 2018 15:15:47 -0300 [thread overview]
Message-ID: <20180914181547.GB25154@kernel.org> (raw)
In-Reply-To: <20180913125450.21342-30-jolsa@kernel.org>
Em Thu, Sep 13, 2018 at 02:54:31PM +0200, Jiri Olsa escreveu:
> Currently the address_space was kept in thread struct but it's more
> appropriate to keep it in map_groups as it's maintained throughout
> exec's with timestamps. Also we should not flush the address space
> after exec since it still can be accessed when used with an indexed
> data file.
>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Link: http://lkml.kernel.org/n/tip-hjryh6x2yfnrz8g0djhez24z@git.kernel.org
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/map.h | 5 ++++-
> tools/perf/util/thread.h | 1 -
> tools/perf/util/unwind-libunwind-local.c | 28 ++++++++++++++----------
> tools/perf/util/unwind-libunwind.c | 9 ++++----
> tools/perf/util/unwind.h | 7 +++---
> 5 files changed, 29 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
> index 02c6f6962eb1..b1efe57b8563 100644
> --- a/tools/perf/util/map.h
> +++ b/tools/perf/util/map.h
> @@ -65,10 +65,13 @@ struct maps {
>
> struct map_groups {
> struct maps maps;
> - struct machine *machine;
> + struct machine *machine;
> refcount_t refcnt;
> u64 timestamp;
> struct list_head list;
Hey, avoid these distractions, this doesn't change anything and besides
having the * aligned with the names of non-pointers is what is common
practice, see for instance 'struct task_struct', 'struct inode', to name
just two widely used structs in the kernel source :-)
I'll get these two fixed up, i.e. remove the above hunk, align the one
below :-)
- Arnaldo
> +#ifdef HAVE_LIBUNWIND_SUPPORT
> + void *addr_space;
> +#endif
> };
>
> struct map_groups *map_groups__new(struct machine *machine);
> diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
> index 86186a0773a0..637775f622b3 100644
> --- a/tools/perf/util/thread.h
> +++ b/tools/perf/util/thread.h
> @@ -40,7 +40,6 @@ struct thread {
> struct thread_stack *ts;
> struct nsinfo *nsinfo;
> #ifdef HAVE_LIBUNWIND_SUPPORT
> - void *addr_space;
> struct unwind_libunwind_ops *unwind_libunwind_ops;
> #endif
> };
> diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c
> index da6f39315b47..f7c921f87bcf 100644
> --- a/tools/perf/util/unwind-libunwind-local.c
> +++ b/tools/perf/util/unwind-libunwind-local.c
> @@ -617,32 +617,35 @@ static unw_accessors_t accessors = {
> .get_proc_name = get_proc_name,
> };
>
> -static int _unwind__prepare_access(struct thread *thread)
> +static int _unwind__prepare_access(struct map_groups *mg)
> {
> if (!dwarf_callchain_users)
> return 0;
> - thread->addr_space = unw_create_addr_space(&accessors, 0);
> - if (!thread->addr_space) {
> +
> + mg->addr_space = unw_create_addr_space(&accessors, 0);
> + if (!mg->addr_space) {
> pr_err("unwind: Can't create unwind address space.\n");
> return -ENOMEM;
> }
>
> - unw_set_caching_policy(thread->addr_space, UNW_CACHE_GLOBAL);
> + unw_set_caching_policy(mg->addr_space, UNW_CACHE_GLOBAL);
> return 0;
> }
>
> -static void _unwind__flush_access(struct thread *thread)
> +static void _unwind__flush_access(struct map_groups *mg)
> {
> if (!dwarf_callchain_users)
> return;
> - unw_flush_cache(thread->addr_space, 0, 0);
> +
> + unw_flush_cache(mg->addr_space, 0, 0);
> }
>
> -static void _unwind__finish_access(struct thread *thread)
> +static void _unwind__finish_access(struct map_groups *mg)
> {
> if (!dwarf_callchain_users)
> return;
> - unw_destroy_addr_space(thread->addr_space);
> +
> + unw_destroy_addr_space(mg->addr_space);
> }
>
> static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
> @@ -650,7 +653,6 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
> {
> u64 val;
> unw_word_t ips[max_stack];
> - unw_addr_space_t addr_space;
> unw_cursor_t c;
> int ret, i = 0;
>
> @@ -666,13 +668,15 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
> * unwind itself.
> */
> if (max_stack - 1 > 0) {
> + struct map_groups *mg;
> +
> WARN_ONCE(!ui->thread, "WARNING: ui->thread is NULL");
> - addr_space = ui->thread->addr_space;
>
> - if (addr_space == NULL)
> + mg = thread__get_map_groups(ui->thread, ui->sample->time);
> + if (mg == NULL || mg->addr_space == NULL)
> return -1;
>
> - ret = unw_init_remote(&c, addr_space, ui);
> + ret = unw_init_remote(&c, mg->addr_space, ui);
> if (ret)
> display_error(ret);
>
> diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
> index b029a5e9ae49..ce8408e460f2 100644
> --- a/tools/perf/util/unwind-libunwind.c
> +++ b/tools/perf/util/unwind-libunwind.c
> @@ -18,12 +18,13 @@ static void unwind__register_ops(struct thread *thread,
> int unwind__prepare_access(struct thread *thread, struct map *map,
> bool *initialized)
> {
> + struct map_groups *mg = thread->mg;
> const char *arch;
> enum dso_type dso_type;
> struct unwind_libunwind_ops *ops = local_unwind_libunwind_ops;
> int err;
>
> - if (thread->addr_space) {
> + if (mg->addr_space) {
> pr_debug("unwind: thread map already set, dso=%s\n",
> map->dso->name);
> if (initialized)
> @@ -56,7 +57,7 @@ int unwind__prepare_access(struct thread *thread, struct map *map,
> out_register:
> unwind__register_ops(thread, ops);
>
> - err = thread->unwind_libunwind_ops->prepare_access(thread);
> + err = thread->unwind_libunwind_ops->prepare_access(thread->mg);
> if (initialized)
> *initialized = err ? false : true;
> return err;
> @@ -65,13 +66,13 @@ int unwind__prepare_access(struct thread *thread, struct map *map,
> void unwind__flush_access(struct thread *thread)
> {
> if (thread->unwind_libunwind_ops)
> - thread->unwind_libunwind_ops->flush_access(thread);
> + thread->unwind_libunwind_ops->flush_access(thread->mg);
> }
>
> void unwind__finish_access(struct thread *thread)
> {
> if (thread->unwind_libunwind_ops)
> - thread->unwind_libunwind_ops->finish_access(thread);
> + thread->unwind_libunwind_ops->finish_access(thread->mg);
> }
>
> int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
> diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
> index 8a44a1569a21..0f18a0858904 100644
> --- a/tools/perf/util/unwind.h
> +++ b/tools/perf/util/unwind.h
> @@ -9,6 +9,7 @@ struct map;
> struct perf_sample;
> struct symbol;
> struct thread;
> +struct map_groups;
>
> struct unwind_entry {
> struct map *map;
> @@ -19,9 +20,9 @@ struct unwind_entry {
> typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg);
>
> struct unwind_libunwind_ops {
> - int (*prepare_access)(struct thread *thread);
> - void (*flush_access)(struct thread *thread);
> - void (*finish_access)(struct thread *thread);
> + int (*prepare_access)(struct map_groups *mg);
> + void (*flush_access)(struct map_groups *mg);
> + void (*finish_access)(struct map_groups *mg);
> int (*get_entries)(unwind_entry_cb_t cb, void *arg,
> struct thread *thread,
> struct perf_sample *data, int max_stack);
> --
> 2.17.1
next prev parent reply other threads:[~2018-09-14 18:15 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 12:54 [RFCv2 00/48] perf tools: Add threads to record command Jiri Olsa
2018-09-13 12:54 ` [PATCH 01/48] perf tools: Remove perf_tool from event_op2 Jiri Olsa
2018-09-25 9:31 ` [tip:perf/core] " tip-bot for Jiri Olsa
2018-09-13 12:54 ` [PATCH 02/48] perf tools: Remove perf_tool from event_op3 Jiri Olsa
2018-09-18 20:56 ` Arnaldo Carvalho de Melo
2018-09-23 19:45 ` Jiri Olsa
2018-09-25 9:31 ` [tip:perf/core] " tip-bot for Jiri Olsa
2018-09-13 12:54 ` [PATCH 03/48] perf tools: Pass struct perf_mmap into auxtrace_mmap__read* functions Jiri Olsa
2018-09-25 9:32 ` [tip:perf/core] perf auxtrace: Pass struct perf_mmap into mmap__read* functions tip-bot for Jiri Olsa
2018-09-13 12:54 ` [PATCH 04/48] perf tools: Add struct perf_mmap arg into record__write Jiri Olsa
2018-09-25 9:32 ` [tip:perf/core] perf tools: Add 'struct perf_mmap' arg to record__write() tip-bot for Jiri Olsa
2018-09-13 12:54 ` [PATCH 05/48] perf tools: Use a software dummy event to track task/mmap events Jiri Olsa
2018-09-13 12:54 ` [PATCH 06/48] perf tools: Create separate mmap for dummy tracking event Jiri Olsa
2018-09-13 12:54 ` [PATCH 07/48] perf tools: Extend perf_evlist__mmap_ex() to use track mmap Jiri Olsa
2018-09-13 12:54 ` [PATCH 08/48] perf report: Skip dummy tracking event Jiri Olsa
2018-09-13 12:54 ` [PATCH 09/48] perf tools: Make copyfile_offset global Jiri Olsa
2018-09-18 20:54 ` Arnaldo Carvalho de Melo
2018-09-23 19:44 ` Jiri Olsa
2018-09-25 9:33 ` [tip:perf/core] perf util: Make copyfile_offset() global tip-bot for Jiri Olsa
2018-09-13 12:54 ` [PATCH 10/48] perf tools: Add HEADER_DATA_INDEX feature Jiri Olsa
2018-09-13 12:54 ` [PATCH 11/48] perf tools: Handle indexed data file properly Jiri Olsa
2018-09-13 12:54 ` [PATCH 12/48] perf tools: Add perf_data__create_index function Jiri Olsa
2018-09-13 12:54 ` [PATCH 13/48] perf record: Add --index option for building index table Jiri Olsa
2018-09-13 12:54 ` [PATCH 14/48] perf tools: Introduce thread__comm(_str)_by_time() helpers Jiri Olsa
2018-09-13 12:54 ` [PATCH 15/48] perf tools: Add a test case for thread comm handling Jiri Olsa
2018-09-13 12:54 ` [PATCH 16/48] perf tools: Use thread__comm_by_time() when adding hist entries Jiri Olsa
2018-09-13 12:54 ` [PATCH 17/48] perf tools: Convert dead thread list into rbtree Jiri Olsa
2018-09-13 12:54 ` [PATCH 18/48] perf tools: Introduce machine__find*_thread_by_time() Jiri Olsa
2018-09-13 12:54 ` [PATCH 19/48] perf tools: Add thread::exited flag Jiri Olsa
2018-09-13 12:54 ` [PATCH 20/48] perf tools: Add a test case for timed thread handling Jiri Olsa
2018-09-13 12:54 ` [PATCH 21/48] perf tools: Maintain map groups list in a leader thread Jiri Olsa
2018-09-13 12:54 ` [PATCH 22/48] perf tools: Introduce thread__find_symbol_by_time() and friends Jiri Olsa
2018-09-13 12:54 ` [PATCH 23/48] perf callchain: Use thread__find_addr_location_by_time() " Jiri Olsa
2018-09-13 12:54 ` [PATCH 24/48] perf tools: Add a test case for timed map groups handling Jiri Olsa
2018-09-13 12:54 ` [PATCH 25/48] perf tools: Save timestamp of a map creation Jiri Olsa
2018-09-13 12:54 ` [PATCH 26/48] perf tools: Introduce map_groups__{insert,find}_by_time() Jiri Olsa
2018-09-13 12:54 ` [PATCH 27/48] perf tools: Use map_groups__find_addr_by_time() Jiri Olsa
2018-09-13 12:54 ` [PATCH 28/48] perf tools: Add testcase for managing maps with time Jiri Olsa
2018-09-13 12:54 ` [PATCH 29/48] perf callchain: Maintain libunwind's address space in map_groups Jiri Olsa
2018-09-14 18:15 ` Arnaldo Carvalho de Melo [this message]
2018-09-14 19:00 ` Jiri Olsa
2018-09-13 12:54 ` [PATCH 30/48] perf tools: Rename perf_evlist__munmap_filtered to perf_mmap__put_filtered Jiri Olsa
2018-09-13 12:54 ` [PATCH 31/48] tools lib fd array: Introduce fdarray__add_clone function Jiri Olsa
2018-09-13 12:54 ` [PATCH 32/48] tools lib subcmd: Add OPT_INTEGER_OPTARG|_SET options Jiri Olsa
2018-09-13 12:54 ` [PATCH 33/48] perf tools: Move __perf_session__process_events args into struct Jiri Olsa
2018-09-13 12:54 ` [PATCH 34/48] perf ui progress: Fix index progress display Jiri Olsa
2018-09-13 12:54 ` [PATCH 35/48] perf tools: Add threads debug variable Jiri Olsa
2018-09-13 12:54 ` [PATCH 36/48] perf tools: Add perf_mmap__read_tail function Jiri Olsa
2018-09-13 12:54 ` [PATCH 37/48] perf record: Introduce struct record_thread Jiri Olsa
2018-09-17 11:26 ` Namhyung Kim
2018-09-23 19:31 ` Jiri Olsa
2018-09-13 12:54 ` [PATCH 38/48] perf record: Read record thread's mmaps Jiri Olsa
2018-09-17 11:28 ` Namhyung Kim
2018-09-23 19:35 ` Jiri Olsa
2018-09-13 12:54 ` [PATCH 39/48] perf record: Move waking into struct record Jiri Olsa
2018-09-17 11:31 ` Namhyung Kim
2018-09-23 19:36 ` Jiri Olsa
2018-09-13 12:54 ` [PATCH 40/48] perf record: Move samples into struct record_thread Jiri Olsa
2018-09-13 12:54 ` [PATCH 41/48] perf record: Move bytes_written " Jiri Olsa
2018-09-13 12:54 ` [PATCH 42/48] perf record: Add record_thread start/stop/process functions Jiri Olsa
2018-09-13 12:54 ` [PATCH 43/48] perf record: Wait for all threads being started Jiri Olsa
2018-09-13 12:54 ` [PATCH 44/48] perf record: Add --threads option Jiri Olsa
2018-09-17 11:37 ` Namhyung Kim
2018-09-13 12:54 ` [PATCH 45/48] perf record: Add --thread-stats option support Jiri Olsa
2018-09-13 12:54 ` [PATCH 46/48] perf record: Add maps to --thread-stats output Jiri Olsa
2018-09-13 12:54 ` [PATCH 47/48] perf record: Spread maps for --threads option Jiri Olsa
2018-09-17 11:40 ` Namhyung Kim
2018-09-23 19:44 ` Jiri Olsa
2018-09-24 14:22 ` Arnaldo Carvalho de Melo
2018-09-26 6:23 ` Jiri Olsa
2018-09-27 16:01 ` Jiri Olsa
2018-09-28 6:25 ` Namhyung Kim
2018-09-13 12:54 ` [PATCH 48/48] perf record: Spread maps for --threads=X option Jiri Olsa
2018-09-13 16:10 ` [RFCv2 00/48] perf tools: Add threads to record command Alexey Budankov
2018-09-14 2:29 ` Namhyung Kim
2018-09-14 7:15 ` Alexey Budankov
2018-09-14 8:23 ` Jiri Olsa
2018-09-14 9:40 ` Ingo Molnar
2018-09-14 11:15 ` Peter Zijlstra
2018-09-14 11:47 ` Jiri Olsa
2018-09-14 12:01 ` Peter Zijlstra
2018-09-14 12:13 ` Ingo Molnar
2018-09-14 12:19 ` Jiri Olsa
2018-09-14 12:45 ` Ingo Molnar
2018-09-14 9:33 ` Ingo Molnar
2018-09-14 8:26 ` Jiri Olsa
2018-09-14 8:28 ` Jiri Olsa
2018-09-14 9:37 ` Alexey Budankov
2018-09-21 6:13 ` Alexey Budankov
2018-09-21 12:15 ` Alexey Budankov
2018-09-24 19:23 ` Alexey Budankov
2018-10-02 21:41 ` Jiri Olsa
2018-10-03 7:01 ` Alexey Budankov
2018-09-23 19:30 ` Jiri Olsa
2018-09-24 7:02 ` Alexey Budankov
2018-09-24 13:09 ` Alexey Budankov
2018-09-24 14:29 ` Jiri Olsa
2018-09-24 18:32 ` Alexey Budankov
2018-09-24 19:12 ` Alexey Budankov
2018-10-05 6:14 ` Namhyung Kim
2018-09-14 17:02 ` Andi Kleen
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=20180914181547.GB25154@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=fweisbec@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).