Reference count checker and related fixes
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 17/22] perf map: Changes to reference counting
In reply to Ian RogersEm Sat, Feb 12, 2022 at 12:48:45PM -0800, Ian Rogers escreveu:
Quoted 45 lines · Masami Hiramatsu
Quoted 36 lines
Hi Ian,
Quoted 4 lines · On Fri, 11 Feb 2022 02:34:10 -0800 Ian Rogers <[email protected]> wrote:
When a pointer to a map exists do a get, when that pointer is overwritten or freed, put the map. This avoids issues with gets and puts being inconsistently used causing, use after puts, etc. Reference count checking and address sanitizer were used to identify issues.
OK, and please add comments in the code what should be actually done so the others can understand it correctly, since this changes the map object handling model.
Previously;
map__get(map); map_operations(map); map__put(map);Now, we have to use the object returned from
get()ops. This is more likely to the memdup()/free().new = map__get(map); map_operations(new); map__put(new);To update the object in the other object (e.g.
machine__update_kernel_mmap()) The original one must be put because it has the old copy.Previous;
map__get(parent_obj->map); update_operation(parent_obj->map); map__put(parent_obj->map;Quoted 7 lines
Is now;
orig = parent_obj->map; new = map__get(orig); update_operation(new); parent_obj->map = new; map__put(orig);
Quoted 5 lines
Hi Masami,
Thanks as always for the input! This is a top post and so I lack the context for what you are describing. The model should always be get, operation, put, but the map code does not follow this model.
It should.
Quoted 2 lines
I suspect the map code at some point in time didn't have reference counts,
That is right.
Quoted 2 lines
someone added them for one use case and then didn't add gets and puts elsewhere.
That is the case, but then the missing gets and puts are bugs and should be fixed as we find problems or do audits, like you're doing and Masami did once.
Quoted 2 lines
Because a crash is worse than a memory leak extra gets were added, or puts missed, and the code is pretty much spaghetti today.
That is not the kind of pasta I like, indeed :-\
Quoted 15 lines
We now need to be able to pair gets with puts and hence the model that this change introduces.
There are cases where the new code needs to distinguish between a reference that is put and a reference that will be kept alive and say returned, this is fiddly and adds extra state - this seems to be what you're describing. I don't see how having a concept of a token is clearing this matter up. We have one pointer that can't be used after a function has consumed it, we introduce another pointer via a get so that we can keep the value for the sake of future use. In C++ we'd have two smart pointers for this case.
Quoted 2 lines
I think this change also should be documented with some concrete example patterns so that someone can program it correctly. :-)
Quoted 8 lines
So the example change was the cpumap one (i.e. patch set v1). It is a literal patch set and so I'm not sure why it isn't a concrete example. In terms of motivation, the map code is about the worst thing that could try to be fixed and that's why I tackled it. It'd have been much easier to implement the approach in cpumap and ask someone else to do the map case :-) The problem I face is that in introducing the refactors and the approach, perf now crashes because of the technique working.
And those are the things I want to cherry pick, i.e. the fixes, while the mechanism for helping to find the problems gets discussed and polished not to pollute too much the source code.
Quoted 8 lines
That's why I've also had to fix the bugs in map the approach identifies - the code passes most of perf test enabled and with sanitizers. There are more issues. To be specific on one example,
addr_locationreferences a map but lacks any kind of init/exit protocol. The exit should put any map theaddr_locationhas. There are 191 uses ofaddr_locationthat need to be looked at and a proper get/put, init/exit approach introduced. I've fixed the ones that are crashes and show stoppers.
Cool, lets try and land those first.
- Arnaldo
Quoted 516 lines
With this approach enabled we can catch more and avoid human error.
Thanks,
IanQuoted 511 lines
(This is the reason why I asked you to introduce object-token instead
of modifying object pointer itself.)Thank you,
Quoted 500 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/hists_cumulate.c | 14 ++++- tools/perf/tests/hists_filter.c | 14 ++++- tools/perf/tests/hists_link.c | 18 +++++- tools/perf/tests/hists_output.c | 12 +++- tools/perf/tests/mmap-thread-lookup.c | 3 +- tools/perf/util/callchain.c | 9 +-- tools/perf/util/event.c | 8 ++- tools/perf/util/hist.c | 10 ++-- tools/perf/util/machine.c | 80 ++++++++++++++++----------- 9 files changed, 118 insertions(+), 50 deletions(-)tools/perf/tests/hists_cumulate.c +12
-2@@ -112,6 +112,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine) } fake_samples[i].thread = al.thread; +map__put (fake_samples[i].map); fake_samples[i].map = al.map; fake_samples[i].sym = al.sym; }@@ -147,15 +148,23 @@ static void del_hist_entries(struct hists *hists) } } +static void put_fake_samples (void ) +{ +size_t i; + +for (i =0 ; i <ARRAY_SIZE (fake_samples); i++) +map__put (fake_samples[i].map); +} +typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread)) -#define DSO (he) (he->ms.map->dso->short_name) +#define DSO (he) (map__dso(he->ms.map)->short_name)#define SYM (he) (he->ms.sym->name)#define CPU (he) (he->cpu)#define PID (he) (he->thread->tid)#define DEPTH (he) (he->callchain->max_depth) -#define CDSO (cl) (cl->ms.map->dso->short_name) +#define CDSO (cl) (map__dso(cl->ms.map)->short_name)#define CSYM (cl) (cl->ms.sym->name)struct result {@@ -733,6 +742,7 @@ static int test__hists_cumulate(struct test_suite *test __maybe_unused, int subt/* tear down everything */ evlist__delete (evlist);machines__exit (&machines); +put_fake_samples ();return err; }tools/perf/tests/hists_filter.c +12
-2@@ -89,6 +89,7 @@ static int add_hist_entries(struct evlist *evlist, } fake_samples[i].thread = al.thread; +map__put (fake_samples[i].map); fake_samples[i].map = al.map; fake_samples[i].sym = al.sym; }@@ -101,6 +102,14 @@ static int add_hist_entries(struct evlist *evlist,return TEST_FAIL ; } +static void put_fake_samples (void ) +{ +size_t i; + +for (i =0 ; i <ARRAY_SIZE (fake_samples); i++) +map__put (fake_samples[i].map); +} +static int test__hists_filter (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) {int err =TEST_FAIL ;@@ -194,7 +203,7 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subteshists__filter_by_thread (hists);/* now applying dso filter for 'kernel' */ - hists->dso_filter = fake_samples[0 ].map->dso; + hists->dso_filter =map__dso (fake_samples[0 ].map);hists__filter_by_dso (hists);if (verbose >2 ) {@@ -288,7 +297,7 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subtes/* now applying all filters at once. */ hists->thread_filter = fake_samples[1 ].thread; - hists->dso_filter = fake_samples[1 ].map->dso; + hists->dso_filter =map__dso (fake_samples[1 ].map);hists__filter_by_thread (hists);hists__filter_by_dso (hists);@@ -322,6 +331,7 @@ static int test__hists_filter(struct test_suite *test __maybe_unused, int subtesevlist__delete (evlist);reset_output_field ();machines__exit (&machines); +put_fake_samples ();return err; }tools/perf/tests/hists_link.c +17
-1@@ -6,6 +6,7 @@#include "evsel.h" #include "evlist.h" #include "machine.h" +#include "map.h" #include "parse-events.h" #include "hists_common.h" #include "util/mmap.h" @@ -94,6 +95,7 @@ static int add_hist_entries(struct evlist *evlist, struct machine *machine) } fake_common_samples[k].thread = al.thread; +map__put (fake_common_samples[k].map); fake_common_samples[k].map = al.map; fake_common_samples[k].sym = al.sym; }@@ -126,11 +128,24 @@ static int add_hist_entries(struct evlist *evlist, struct machine *machine)return -1 ; } +static void put_fake_samples (void ) +{ +size_t i, j; + +for (i =0 ; i <ARRAY_SIZE (fake_common_samples); i++) +map__put (fake_common_samples[i].map); +for (i =0 ; i <ARRAY_SIZE (fake_samples); i++) { +for (j =0 ; j <ARRAY_SIZE (fake_samples[0 ]); j++) +map__put (fake_samples[i][j].map); + } +} +static int find_sample (struct sample *samples,size_t nr_samples,struct thread *t,struct map *m,struct symbol *s) {while (nr_samples--) { -if (samples->thread == t && samples->map == m && +if (samples->thread == t && + samples->map == m && samples->sym == s)return 1 ; samples++;@@ -336,6 +351,7 @@ static int test__hists_link(struct test_suite *test __maybe_unused, int subtestevlist__delete (evlist);reset_output_field ();machines__exit (&machines); +put_fake_samples ();return err; }tools/perf/tests/hists_output.c +11
-1@@ -78,6 +78,7 @@ static int add_hist_entries(struct hists *hists, struct machine *machine) } fake_samples[i].thread = al.thread; +map__put (fake_samples[i].map); fake_samples[i].map = al.map; fake_samples[i].sym = al.sym; }@@ -113,10 +114,18 @@ static void del_hist_entries(struct hists *hists) } } +static void put_fake_samples (void ) +{ +size_t i; + +for (i =0 ; i <ARRAY_SIZE (fake_samples); i++) +map__put (fake_samples[i].map); +} +typedef int (*test_fn_t )(struct evsel *,struct machine *);#define COMM (he) (thread__comm_str(he->thread)) -#define DSO (he) (he->ms.map->dso->short_name) +#define DSO (he) (map__dso(he->ms.map)->short_name)#define SYM (he) (he->ms.sym->name)#define CPU (he) (he->cpu)#define PID (he) (he->thread->tid)@@ -620,6 +629,7 @@ static int test__hists_output(struct test_suite *test __maybe_unused, int subtes/* tear down everything */ evlist__delete (evlist);machines__exit (&machines); +put_fake_samples ();return err; }tools/perf/tests/mmap-thread-lookup.c +2
-1@@ -202,7 +202,8 @@ static int mmap_events(synth_cb synth)break ; } -pr_debug ("map %p, addr %" PRIx64"\n" , al.map, al.map->start); +pr_debug ("map %p, addr %" PRIx64"\n" , al.map,map__start (al.map)); +map__put (al.map); }machine__delete_threads (machine);tools/perf/util/callchain.c +5
-4@@ -583,7 +583,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor) } call->ip = cursor_node->ip; call->ms = cursor_node->ms; -map__get (call->ms.map); + call->ms.map =map__get (call->ms.map); call->srcline = cursor_node->srcline;if (cursor_node->branch) {@@ -1061,7 +1061,7 @@ int callchain_cursor_append(struct callchain_cursor *cursor, node->ip = ip;map__zput (node->ms.map); node->ms = *ms; -map__get (node->ms.map); + node->ms.map =map__get (node->ms.map); node->branch = branch; node->nr_loop_iter = nr_loop_iter; node->iter_cycles = iter_cycles;@@ -1109,7 +1109,8 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *struct machine *machine =maps__machine (node->ms.maps); al->maps = node->ms.maps; - al->map = node->ms.map; +map__put (al->map); + al->map =map__get (node->ms.map); al->sym = node->ms.sym; al->srcline = node->srcline; al->addr = node->ip;@@ -1530,7 +1531,7 @@ int callchain_node__make_parent_list(struct callchain_node *node) goto out; *new = *chain; new->has_children = false; -map__get (new->ms.map); + new->ms.map =map__get (new->ms.map);list_add_tail (&new->list, &head); } parent = parent->parent;tools/perf/util/event.c +6
-2@@ -484,13 +484,14 @@ size_t perf_event__fprintf_text_poke(union perf_event *event, struct machine *maif (machine) {struct addr_location al; - al.map =maps__find (machine__kernel_maps (machine), tp->addr); + al.map =map__get (maps__find (machine__kernel_maps (machine), tp->addr));if (al.map &&map__load (al.map) >=0 ) { al.addr =map__map_ip (al.map, tp->addr); al.sym =map__find_symbol (al.map, al.addr);if (al.sym) ret +=symbol__fprintf_symname_offs (al.sym, &al, fp); } +map__put (al.map); } ret +=fprintf (fp," old len %u new len %u\n" , tp->old_len, tp->new_len); old = true;@@ -581,6 +582,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr, al->filtered =0 ;if (machine ==NULL ) { +map__put (al->map); al->map =NULL ;return NULL ; }@@ -599,6 +601,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr, al->level ='u' ; }else { al->level ='H' ; +map__put (al->map); al->map =NULL ; if ((cpumode == PERF_RECORD_MISC_GUEST_USER ||@@ -613,7 +616,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,return NULL ; } - al->map =maps__find (maps, al->addr); + al->map =map__get (maps__find (maps, al->addr));if (al->map !=NULL ) {/* * Kernel maps might be changed when loading symbols so loading @@ -768,6 +771,7 @@ int machine__resolve(struct machine *machine, struct addr_location *al,*/ void addr_location__put (struct addr_location *al) { +map__zput (al->map);thread__zput (al->thread); }tools/perf/util/hist.c +5
-5@@ -446,7 +446,7 @@ static int hist_entry__init(struct hist_entry *he,memset (&he->stat,0 ,sizeof (he->stat)); } -map__get (he->ms.map); + he->ms.map =map__get (he->ms.map);if (he->branch_info) {/* @@ -461,13 +461,13 @@ static int hist_entry__init(struct hist_entry *he,memcpy (he->branch_info, template->branch_info,sizeof (*he->branch_info)); -map__get (he->branch_info->from.ms.map); -map__get (he->branch_info->to.ms.map); + he->branch_info->from.ms.map =map__get (he->branch_info->from.ms.map); + he->branch_info->to.ms.map =map__get (he->branch_info->to.ms.map); }if (he->mem_info) { -map__get (he->mem_info->iaddr.ms.map); -map__get (he->mem_info->daddr.ms.map); + he->mem_info->iaddr.ms.map =map__get (he->mem_info->iaddr.ms.map); + he->mem_info->daddr.ms.map =map__get (he->mem_info->daddr.ms.map); }if (hist_entry__has_callchains (he) && symbol_conf.use_callchain)tools/perf/util/machine.c +48
-33@@ -783,33 +783,42 @@ static int machine__process_ksymbol_register(struct machine *machine, {struct symbol *sym;struct map *map =maps__find (machine__kernel_maps (machine), event->ksymbol.addr); +bool put_map = false; +int err =0 ;if (!map) {struct dso *dso =dso__new (event->ksymbol.name); -int err; -if (dso) { - dso->kernel =DSO_SPACE__KERNEL ; - map =map__new2 (0 , dso); -dso__put (dso); +if (!dso) { + err = -ENOMEM ; + goto out; } - -if (!dso || !map) { -return -ENOMEM ; + dso->kernel =DSO_SPACE__KERNEL ; + map =map__new2 (0 , dso); +dso__put (dso); +if (!map) { + err = -ENOMEM ; + goto out; } - +/* +* The inserted map has a get on it, we need to put to release +* the reference count here, but do it after all accesses are +* done. +*/ + put_map = true;if (event->ksymbol.ksym_type ==PERF_RECORD_KSYMBOL_TYPE_OOL ) { - map->dso->binary_type =DSO_BINARY_TYPE__OOL ; - map->dso->data.file_size = event->ksymbol.len; -dso__set_loaded (map->dso); +map__dso (map)->binary_type =DSO_BINARY_TYPE__OOL ; +map__dso (map)->data.file_size = event->ksymbol.len; +dso__set_loaded (map__dso (map)); } map->start = event->ksymbol.addr; - map->end = map->start + event->ksymbol.len; + map->end =map__start (map) + event->ksymbol.len; err =maps__insert (machine__kernel_maps (machine), map); -map__put (map); -if (err) -return err; +if (err) { + err = -ENOMEM ; + goto out; + }dso__set_loaded (dso);@@ -819,13 +828,18 @@ static int machine__process_ksymbol_register(struct machine *machine, } } - sym =symbol__new (map->map_ip (map, map->start), + sym =symbol__new (map__map_ip (map,map__start (map)), event->ksymbol.len,0 ,0 , event->ksymbol.name); -if (!sym) -return -ENOMEM ; -dso__insert_symbol (map->dso, sym); -return 0 ; +if (!sym) { + err = -ENOMEM ; + goto out; + } +dso__insert_symbol (map__dso (map), sym); +out: +if (put_map) +map__put (map); +return err; } static int machine__process_ksymbol_unregister(struct machine *machine,@@ -925,14 +939,11 @@ static struct map *machine__addnew_module_map(struct machine *machine, u64 start goto out; err =maps__insert (machine__kernel_maps (machine), map); - -/* Put the map here because maps__insert already got it */ -map__put (map); -/* If maps__insert failed, return NULL. */ -if (err) +if (err) { +map__put (map); map =NULL ; - + } out:/* put the dso here, corresponding to machine__findnew_module_dso */ dso__put (dso);@@ -1228,6 +1239,7 @@ __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)/* In case of renewal the kernel map, destroy previous one */ machine__destroy_kernel_maps (machine); +map__put (machine->vmlinux_map); machine->vmlinux_map =map__new2 (0 , kernel);if (machine->vmlinux_map ==NULL )return -ENOMEM ;@@ -1513,6 +1525,7 @@ static int machine__create_module(void *arg, const char *name, u64 start, map->end = start + size;dso__kernel_module_get_build_id (map__dso (map), machine->root_dir); +map__put (map);return 0 ; }@@ -1558,16 +1571,18 @@ static void machine__set_kernel_mmap(struct machine *machine,static int machine__update_kernel_mmap (struct machine *machine,u64 start,u64 end) { -struct map *map =machine__kernel_map (machine); +struct map *orig, *updated;int err; -map__get (map); -maps__remove (machine__kernel_maps (machine), map); + orig = machine->vmlinux_map; + updated =map__get (orig); + machine->vmlinux_map = updated;machine__set_kernel_mmap (machine, start, end); +maps__remove (machine__kernel_maps (machine), orig); + err =maps__insert (machine__kernel_maps (machine), updated); +map__put (orig); - err =maps__insert (machine__kernel_maps (machine), map); -map__put (map);return err; }@@ -2246,6 +2261,7 @@ static int add_callchain_ip(struct thread *thread, err =callchain_cursor_append (cursor, ip, &ms, branch, flags, nr_loop_iter, iter_cycles, branch_from, srcline); +map__put (al.map);return err; } --Quoted 2 lines
2.35.1.265.g69c8d7142f-goog
--
Masami Hiramatsu <[email protected]>
Signature · 1 line
- Arnaldo
Ian Rogers
reviewerPATCH v3 18/22 libperf: Add reference count checking macros.
In reply to Ian RogersThe macros serve as a way to debug use of a reference counted struct. The macros add a memory allocated pointer that is interposed between the reference counted original struct at a get and freed by a put. The pointer replaces the original struct, so use of the struct name via APIs remains unchanged.
--- tools/lib/perf/include/internal/rc_check.h | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 tools/lib/perf/include/internal/rc_check.h
tools/lib/perf/include/internal/rc_check.h new file +94 -0
@@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LIBPERF_INTERNAL_RC_CHECK_H +#define __LIBPERF_INTERNAL_RC_CHECK_H + +#include <stdlib.h> +#include <linux/zalloc.h> + +/* +* Shared reference count checking macros. +* +* Reference count checking is an approach to sanitizing the use of reference +* counted structs. It leverages address and leak sanitizers to make sure gets +* are paired with a put. Reference count checking adds a malloc-ed layer of +* indirection on a get, and frees it on a put. A missed put will be reported as +* a memory leak. A double put will be reported as a double free. Accessing +* after a put will cause a use-after-free and/or a segfault. +*/ + +#ifndef REFCNT_CHECKING +/* Replaces "struct foo" so that the pointer may be interposed. */ +#define DECLARE_RC_STRUCT (struct_name) \ + struct struct_name + +/* Declare a reference counted struct variable. */ +#define RC_STRUCT (struct_name) struct struct_name + +/* +* Interpose the indirection. Result will hold the indirection and object is the +* reference counted struct. +*/ +#define ADD_RC_CHK (result, object) (result = object, object) + +/* Strip the indirection layer. */ +#define RC_CHK_ACCESS (object) object + +/* Frees the object and the indirection layer. */ +#define RC_CHK_FREE (object) free(object) + +/* A get operation adding the indirection layer. */ +#define RC_CHK_GET (result, object) ADD_RC_CHK(result, object) + +/* A put operation removing the indirection layer. */ +#define RC_CHK_PUT (object) {} + +#else + +/* Replaces "struct foo" so that the pointer may be interposed. */ +#define DECLARE_RC_STRUCT (struct_name) \ + struct original_##struct_name; \ + struct struct_name { \ + struct original_##struct_name *orig; \ + }; \ + struct original_##struct_name + +/* Declare a reference counted struct variable. */ +#define RC_STRUCT (struct_name) struct original_##struct_name + +/* +* Interpose the indirection. Result will hold the indirection and object is the +* reference counted struct. +*/ +#define ADD_RC_CHK (result, object) \ + ( \ + object ? (result = malloc(sizeof(*result)), \ + result ? (result->orig = object, result) \ + : (result = NULL, NULL)) \ + : (result = NULL, NULL) \ + ) + +/* Strip the indirection layer. */ +#define RC_CHK_ACCESS (object) object->orig + +/* Frees the object and the indirection layer. */ +#define RC_CHK_FREE (object) \ + do { \ + zfree(&object->orig); \ + free(object); \ + } while(0) + +/* A get operation adding the indirection layer. */ +#define RC_CHK_GET (result, object) ADD_RC_CHK(result, (object ? object->orig : NULL)) + +/* A put operation removing the indirection layer. */ +#define RC_CHK_PUT (object) \ + do { \ + if (object) { \ + object->orig = NULL; \ + free(object); \ + } \ + } while(0) + +#endif + +#endif /* __LIBPERF_INTERNAL_RC_CHECK_H */
Signature · 1 line
2.35.1.265.g69c8d7142f-goog
Ian Rogers
reviewerPATCH v3 19/22 perf cpumap: Add reference count checking
In reply to Ian RogersEnabled when REFCNT_CHECKING is defined. The change adds a memory allocated pointer that is interposed between the reference counted cpu map at a get and freed by a put. The pointer replaces the original perf_cpu_map struct, so use of the perf_cpu_map via APIs remains unchanged. Any use of the cpu map without the API requires two versions, handled via the RC_CHK_ACCESS macro.
This change is intended to catch:
- use after put: using a cpumap after you have put it will cause a segv.
- unbalanced puts: two puts for a get will result in a double free that can be captured and reported by tools like address sanitizer, including with the associated stack traces of allocation and frees.
- missing puts: if a put is missing then the get turns into a memory leak that can be reported by leak sanitizer, including the stack trace at the point the get occurs.
--- tools/lib/perf/cpumap.c | 93 +++++++++++++----------- tools/lib/perf/include/internal/cpumap.h | 4 +- tools/perf/tests/cpumap.c | 2 +- tools/perf/util/cpumap.c | 36 +++++---- tools/perf/util/pmu.c | 8 +- 5 files changed, 75 insertions(+), 68 deletions(-)
tools/lib/perf/cpumap.c +50 -43
@@ -10,16 +10,16 @@#include <ctype.h> #include <limits.h> -static struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus) +struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus) { -struct perf_cpu_map *cpus =malloc (sizeof (*cpus) +sizeof (struct perf_cpu ) * nr_cpus); - -if (cpus !=NULL ) { +struct perf_cpu_map *result; +RC_STRUCT (perf_cpu_map) *cpus = +malloc (sizeof (*cpus) +sizeof (struct perf_cpu ) * nr_cpus); +if (ADD_RC_CHK (result, cpus)) { cpus->nr = nr_cpus;refcount_set (&cpus->refcnt,1 ); - } -return cpus; +return result; }struct perf_cpu_map *perf_cpu_map__dummy_new (void )
@@ -27,7 +27,7 @@ struct perf_cpu_map *perf_cpu_map__dummy_new(void)struct perf_cpu_map *cpus =perf_cpu_map__alloc (1 );if (cpus) - cpus->map[0 ].cpu =-1 ; +RC_CHK_ACCESS (cpus)->map[0 ].cpu =-1 ;return cpus; }
@@ -35,23 +35,30 @@ struct perf_cpu_map *perf_cpu_map__dummy_new(void)static void cpu_map__delete (struct perf_cpu_map *map) {if (map) { -WARN_ONCE (refcount_read (&map->refcnt) !=0 , +WARN_ONCE (refcount_read (&RC_CHK_ACCESS (map)->refcnt) !=0 ,"cpu_map refcnt unbalanced\n" ); -free (map); +RC_CHK_FREE (map); } }struct perf_cpu_map *perf_cpu_map__get (struct perf_cpu_map *map) { -if (map) -refcount_inc (&map->refcnt); -return map; +struct perf_cpu_map *result; + +if (RC_CHK_GET (result, map)) +refcount_inc (&RC_CHK_ACCESS (map)->refcnt); + +return result; }void perf_cpu_map__put (struct perf_cpu_map *map) { -if (map &&refcount_dec_and_test (&map->refcnt)) -cpu_map__delete (map); +if (map) { +if (refcount_dec_and_test (&RC_CHK_ACCESS (map)->refcnt)) +cpu_map__delete (map); +else +RC_CHK_PUT (map); + } }static struct perf_cpu_map *cpu_map__default_new (void )
@@ -68,7 +75,7 @@ static struct perf_cpu_map *cpu_map__default_new(void)int i;for (i =0 ; i < nr_cpus; ++i) - cpus->map[i].cpu = i; +RC_CHK_ACCESS (cpus)->map[i].cpu = i; }return cpus;
@@ -94,15 +101,16 @@ static struct perf_cpu_map *cpu_map__trim_new(int nr_cpus, const struct perf_cpuint i, j;if (cpus !=NULL ) { -memcpy (cpus->map, tmp_cpus, payload_size); -qsort (cpus->map, nr_cpus,sizeof (struct perf_cpu ), cmp_cpu); +memcpy (RC_CHK_ACCESS (cpus)->map, tmp_cpus, payload_size); +qsort (RC_CHK_ACCESS (cpus)->map, nr_cpus,sizeof (struct perf_cpu ), cmp_cpu);/* Remove dups */ j =0 ;for (i =0 ; i < nr_cpus; i++) { -if (i ==0 || cpus->map[i].cpu != cpus->map[i -1 ].cpu) - cpus->map[j++].cpu = cpus->map[i].cpu; +if (i ==0 || +RC_CHK_ACCESS (cpus)->map[i].cpu !=RC_CHK_ACCESS (cpus)->map[i -1 ].cpu) +RC_CHK_ACCESS (cpus)->map[j++].cpu =RC_CHK_ACCESS (cpus)->map[i].cpu; } - cpus->nr = j; +RC_CHK_ACCESS (cpus)->nr = j;assert (j <= nr_cpus); }return cpus;
@@ -263,20 +271,20 @@ struct perf_cpu perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx) .cpu = -1 }; -if (cpus && idx < cpus->nr) -return cpus->map[idx]; +if (cpus && idx <RC_CHK_ACCESS (cpus)->nr) +return RC_CHK_ACCESS (cpus)->map[idx];return result; }int perf_cpu_map__nr (const struct perf_cpu_map *cpus) { -return cpus ? cpus->nr :1 ; +return cpus ?RC_CHK_ACCESS (cpus)->nr :1 ; }bool perf_cpu_map__empty (const struct perf_cpu_map *map) { -return map ? map->map[0 ].cpu ==-1 : true; +return map ?RC_CHK_ACCESS (map)->map[0 ].cpu ==-1 : true; }int perf_cpu_map__idx (const struct perf_cpu_map *cpus,struct perf_cpu cpu)
@@ -287,10 +295,10 @@ int perf_cpu_map__idx(const struct perf_cpu_map *cpus, struct perf_cpu cpu)return -1 ; low =0 ; - high = cpus->nr; + high =RC_CHK_ACCESS (cpus)->nr;while (low < high) {int idx = (low + high) /2 ; -struct perf_cpu cpu_at_idx = cpus->map[idx]; +struct perf_cpu cpu_at_idx =RC_CHK_ACCESS (cpus)->map[idx];if (cpu_at_idx.cpu == cpu.cpu)return idx;
@@ -316,7 +324,7 @@ struct perf_cpu perf_cpu_map__max(struct perf_cpu_map *map) };// cpu_map__trim_new() qsort()s it, cpu_map__default_new() sorts it as well. -return map->nr >0 ? map->map[map->nr -1 ] : result; +return RC_CHK_ACCESS (map)->nr >0 ?RC_CHK_ACCESS (map)->map[RC_CHK_ACCESS (map)->nr -1 ] : result; }/*
@@ -337,37 +345,36 @@ struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,if (!orig && !other)return NULL ; -if (!orig) { -perf_cpu_map__get (other); -return other; - } +if (!orig) +return perf_cpu_map__get (other);if (!other)return orig; -if (orig->nr == other->nr && - !memcmp (orig->map, other->map, orig->nr *sizeof (struct perf_cpu ))) +if (RC_CHK_ACCESS (orig)->nr ==RC_CHK_ACCESS (other)->nr && + !memcmp (RC_CHK_ACCESS (orig)->map,RC_CHK_ACCESS (other)->map, +RC_CHK_ACCESS (orig)->nr *sizeof (struct perf_cpu )))return orig; - tmp_len = orig->nr + other->nr; + tmp_len =RC_CHK_ACCESS (orig)->nr +RC_CHK_ACCESS (other)->nr; tmp_cpus =malloc (tmp_len *sizeof (struct perf_cpu ));if (!tmp_cpus)return NULL ;/* Standard merge algorithm from wikipedia */ i = j = k =0 ; -while (i < orig->nr && j < other->nr) { -if (orig->map[i].cpu <= other->map[j].cpu) { -if (orig->map[i].cpu == other->map[j].cpu) +while (i <RC_CHK_ACCESS (orig)->nr && j <RC_CHK_ACCESS (other)->nr) { +if (RC_CHK_ACCESS (orig)->map[i].cpu <=RC_CHK_ACCESS (other)->map[j].cpu) { +if (RC_CHK_ACCESS (orig)->map[i].cpu ==RC_CHK_ACCESS (other)->map[j].cpu) j++; - tmp_cpus[k++] = orig->map[i++]; + tmp_cpus[k++] =RC_CHK_ACCESS (orig)->map[i++]; }else - tmp_cpus[k++] = other->map[j++]; + tmp_cpus[k++] =RC_CHK_ACCESS (other)->map[j++]; } -while (i < orig->nr) - tmp_cpus[k++] = orig->map[i++]; +while (i <RC_CHK_ACCESS (orig)->nr) + tmp_cpus[k++] =RC_CHK_ACCESS (orig)->map[i++]; -while (j < other->nr) - tmp_cpus[k++] = other->map[j++]; +while (j <RC_CHK_ACCESS (other)->nr) + tmp_cpus[k++] =RC_CHK_ACCESS (other)->map[j++];assert (k <= tmp_len); merged =cpu_map__trim_new (k, tmp_cpus);
tools/lib/perf/include/internal/cpumap.h +3 -1
@@ -3,6 +3,7 @@#define __LIBPERF_INTERNAL_CPUMAP_H#include <linux/refcount.h> +#include <internal/rc_check.h> /** A wrapper around a CPU to avoid confusion with the perf_cpu_map's map's indices. */ struct perf_cpu {
@@ -16,7 +17,7 @@ struct perf_cpu {* gaps if CPU numbers were used. For events associated with a pid, rather than * a CPU, a single dummy map with an entry of -1 is used. */ -struct perf_cpu_map { +DECLARE_RC_STRUCT (perf_cpu_map) {refcount_t refcnt;/** Length of the map array. */ int nr;
@@ -28,6 +29,7 @@ struct perf_cpu_map {#define MAX_NR_CPUS 2048#endif +struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus);int perf_cpu_map__idx (const struct perf_cpu_map *cpus,struct perf_cpu cpu);#endif /* __LIBPERF_INTERNAL_CPUMAP_H */
tools/perf/tests/cpumap.c +1 -1
@@ -69,7 +69,7 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,TEST_ASSERT_VAL ("wrong nr" ,perf_cpu_map__nr (map) ==2 );TEST_ASSERT_VAL ("wrong cpu" ,perf_cpu_map__cpu (map,0 ).cpu ==1 );TEST_ASSERT_VAL ("wrong cpu" ,perf_cpu_map__cpu (map,1 ).cpu ==256 ); -TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&map->refcnt) ==1 ); +TEST_ASSERT_VAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (map)->refcnt) ==1 );perf_cpu_map__put (map);return 0 ; }
tools/perf/util/cpumap.c +17 -19
@@ -37,9 +37,9 @@ static struct perf_cpu_map *cpu_map__from_entries(struct cpu_map_entries *cpus)* otherwise it would become 65535. */ if (cpus->cpu[i] == (u16) -1 ) - map->map[i].cpu =-1 ; +RC_CHK_ACCESS (map)->map[i].cpu =-1 ;else - map->map[i].cpu = (int ) cpus->cpu[i]; +RC_CHK_ACCESS (map)->map[i].cpu = (int ) cpus->cpu[i]; } }
@@ -58,7 +58,7 @@ static struct perf_cpu_map *cpu_map__from_mask(struct perf_record_record_cpu_mapint cpu, i =0 ;for_each_set_bit (cpu, mask->mask, nbits) - map->map[i++].cpu = cpu; +RC_CHK_ACCESS (map)->map[i++].cpu = cpu; }return map;
@@ -84,16 +84,13 @@ size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp)struct perf_cpu_map *perf_cpu_map__empty_new (int nr) { -struct perf_cpu_map *cpus =malloc (sizeof (*cpus) +sizeof (int ) * nr); +struct perf_cpu_map *cpus =perf_cpu_map__alloc (nr);if (cpus !=NULL ) {int i; - cpus->nr = nr;for (i =0 ; i < nr; i++) - cpus->map[i].cpu =-1 ; - -refcount_set (&cpus->refcnt,1 ); +RC_CHK_ACCESS (cpus)->map[i].cpu =-1 ; }return cpus;
@@ -163,7 +160,7 @@ struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus, {int idx;struct perf_cpu cpu; -struct cpu_aggr_map *c =cpu_aggr_map__empty_new (cpus->nr); +struct cpu_aggr_map *c =cpu_aggr_map__empty_new (perf_cpu_map__nr (cpus));if (!c)return NULL ;
@@ -187,7 +184,7 @@ struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus, } }/* Trim. */ -if (c->nr != cpus->nr) { +if (c->nr !=perf_cpu_map__nr (cpus)) {struct cpu_aggr_map *trimmed_c =realloc (c,sizeof (struct cpu_aggr_map ) +sizeof (struct aggr_cpu_id ) * c->nr);
@@ -494,31 +491,32 @@ size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size)#define COMMA first ? "" : "," -for (i =0 ; i < map->nr +1 ; i++) { +for (i =0 ; i <perf_cpu_map__nr (map) +1 ; i++) {struct perf_cpu cpu = { .cpu =INT_MAX }; -bool last = i == map->nr; +bool last = i ==perf_cpu_map__nr (map);if (!last) - cpu = map->map[i]; + cpu =perf_cpu_map__cpu (map, i);if (start ==-1 ) { start = i;if (last) { ret +=snprintf (buf + ret, size - ret,"%s%d" ,COMMA , - map->map[i].cpu); +perf_cpu_map__cpu (map, i).cpu); } - }else if (((i - start) != (cpu.cpu - map->map[start].cpu)) || last) { + }else if (((i - start) != (cpu.cpu -perf_cpu_map__cpu (map, start).cpu)) || last) {int end = i -1 ;if (start == end) { ret +=snprintf (buf + ret, size - ret,"%s%d" ,COMMA , - map->map[start].cpu); +perf_cpu_map__cpu (map, start).cpu); }else { ret +=snprintf (buf + ret, size - ret,"%s%d-%d" ,COMMA , - map->map[start].cpu, map->map[end].cpu); +perf_cpu_map__cpu (map, start).cpu, +perf_cpu_map__cpu (map, end).cpu); } first = false; start = i;
@@ -545,7 +543,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size)int i, cpu;char *ptr = buf;unsigned char *bitmap; -struct perf_cpu last_cpu =perf_cpu_map__cpu (map, map->nr -1 ); +struct perf_cpu last_cpu =perf_cpu_map__cpu (map,perf_cpu_map__nr (map) -1 );if (buf ==NULL )return 0 ;
@@ -556,7 +554,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size)return 0 ; } -for (i =0 ; i < map->nr; i++) { +for (i =0 ; i <perf_cpu_map__nr (map); i++) { cpu =perf_cpu_map__cpu (map, i).cpu; bitmap[cpu /8 ] |=1 << (cpu %8 ); }
tools/perf/util/pmu.c +4 -4
@@ -2013,13 +2013,13 @@ int perf_pmu__cpus_match(struct perf_pmu *pmu, struct perf_cpu_map *cpus,perf_cpu_map__for_each_cpu (cpu, i, cpus) {if (!perf_cpu_map__has (pmu_cpus, cpu)) - unmatched_cpus->map[unmatched_nr++] = cpu; +RC_CHK_ACCESS (unmatched_cpus)->map[unmatched_nr++] = cpu;else - matched_cpus->map[matched_nr++] = cpu; +RC_CHK_ACCESS (matched_cpus)->map[matched_nr++] = cpu; } - unmatched_cpus->nr = unmatched_nr; - matched_cpus->nr = matched_nr; +RC_CHK_ACCESS (unmatched_cpus)->nr = unmatched_nr; +RC_CHK_ACCESS (matched_cpus)->nr = matched_nr; *mcpus_ptr = matched_cpus; *ucpus_ptr = unmatched_cpus;return 0 ;
Signature · 1 line
2.35.1.265.g69c8d7142f-goog
Ian Rogers
reviewerPATCH v3 20/22 perf namespaces: Add reference count checking
In reply to Ian RogersAdd reference count checking controlled by REFCNT_CHECKING ifdef. The reference count checking interposes an allocated pointer between the reference counted struct on a get and frees the pointer on a put. Accesses after a put cause faults and use after free, missed puts are caughts as leaks and double puts are double frees.
This checking helped resolve a memory leak and use after free:
https://lore.kernel.org/linux-perf-users/CAP-5=fWZH20L4kv-BwVtGLwR=Em3AOOT+Q4QGivvQuYn5AsPRg@mail.gmail.com/
--- tools/perf/util/namespaces.c | 132 ++++++++++++++++++++--------------- tools/perf/util/namespaces.h | 3 +- 2 files changed, 78 insertions(+), 57 deletions(-)
tools/perf/util/namespaces.c +76 -56
@@ -60,7 +60,7 @@ void namespaces__free(struct namespaces *namespaces)free (namespaces); } -static int nsinfo__get_nspid (struct nsinfo *nsi,const char *path) +static int nsinfo__get_nspid (pid_t *tgid,pid_t *nstgid,bool *in_pidns,const char *path) {FILE *f =NULL ;char *statln =NULL ;
@@ -74,19 +74,18 @@ static int nsinfo__get_nspid(struct nsinfo *nsi, const char *path)while (getline (&statln, &linesz, f) !=-1 ) {/* Use tgid if CONFIG_PID_NS is not defined. */ if (strstr (statln,"Tgid:" ) !=NULL ) { - nsi->tgid = (pid_t )strtol (strrchr (statln,'\t' ), -NULL ,10 ); - nsi->nstgid =nsinfo__tgid (nsi); + *tgid = (pid_t )strtol (strrchr (statln,'\t' ),NULL ,10 ); + *nstgid = *tgid; }if (strstr (statln,"NStgid:" ) !=NULL ) { nspid =strrchr (statln,'\t' ); - nsi->nstgid = (pid_t )strtol (nspid,NULL ,10 ); + *nstgid = (pid_t )strtol (nspid,NULL ,10 );/* * If innermost tgid is not the first, process is in a different * PID namespace. */ - nsi->in_pidns = (statln +sizeof ("NStgid:" ) -1 ) != nspid; + *in_pidns = (statln +sizeof ("NStgid:" ) -1 ) != nspid;break ; } }
@@ -121,8 +120,8 @@ int nsinfo__init(struct nsinfo *nsi)* want to switch as part of looking up dso/map data. */ if (old_stat.st_ino != new_stat.st_ino) { - nsi->need_setns = true; - nsi->mntns_path = newns; +RC_CHK_ACCESS (nsi)->need_setns = true; +RC_CHK_ACCESS (nsi)->mntns_path = newns; newns =NULL ; }
@@ -132,13 +131,26 @@ int nsinfo__init(struct nsinfo *nsi)if (snprintf (spath,PATH_MAX ,"/proc/%d/status" ,nsinfo__pid (nsi)) >=PATH_MAX ) goto out; - rv =nsinfo__get_nspid (nsi, spath); + rv =nsinfo__get_nspid (&RC_CHK_ACCESS (nsi)->tgid, &RC_CHK_ACCESS (nsi)->nstgid, + &RC_CHK_ACCESS (nsi)->in_pidns, spath); out:free (newns);return rv; } +static struct nsinfo *nsinfo__alloc (void ) +{ +struct nsinfo *res; +RC_STRUCT (nsinfo) *nsi; + + nsi =calloc (1 ,sizeof (*nsi)); +if (ADD_RC_CHK (res, nsi)) +refcount_set (&nsi->refcnt,1 ); + +return res; +} +struct nsinfo *nsinfo__new (pid_t pid) {struct nsinfo *nsi;
@@ -146,22 +158,21 @@ struct nsinfo *nsinfo__new(pid_t pid)if (pid ==0 )return NULL ; - nsi =calloc (1 ,sizeof (*nsi)); -if (nsi !=NULL ) { - nsi->pid = pid; - nsi->tgid = pid; - nsi->nstgid = pid; - nsi->need_setns = false; - nsi->in_pidns = false; -/* Init may fail if the process exits while we're trying to look -* at its proc information. In that case, save the pid but -* don't try to enter the namespace. -*/ -if (nsinfo__init (nsi) ==-1 ) - nsi->need_setns = false; + nsi =nsinfo__alloc (); +if (!nsi) +return NULL ; -refcount_set (&nsi->refcnt,1 ); - } +RC_CHK_ACCESS (nsi)->pid = pid; +RC_CHK_ACCESS (nsi)->tgid = pid; +RC_CHK_ACCESS (nsi)->nstgid = pid; +RC_CHK_ACCESS (nsi)->need_setns = false; +RC_CHK_ACCESS (nsi)->in_pidns = false; +/* Init may fail if the process exits while we're trying to look at its +* proc information. In that case, save the pid but don't try to enter +* the namespace. +*/ +if (nsinfo__init (nsi) ==-1 ) +RC_CHK_ACCESS (nsi)->need_setns = false;return nsi; }
@@ -173,21 +184,21 @@ struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)if (nsi ==NULL )return NULL ; - nnsi =calloc (1 ,sizeof (*nnsi)); -if (nnsi !=NULL ) { - nnsi->pid =nsinfo__pid (nsi); - nnsi->tgid =nsinfo__tgid (nsi); - nnsi->nstgid =nsinfo__nstgid (nsi); - nnsi->need_setns =nsinfo__need_setns (nsi); - nnsi->in_pidns =nsinfo__in_pidns (nsi); -if (nsi->mntns_path) { - nnsi->mntns_path =strdup (nsi->mntns_path); -if (!nnsi->mntns_path) { -free (nnsi); -return NULL ; - } + nnsi =nsinfo__alloc (); +if (!nnsi) +return NULL ; + +RC_CHK_ACCESS (nnsi)->pid =nsinfo__pid (nsi); +RC_CHK_ACCESS (nnsi)->tgid =nsinfo__tgid (nsi); +RC_CHK_ACCESS (nnsi)->nstgid =nsinfo__nstgid (nsi); +RC_CHK_ACCESS (nnsi)->need_setns =nsinfo__need_setns (nsi); +RC_CHK_ACCESS (nnsi)->in_pidns =nsinfo__in_pidns (nsi); +if (RC_CHK_ACCESS (nsi)->mntns_path) { +RC_CHK_ACCESS (nnsi)->mntns_path =strdup (RC_CHK_ACCESS (nsi)->mntns_path); +if (!RC_CHK_ACCESS (nnsi)->mntns_path) { +nsinfo__put (nnsi); +return NULL ; } -refcount_set (&nnsi->refcnt,1 ); }return nnsi;
@@ -195,51 +206,60 @@ struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)static void nsinfo__delete (struct nsinfo *nsi) { -zfree (&nsi->mntns_path); -free (nsi); +if (nsi) { +WARN_ONCE (refcount_read (&RC_CHK_ACCESS (nsi)->refcnt) !=0 , +"nsinfo refcnt unbalanced\n" ); +zfree (&RC_CHK_ACCESS (nsi)->mntns_path); +RC_CHK_FREE (nsi); + } }struct nsinfo *nsinfo__get (struct nsinfo *nsi) { -if (nsi) -refcount_inc (&nsi->refcnt); -return nsi; +struct nsinfo *result; + +if (RC_CHK_GET (result, nsi)) +refcount_inc (&RC_CHK_ACCESS (nsi)->refcnt); + +return result; }void nsinfo__put (struct nsinfo *nsi) { -if (nsi &&refcount_dec_and_test (&nsi->refcnt)) +if (nsi &&refcount_dec_and_test (&RC_CHK_ACCESS (nsi)->refcnt))nsinfo__delete (nsi); +else +RC_CHK_PUT (nsi); }bool nsinfo__need_setns (const struct nsinfo *nsi) { -return nsi->need_setns; +return RC_CHK_ACCESS (nsi)->need_setns; }void nsinfo__clear_need_setns (struct nsinfo *nsi) { - nsi->need_setns = false; +RC_CHK_ACCESS (nsi)->need_setns = false; }pid_t nsinfo__tgid (const struct nsinfo *nsi) { -return nsi->tgid; +return RC_CHK_ACCESS (nsi)->tgid; }pid_t nsinfo__nstgid (const struct nsinfo *nsi) { -return nsi->nstgid; +return RC_CHK_ACCESS (nsi)->nstgid; }pid_t nsinfo__pid (const struct nsinfo *nsi) { -return nsi->pid; +return RC_CHK_ACCESS (nsi)->pid; }pid_t nsinfo__in_pidns (const struct nsinfo *nsi) { -return nsi->in_pidns; +return RC_CHK_ACCESS (nsi)->in_pidns; } void nsinfo__mountns_enter(struct nsinfo *nsi,
@@ -256,7 +276,7 @@ void nsinfo__mountns_enter(struct nsinfo *nsi, nc->oldns =-1 ; nc->newns =-1 ; -if (!nsi || !nsi->need_setns) +if (!nsi || !RC_CHK_ACCESS (nsi)->need_setns)return ;if (snprintf (curpath,PATH_MAX ,"/proc/self/ns/mnt" ) >=PATH_MAX )
@@ -270,7 +290,7 @@ void nsinfo__mountns_enter(struct nsinfo *nsi,if (oldns <0 ) goto errout; - newns =open (nsi->mntns_path,O_RDONLY ); + newns =open (RC_CHK_ACCESS (nsi)->mntns_path,O_RDONLY );if (newns <0 ) goto errout;
@@ -339,9 +359,9 @@ int nsinfo__stat(const char *filename, struct stat *st, struct nsinfo *nsi)bool nsinfo__is_in_root_namespace (void ) { -struct nsinfo nsi; +pid_t tgid =0 , nstgid =0 ; +bool in_pidns = false; -memset (&nsi,0x0 ,sizeof (nsi)); -nsinfo__get_nspid (&nsi,"/proc/self/status" ); -return !nsi.in_pidns; +nsinfo__get_nspid (&tgid, &nstgid, &in_pidns,"/proc/self/status" ); +return !in_pidns; }
tools/perf/util/namespaces.h +2 -1
@@ -13,6 +13,7 @@#include <linux/perf_event.h> #include <linux/refcount.h> #include <linux/types.h> +#include <internal/rc_check.h> #ifndef HAVE_SETNS_SUPPORT int setns (int fd,int nstype);
@@ -29,7 +30,7 @@ struct namespaces {struct namespaces *namespaces__new (struct perf_record_namespaces *event);void namespaces__free (struct namespaces *namespaces); -struct nsinfo { +DECLARE_RC_STRUCT (nsinfo) {pid_t pid;pid_t tgid;pid_t nstgid;
Signature · 1 line
2.35.1.265.g69c8d7142f-goog
Ian Rogers
reviewerPATCH v3 21/22 perf maps: Add reference count checking.
In reply to Ian RogersAdd reference count checking to make sure of good use of get and put. Add and use accessors to reduce RC_CHK clutter.
The only significant issue was in tests/thread-maps-share.c where reference counts were released in the reverse order to acquisition, leading to a use after put. This was fixed by reversing the put order.
--- tools/perf/tests/thread-maps-share.c | 29 ++++++------- tools/perf/util/maps.c | 53 +++++++++++++----------- tools/perf/util/maps.h | 17 ++++---- tools/perf/util/symbol.c | 10 ++--- tools/perf/util/unwind-libunwind-local.c | 2 +- tools/perf/util/unwind-libunwind.c | 2 +- 6 files changed, 60 insertions(+), 53 deletions(-)
tools/perf/tests/thread-maps-share.c +15 -14
@@ -43,12 +43,12 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int s leader && t1 && t2 && t3 && other); maps = leader->maps; -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&maps->refcnt),4 ); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (maps)->refcnt),4 );/* test the maps pointer is shared */ -TEST_ASSERT_VAL ("maps don't match" , maps == t1->maps); -TEST_ASSERT_VAL ("maps don't match" , maps == t2->maps); -TEST_ASSERT_VAL ("maps don't match" , maps == t3->maps); +TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_ACCESS (maps) ==RC_CHK_ACCESS (t1->maps)); +TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_ACCESS (maps) ==RC_CHK_ACCESS (t2->maps)); +TEST_ASSERT_VAL ("maps don't match" ,RC_CHK_ACCESS (maps) ==RC_CHK_ACCESS (t3->maps));/* * Verify the other leader was created by previous call.
@@ -71,25 +71,26 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int smachine__remove_thread (machine, other_leader); other_maps = other->maps; -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&other_maps->refcnt),2 ); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (other_maps)->refcnt),2 ); -TEST_ASSERT_VAL ("maps don't match" , other_maps == other_leader->maps); +TEST_ASSERT_VAL ("maps don't match" , +RC_CHK_ACCESS (other_maps) ==RC_CHK_ACCESS (other_leader->maps));/* release thread group */ -thread__put (leader); -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&maps->refcnt),3 ); - -thread__put (t1); -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&maps->refcnt),2 ); +thread__put (t3); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (maps)->refcnt),3 );thread__put (t2); -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&maps->refcnt),1 ); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (maps)->refcnt),2 ); -thread__put (t3); +thread__put (t1); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (maps)->refcnt),1 ); + +thread__put (leader);/* release other group */ thread__put (other_leader); -TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&other_maps->refcnt),1 ); +TEST_ASSERT_EQUAL ("wrong refcnt" ,refcount_read (&RC_CHK_ACCESS (other_maps)->refcnt),1 );thread__put (other);
tools/perf/util/maps.c +29 -24
118 lines not on this page · raw message
tools/perf/util/maps.h +9 -8
@@ -8,6 +8,7 @@#include <stdbool.h> #include <linux/types.h> #include "rwsem.h" +#include <internal/rc_check.h> struct ref_reloc_sym ;struct machine ;
@@ -32,7 +33,7 @@ struct map *maps__find(struct maps *maps, u64 addr);for (map =maps__first (maps), next =map_rb_node__next (map); map; \ map = next, next =map_rb_node__next (map)) -struct maps { +DECLARE_RC_STRUCT(maps) {struct rb_root entries;struct rw_semaphore lock;struct machine *machine;
@@ -65,38 +66,38 @@ void maps__put(struct maps *maps);static inline struct rb_root *maps__entries (struct maps *maps) { -return &maps->entries; +return &RC_CHK_ACCESS (maps)->entries; }static inline struct machine *maps__machine (struct maps *maps) { -return maps->machine; +return RC_CHK_ACCESS (maps)->machine; }static inline struct rw_semaphore *maps__lock (struct maps *maps) { -return &maps->lock; +return &RC_CHK_ACCESS (maps)->lock; }static inline struct map **maps__maps_by_name (struct maps *maps) { -return maps->maps_by_name; +return RC_CHK_ACCESS (maps)->maps_by_name; }static inline unsigned int maps__nr_maps (const struct maps *maps) { -return maps->nr_maps; +return RC_CHK_ACCESS (maps)->nr_maps; }#ifdef HAVE_LIBUNWIND_SUPPORT static inline void *maps__addr_space (struct maps *maps) { -return maps->addr_space; +return RC_CHK_ACCESS (maps)->addr_space; }static inline const struct unwind_libunwind_ops *maps__unwind_libunwind_ops (const struct maps *maps) { -return maps->unwind_libunwind_ops; +return RC_CHK_ACCESS (maps)->unwind_libunwind_ops; }#endif
tools/perf/util/symbol.c +5 -5
@@ -2025,8 +2025,8 @@ static int map__groups__sort_by_name_from_rbtree(struct maps *maps)if (maps_by_name ==NULL )return -1 ; - maps->maps_by_name = maps_by_name; - maps->nr_maps_allocated =maps__nr_maps (maps); +RC_CHK_ACCESS (maps)->maps_by_name = maps_by_name; +RC_CHK_ACCESS (maps)->nr_maps_allocated =maps__nr_maps (maps);maps__for_each_entry (maps, rb_node) maps_by_name[i++] = rb_node->map;
@@ -2057,9 +2057,9 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)down_read (maps__lock (maps)); -if (maps->last_search_by_name && +if (RC_CHK_ACCESS (maps)->last_search_by_name &&strcmp (map__dso (maps->last_search_by_name)->short_name, name) ==0 ) { - map = maps->last_search_by_name; + map =RC_CHK_ACCESS (maps)->last_search_by_name; goto out_unlock; }/*
@@ -2075,7 +2075,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)maps__for_each_entry (maps, rb_node) { map = rb_node->map;if (strcmp (map__dso (map)->short_name, name) ==0 ) { - maps->last_search_by_name = map; +RC_CHK_ACCESS (maps)->last_search_by_name = map; goto out_unlock; } }
tools/perf/util/unwind-libunwind-local.c +1 -1
@@ -620,7 +620,7 @@ static int _unwind__prepare_access(struct maps *maps) {void *addr_space =unw_create_addr_space (&accessors,0 ); - maps->addr_space = addr_space; +RC_CHK_ACCESS (maps)->addr_space = addr_space;if (!addr_space) {pr_err ("unwind: Can't create unwind address space.\n" );return -ENOMEM ;
tools/perf/util/unwind-libunwind.c +1 -1
@@ -14,7 +14,7 @@ struct unwind_libunwind_ops __weak *arm64_unwind_libunwind_ops;static void unwind__register_ops (struct maps *maps,struct unwind_libunwind_ops *ops) { - maps->unwind_libunwind_ops = ops; +RC_CHK_ACCESS (maps)->unwind_libunwind_ops = ops; }int unwind__prepare_access (struct maps *maps,struct map *map,bool *initialized)
Signature · 1 line
2.35.1.265.g69c8d7142f-goog
Ian Rogers
reviewerPATCH v3 22/22 perf map: Add reference count checking
In reply to Ian RogersThere's no strict get/put policy with map that leads to leaks or use after free. Reference count checking identifies correct pairing of gets and puts.
--- tools/perf/arch/s390/annotate/instructions.c | 2 +- tools/perf/builtin-top.c | 4 +- tools/perf/tests/hists_link.c | 2 +- tools/perf/tests/maps.c | 20 +++--- tools/perf/tests/vmlinux-kallsyms.c | 4 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/machine.c | 26 ++++---- tools/perf/util/map.c | 65 +++++++++++--------- tools/perf/util/map.h | 34 +++++----- tools/perf/util/maps.c | 11 ++-- tools/perf/util/symbol-elf.c | 27 ++++---- tools/perf/util/symbol.c | 42 +++++++------ 12 files changed, 127 insertions(+), 114 deletions(-)
tools/perf/arch/s390/annotate/instructions.c +1 -1
@@ -40,7 +40,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,if (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map, - map->map_ip (target.ms.map, target.addr) +RC_CHK_ACCESS (map)->map_ip (target.ms.map, target.addr) ) == ops->target.addr) ops->target.sym = target.ms.sym;
tools/perf/builtin-top.c +2 -2
@@ -190,7 +190,7 @@ static void ui__warn_map_erange(struct map *map, struct symbol *sym, u64 ip)if (use_browser <=0 )sleep (5 ); - map->erange_warned = true; +RC_CHK_ACCESS (map)->erange_warned = true; } static void perf_top__record_precise_ip(struct perf_top *top,
@@ -223,7 +223,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,*/ pthread_mutex_unlock (&he->hists->lock); -if (err == -ERANGE && !he->ms.map->erange_warned) +if (err == -ERANGE && !RC_CHK_ACCESS (he->ms.map)->erange_warned)ui__warn_map_erange (he->ms.map, sym, ip);else if (err == -ENOMEM ) { pr_err("Not enough memory for annotating '%s' symbol!\n",
tools/perf/tests/hists_link.c +1 -1
@@ -145,7 +145,7 @@ static int find_sample(struct sample *samples, size_t nr_samples, {while (nr_samples--) {if (samples->thread == t && - samples->map == m && +RC_CHK_ACCESS (samples->map) ==RC_CHK_ACCESS (m) && samples->sym == s)return 1 ; samples++;
tools/perf/tests/maps.c +10 -10
@@ -30,7 +30,7 @@ static int check_maps(struct map_def *merged, unsigned int size, struct maps *maif (map__start (map) != merged[i].start ||map__end (map) != merged[i].end ||strcmp (map__dso (map)->name, merged[i].name) || -refcount_read (&map->refcnt) !=1 ) { +refcount_read (&RC_CHK_ACCESS (map)->refcnt) !=1 ) { failed = true; } i++;
@@ -50,7 +50,7 @@ static int check_maps(struct map_def *merged, unsigned int size, struct maps *mamap__start (map),map__end (map),map__dso (map)->name, - refcount_read(&map->refcnt)); + refcount_read(&RC_CHK_ACCESS(map)->refcnt)); } }return failed ?TEST_FAIL :TEST_OK ;
@@ -95,8 +95,8 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtest map =dso__new_map (bpf_progs[i].name);TEST_ASSERT_VAL ("failed to create map" , map); - map->start = bpf_progs[i].start; - map->end = bpf_progs[i].end; +RC_CHK_ACCESS (map)->start = bpf_progs[i].start; +RC_CHK_ACCESS (map)->end = bpf_progs[i].end;TEST_ASSERT_VAL ("failed to insert map" ,maps__insert (maps, map) ==0 );map__put (map); }
@@ -111,16 +111,16 @@ static int test__maps__merge_in(struct test_suite *t __maybe_unused, int subtestTEST_ASSERT_VAL ("failed to create map" , map_kcore3);/* kcore1 map overlaps over all bpf maps */ - map_kcore1->start =100 ; - map_kcore1->end =1000 ; +RC_CHK_ACCESS (map_kcore1)->start =100 ; +RC_CHK_ACCESS (map_kcore1)->end =1000 ;/* kcore2 map hides behind bpf_prog_2 */ - map_kcore2->start =550 ; - map_kcore2->end =570 ; +RC_CHK_ACCESS (map_kcore2)->start =550 ; +RC_CHK_ACCESS (map_kcore2)->end =570 ;/* kcore3 map hides behind bpf_prog_3, kcore1 and adds new map */ - map_kcore3->start =880 ; - map_kcore3->end =1100 ; +RC_CHK_ACCESS (map_kcore3)->start =880 ; +RC_CHK_ACCESS (map_kcore3)->end =1100 ; ret =maps__merge_in (maps, map_kcore1);TEST_ASSERT_VAL ("failed to merge map" , !ret);
tools/perf/tests/vmlinux-kallsyms.c +2 -2
@@ -299,7 +299,7 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unused ?map__dso (map)->short_name : map__dso(map)->name);if (pair) { - pair->priv =1 ; +RC_CHK_ACCESS (pair)->priv =1 ; }else {if (!header_printed) {pr_info ("WARN: Maps only in vmlinux:\n" );
@@ -335,7 +335,7 @@ static int test__vmlinux_matches_kallsyms(struct test_suite *test __maybe_unusedmap__start (pair),map__end (pair), map__pgoff(pair));pr_info (" %s\n" ,map__dso (pair)->name); - pair->priv =1 ; +RC_CHK_ACCESS (pair)->priv =1 ; } }
tools/perf/util/annotate.c +2 -2
@@ -281,7 +281,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_sif (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map, - map->map_ip (target.ms.map, target.addr) +RC_CHK_ACCESS (map)->map_ip (target.ms.map, target.addr) ) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -411,7 +411,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s*/ if (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map, - map->map_ip (target.ms.map, target.addr) +RC_CHK_ACCESS (map)->map_ip (target.ms.map, target.addr) ) == ops->target.addr) ops->target.sym = target.ms.sym;
tools/perf/util/machine.c +13 -13
@@ -812,8 +812,8 @@ static int machine__process_ksymbol_register(struct machine *machine,dso__set_loaded (map__dso (map)); } - map->start = event->ksymbol.addr; - map->end =map__start (map) + event->ksymbol.len; +RC_CHK_ACCESS (map)->start = event->ksymbol.addr; +RC_CHK_ACCESS (map)->end =map__start (map) + event->ksymbol.len; err =maps__insert (machine__kernel_maps (machine), map);if (err) { err = -ENOMEM ;
@@ -853,7 +853,7 @@ static int machine__process_ksymbol_unregister(struct machine *machine,if (!map)return 0 ; -if (map != machine->vmlinux_map) +if (RC_CHK_ACCESS (map) !=RC_CHK_ACCESS (machine->vmlinux_map))maps__remove (machine__kernel_maps (machine), map);else { sym = dso__find_symbol(map__dso(map),
@@ -1120,8 +1120,8 @@ int machine__create_extra_kernel_map(struct machine *machine,if (!map)return -ENOMEM ; - map->end = xm->end; - map->pgoff = xm->pgoff; +RC_CHK_ACCESS (map)->end = xm->end; +RC_CHK_ACCESS (map)->pgoff = xm->pgoff; kmap =map__kmap (map);
@@ -1193,7 +1193,7 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine, dest_map =maps__find (kmaps,map__pgoff (map));if (dest_map != map) - map->pgoff =map__map_ip (dest_map,map__pgoff (map)); +RC_CHK_ACCESS (map)->pgoff =map__map_ip (dest_map,map__pgoff (map)); found = true; }if (found || machine->trampolines_mapped)
@@ -1244,8 +1244,8 @@ __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)if (machine->vmlinux_map ==NULL )return -ENOMEM ; - machine->vmlinux_map->map_ip = map__identity_ip; - machine->vmlinux_map->unmap_ip = map__identity_ip; +RC_CHK_ACCESS (machine->vmlinux_map)->map_ip = map__identity_ip; +RC_CHK_ACCESS (machine->vmlinux_map)->unmap_ip = map__identity_ip;return maps__insert (machine__kernel_maps (machine), machine->vmlinux_map); }
@@ -1522,7 +1522,7 @@ static int machine__create_module(void *arg, const char *name, u64 start, map =machine__addnew_module_map (machine, start, name);if (map ==NULL )return -1 ; - map->end = start + size; +RC_CHK_ACCESS (map)->end = start + size;dso__kernel_module_get_build_id (map__dso (map), machine->root_dir);map__put (map);
@@ -1558,14 +1558,14 @@ static int machine__create_modules(struct machine *machine)static void machine__set_kernel_mmap (struct machine *machine,u64 start,u64 end) { - machine->vmlinux_map->start = start; - machine->vmlinux_map->end = end; +RC_CHK_ACCESS (machine->vmlinux_map)->start = start; +RC_CHK_ACCESS (machine->vmlinux_map)->end = end;/* * Be a bit paranoid here, some perf.data file came with * a zero sized synthesized MMAP event for the kernel. */ if (start ==0 && end ==0 ) - machine->vmlinux_map->end = ~0ULL ; +RC_CHK_ACCESS (machine->vmlinux_map)->end = ~0ULL ; } static int machine__update_kernel_mmap(struct machine *machine,
@@ -1700,7 +1700,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,if (map ==NULL ) goto out_problem; - map->end =map__start (map) + xm->end - xm->start; +RC_CHK_ACCESS (map)->end =map__start (map) + xm->end - xm->start;if (build_id__is_defined (bid))dso__set_build_id (map__dso (map), bid);
tools/perf/util/map.c +35 -30
156 lines not on this page · raw message
tools/perf/util/map.h +19 -15
@@ -10,12 +10,13 @@#include <string.h> #include <stdbool.h> #include <linux/types.h> +#include <internal/rc_check.h> struct dso ;struct maps ;struct machine ; -struct map { +DECLARE_RC_STRUCT (map) {u64 start;u64 end; bool erange_warned:1;
@@ -49,52 +50,52 @@ u64 map__identity_ip(const struct map *map __maybe_unused, u64 ip);static inline struct dso *map__dso (const struct map *map) { -return map->dso; +return RC_CHK_ACCESS (map)->dso; }static inline u64 map__map_ip (const struct map *map,u64 ip) { -return map->map_ip (map, ip); +return RC_CHK_ACCESS (map)->map_ip (map, ip); }static inline u64 map__unmap_ip (const struct map *map,u64 ip) { -return map->unmap_ip (map, ip); +return RC_CHK_ACCESS (map)->unmap_ip (map, ip); }static inline u64 map__start (const struct map *map) { -return map->start; +return RC_CHK_ACCESS (map)->start; }static inline u64 map__end (const struct map *map) { -return map->end; +return RC_CHK_ACCESS (map)->end; }static inline u64 map__pgoff (const struct map *map) { -return map->pgoff; +return RC_CHK_ACCESS (map)->pgoff; }static inline u64 map__reloc (const struct map *map) { -return map->reloc; +return RC_CHK_ACCESS (map)->reloc; }static inline u32 map__flags (const struct map *map) { -return map->flags; +return RC_CHK_ACCESS (map)->flags; }static inline u32 map__prot (const struct map *map) { -return map->prot; +return RC_CHK_ACCESS (map)->prot; }static inline bool map__priv (const struct map *map) { -return map->priv; +return RC_CHK_ACCESS (map)->priv; }static inline size_t map__size (const struct map *map)
@@ -119,7 +120,7 @@ struct thread;* Note: caller must ensure map->dso is not NULL (map is loaded). */ #define map__for_each_symbol (map, pos, n) \ - dso__for_each_symbol(map->dso, pos, n) + dso__for_each_symbol(map__dso(map), pos, n)/* map__for_each_symbol_with_name - iterate over the symbols in the given map * that have the given name
@@ -153,9 +154,12 @@ struct map *map__clone(struct map *map);static inline struct map *map__get (struct map *map) { -if (map) -refcount_inc (&map->refcnt); -return map; +struct map *result; + +if (RC_CHK_GET (result, map)) +refcount_inc (&RC_CHK_ACCESS (map)->refcnt); + +return result; }void map__put (struct map *map);
tools/perf/util/maps.c +6 -5
@@ -124,7 +124,7 @@ void maps__remove(struct maps *maps, struct map *map)RC_CHK_ACCESS (maps)->last_search_by_name =NULL ; rb_node =maps__find_node (maps, map); -assert (rb_node->map == map); +assert (rb_node->RC_CHK_ACCESS (map) ==RC_CHK_ACCESS (map));__maps__remove (maps, rb_node); --RC_CHK_ACCESS (maps)->nr_maps;if (maps__maps_by_name (maps))
@@ -335,7 +335,7 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) goto put_map; } - before->end =map__start (map); +RC_CHK_ACCESS (before)->end =map__start (map);if (!__maps__insert (maps, before)) {map__put (before); err = -ENOMEM ;
@@ -355,8 +355,9 @@ int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp) goto put_map; } - after->start =map__end (map); - after->pgoff +=map__end (map) -map__start (pos->map); +RC_CHK_ACCESS (after)->start =map__end (map); +RC_CHK_ACCESS (after)->pgoff += +map__end (map) -map__start (pos->map);assert (map__map_ip (pos->map,map__end (map)) ==map__map_ip (after,map__end (map)));if (!__maps__insert (maps, after)) {
@@ -418,7 +419,7 @@ struct map_rb_node *maps__find_node(struct maps *maps, struct map *map)struct map_rb_node *rb_node;maps__for_each_entry (maps, rb_node) { -if (rb_node->map == map) +if (rb_node->RC_CHK_ACCESS (map) ==RC_CHK_ACCESS (map))return rb_node; }return NULL ;
tools/perf/util/symbol-elf.c +14 -13
@@ -993,11 +993,11 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,*/ if (*remap_kernel && dso->kernel && !kmodule) { *remap_kernel = false; - map->start = shdr->sh_addr +ref_reloc (kmap); - map->end =map__start (map) + shdr->sh_size; - map->pgoff = shdr->sh_offset; - map->map_ip = map__dso_map_ip; - map->unmap_ip = map__dso_unmap_ip; +RC_CHK_ACCESS (map)->start = shdr->sh_addr +ref_reloc (kmap); +RC_CHK_ACCESS (map)->end =map__start (map) + shdr->sh_size; +RC_CHK_ACCESS (map)->pgoff = shdr->sh_offset; +RC_CHK_ACCESS (map)->map_ip = map__dso_map_ip; +RC_CHK_ACCESS (map)->unmap_ip = map__dso_unmap_ip;/* Ensure maps are correctly ordered */ if (kmaps) {int err;
@@ -1018,7 +1018,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,*/ if (*remap_kernel && kmodule) { *remap_kernel = false; - map->pgoff = shdr->sh_offset; +RC_CHK_ACCESS (map)->pgoff = shdr->sh_offset; } *curr_dsop = dso;
@@ -1052,12 +1052,13 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,map__kmap (curr_map)->kmaps = kmaps;if (adjust_kernel_syms) { - curr_map->start = shdr->sh_addr +ref_reloc (kmap); - curr_map->end =map__start (curr_map) + shdr->sh_size; - curr_map->pgoff = shdr->sh_offset; +RC_CHK_ACCESS (curr_map)->start = shdr->sh_addr +ref_reloc (kmap); +RC_CHK_ACCESS (curr_map)->end =map__start (curr_map) + + shdr->sh_size; +RC_CHK_ACCESS (curr_map)->pgoff = shdr->sh_offset; }else { - curr_map->map_ip = map__identity_ip; - curr_map->unmap_ip = map__identity_ip; +RC_CHK_ACCESS (curr_map)->map_ip = map__identity_ip; +RC_CHK_ACCESS (curr_map)->unmap_ip = map__identity_ip; } curr_dso->symtab_type = dso->symtab_type;if (maps__insert (kmaps, curr_map))
@@ -1161,7 +1162,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,if (strcmp (elf_name, kmap->ref_reloc_sym->name))continue ; kmap->ref_reloc_sym->unrelocated_addr = sym.st_value; - map->reloc = kmap->ref_reloc_sym->addr - +RC_CHK_ACCESS (map)->reloc = kmap->ref_reloc_sym->addr - kmap->ref_reloc_sym->unrelocated_addr;break ; }
@@ -1172,7 +1173,7 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,* attempted to prelink vdso to its virtual address. */ if (dso__is_vdso (dso)) - map->reloc =map__start (map) - dso->text_offset; +RC_CHK_ACCESS (map)->reloc =map__start (map) - dso->text_offset; dso->adjust_symbols = runtime_ss->adjust_symbols ||ref_reloc (kmap);/*
tools/perf/util/symbol.c +22 -20
107 lines not on this page · raw message
Signature · 1 line
2.35.1.265.g69c8d7142f-goog