From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Nick Terrell <terrelln@fb.com>,
Kan Liang <kan.liang@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>, Leo Yan <leo.yan@linaro.org>,
Song Liu <song@kernel.org>, Sandipan Das <sandipan.das@amd.com>,
James Clark <james.clark@arm.com>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Miguel Ojeda <ojeda@kernel.org>,
Liam Howlett <liam.howlett@oracle.com>,
Yang Jihong <yangjihong1@huawei.com>,
Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
Kajol Jain <kjain@linux.ibm.com>,
K Prateek Nayak <kprateek.nayak@amd.com>,
Sean Christopherson <seanjc@google.com>,
Yanteng Si <siyanteng@loongson.cn>,
Ravi Bangoria <ravi.bangoria@amd.com>,
German Gomez <german.gomez@arm.com>,
Changbin Du <changbin.du@huawei.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
liuwenyu <liuwenyu7@huawei.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Subject: [PATCH v3 04/50] libperf rc_check: Add RC_CHK_EQUAL
Date: Tue, 24 Oct 2023 15:23:07 -0700 [thread overview]
Message-ID: <20231024222353.3024098-5-irogers@google.com> (raw)
In-Reply-To: <20231024222353.3024098-1-irogers@google.com>
Comparing pointers with reference count checking is tricky to avoid a
SEGV. Add a convenience macro to simplify and use.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/lib/perf/include/internal/rc_check.h | 7 +++++++
tools/perf/builtin-sched.c | 2 +-
tools/perf/tests/hists_link.c | 4 ++--
tools/perf/tests/thread-maps-share.c | 9 ++++-----
tools/perf/util/callchain.c | 2 +-
tools/perf/util/hist.c | 2 +-
tools/perf/util/machine.c | 4 ++--
tools/perf/util/sort.c | 2 +-
tools/perf/util/symbol.c | 4 ++--
9 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/tools/lib/perf/include/internal/rc_check.h b/tools/lib/perf/include/internal/rc_check.h
index e88a6d8a0b0f..f80ddfc80129 100644
--- a/tools/lib/perf/include/internal/rc_check.h
+++ b/tools/lib/perf/include/internal/rc_check.h
@@ -54,6 +54,9 @@
/* A put operation removing the indirection layer. */
#define RC_CHK_PUT(object) {}
+/* Pointer equality when the indirection may or may not be there. */
+#define RC_CHK_EQUAL(object1, object2) (object1 == object2)
+
#else
/* Replaces "struct foo" so that the pointer may be interposed. */
@@ -101,6 +104,10 @@
} \
} while(0)
+/* Pointer equality when the indirection may or may not be there. */
+#define RC_CHK_EQUAL(object1, object2) (object1 == object2 || \
+ (object1 && object2 && object1->orig == object2->orig))
+
#endif
#endif /* __LIBPERF_INTERNAL_RC_CHECK_H */
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 9ab300b6f131..dd6065afbbaf 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1385,7 +1385,7 @@ static int pid_cmp(struct work_atoms *l, struct work_atoms *r)
{
pid_t l_tid, r_tid;
- if (RC_CHK_ACCESS(l->thread) == RC_CHK_ACCESS(r->thread))
+ if (RC_CHK_EQUAL(l->thread, r->thread))
return 0;
l_tid = thread__tid(l->thread);
r_tid = thread__tid(r->thread);
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index 2d19657ab5e0..5b6f1e883466 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -148,8 +148,8 @@ static int find_sample(struct sample *samples, size_t nr_samples,
struct thread *t, struct map *m, struct symbol *s)
{
while (nr_samples--) {
- if (RC_CHK_ACCESS(samples->thread) == RC_CHK_ACCESS(t) &&
- RC_CHK_ACCESS(samples->map) == RC_CHK_ACCESS(m) &&
+ if (RC_CHK_EQUAL(samples->thread, t) &&
+ RC_CHK_EQUAL(samples->map, m) &&
samples->sym == s)
return 1;
samples++;
diff --git a/tools/perf/tests/thread-maps-share.c b/tools/perf/tests/thread-maps-share.c
index faf980b26252..7fa6f7c568e2 100644
--- a/tools/perf/tests/thread-maps-share.c
+++ b/tools/perf/tests/thread-maps-share.c
@@ -46,9 +46,9 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int s
TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(maps__refcnt(maps)), 4);
/* test the maps pointer is shared */
- TEST_ASSERT_VAL("maps don't match", RC_CHK_ACCESS(maps) == RC_CHK_ACCESS(thread__maps(t1)));
- TEST_ASSERT_VAL("maps don't match", RC_CHK_ACCESS(maps) == RC_CHK_ACCESS(thread__maps(t2)));
- TEST_ASSERT_VAL("maps don't match", RC_CHK_ACCESS(maps) == RC_CHK_ACCESS(thread__maps(t3)));
+ TEST_ASSERT_VAL("maps don't match", RC_CHK_EQUAL(maps, thread__maps(t1)));
+ TEST_ASSERT_VAL("maps don't match", RC_CHK_EQUAL(maps, thread__maps(t2)));
+ TEST_ASSERT_VAL("maps don't match", RC_CHK_EQUAL(maps, thread__maps(t3)));
/*
* Verify the other leader was created by previous call.
@@ -73,8 +73,7 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int s
other_maps = thread__maps(other);
TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(maps__refcnt(other_maps)), 2);
- TEST_ASSERT_VAL("maps don't match", RC_CHK_ACCESS(other_maps) ==
- RC_CHK_ACCESS(thread__maps(other_leader)));
+ TEST_ASSERT_VAL("maps don't match", RC_CHK_EQUAL(other_maps, thread__maps(other_leader)));
/* release thread group */
thread__put(t3);
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index aee937d14fbb..18d545c0629e 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -1142,7 +1142,7 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *
if (al->map == NULL)
goto out;
}
- if (RC_CHK_ACCESS(al->maps) == RC_CHK_ACCESS(machine__kernel_maps(machine))) {
+ if (RC_CHK_EQUAL(al->maps, machine__kernel_maps(machine))) {
if (machine__is_host(machine)) {
al->cpumode = PERF_RECORD_MISC_KERNEL;
al->level = 'k';
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 3dc8a4968beb..cde0078e6c90 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -2142,7 +2142,7 @@ static bool hists__filter_entry_by_thread(struct hists *hists,
struct hist_entry *he)
{
if (hists->thread_filter != NULL &&
- RC_CHK_ACCESS(he->thread) != RC_CHK_ACCESS(hists->thread_filter)) {
+ !RC_CHK_EQUAL(he->thread, hists->thread_filter)) {
he->filtered |= (1 << HIST_FILTER__THREAD);
return true;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index e0e2c4a943e4..098600d983c5 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -969,7 +969,7 @@ static int machine__process_ksymbol_unregister(struct machine *machine,
if (!map)
return 0;
- if (RC_CHK_ACCESS(map) != RC_CHK_ACCESS(machine->vmlinux_map))
+ if (!RC_CHK_EQUAL(map, machine->vmlinux_map))
maps__remove(machine__kernel_maps(machine), map);
else {
struct dso *dso = map__dso(map);
@@ -2058,7 +2058,7 @@ static void __machine__remove_thread(struct machine *machine, struct thread_rb_n
if (!nd)
nd = thread_rb_node__find(th, &threads->entries.rb_root);
- if (threads->last_match && RC_CHK_ACCESS(threads->last_match) == RC_CHK_ACCESS(th))
+ if (threads->last_match && RC_CHK_EQUAL(threads->last_match, th))
threads__set_last_match(threads, NULL);
if (lock)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 6aa1c7f2b444..80e4f6132740 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -128,7 +128,7 @@ static int hist_entry__thread_filter(struct hist_entry *he, int type, const void
if (type != HIST_FILTER__THREAD)
return -1;
- return th && RC_CHK_ACCESS(he->thread) != RC_CHK_ACCESS(th);
+ return th && !RC_CHK_EQUAL(he->thread, th);
}
struct sort_entry sort_thread = {
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 96587fd7a5a2..822f4dcebfe6 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -877,7 +877,7 @@ static int maps__split_kallsyms(struct maps *kmaps, struct dso *dso, u64 delta,
*module++ = '\0';
curr_map_dso = map__dso(curr_map);
if (strcmp(curr_map_dso->short_name, module)) {
- if (RC_CHK_ACCESS(curr_map) != RC_CHK_ACCESS(initial_map) &&
+ if (!RC_CHK_EQUAL(curr_map, initial_map) &&
dso->kernel == DSO_SPACE__KERNEL_GUEST &&
machine__is_default_guest(machine)) {
/*
@@ -1469,7 +1469,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
list_del_init(&new_node->node);
- if (RC_CHK_ACCESS(new_map) == RC_CHK_ACCESS(replacement_map)) {
+ if (RC_CHK_EQUAL(new_map, replacement_map)) {
struct map *map_ref;
map__set_start(map, map__start(new_map));
--
2.42.0.758.gaed0368e0e-goog
next prev parent reply other threads:[~2023-10-24 22:24 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 22:23 [PATCH v3 00/50] Improvements to memory use Ian Rogers
2023-10-24 22:23 ` [PATCH v3 01/50] perf rwsem: Add debug mode that uses a mutex Ian Rogers
2023-10-24 22:23 ` [PATCH v3 02/50] perf machine: Avoid out of bounds LBR memory read Ian Rogers
2023-10-24 22:23 ` [PATCH v3 03/50] libperf rc_check: Make implicit enabling work for GCC Ian Rogers
2023-10-24 22:23 ` Ian Rogers [this message]
2023-10-24 22:23 ` [PATCH v3 05/50] perf hist: Add missing puts to hist__account_cycles Ian Rogers
2023-10-24 22:23 ` [PATCH v3 06/50] perf threads: Remove unused dead thread list Ian Rogers
2023-10-24 22:23 ` [PATCH v3 07/50] perf offcpu: Add missed btf_free Ian Rogers
2023-10-24 22:23 ` [PATCH v3 08/50] perf callchain: Make display use of branch_type_stat const Ian Rogers
2023-10-24 22:23 ` [PATCH v3 09/50] perf callchain: Make brtype_stat in callchain_list optional Ian Rogers
2023-10-24 22:23 ` [PATCH v3 10/50] perf callchain: Minor layout changes to callchain_list Ian Rogers
2023-10-24 22:23 ` [PATCH v3 11/50] perf mem_info: Add and use map_symbol__exit and addr_map_symbol__exit Ian Rogers
2023-10-24 22:23 ` [PATCH v3 12/50] perf record: Lazy load kernel symbols Ian Rogers
2023-10-25 18:25 ` Namhyung Kim
2023-10-25 18:35 ` Adrian Hunter
2023-10-24 22:23 ` [PATCH v3 13/50] libperf: Lazily allocate mmap event copy Ian Rogers
2023-10-25 2:38 ` Yang Jihong
2023-10-25 3:28 ` Ian Rogers
2023-10-24 22:23 ` [PATCH v3 14/50] perf mmap: Lazily initialize zstd streams Ian Rogers
2023-10-24 22:23 ` [PATCH v3 15/50] perf machine thread: Remove exited threads by default Ian Rogers
2023-10-24 22:23 ` [PATCH v3 16/50] tools api fs: Switch filename__read_str to use io.h Ian Rogers
2023-10-24 22:23 ` [PATCH v3 17/50] tools api fs: Avoid reading whole file for a 1 byte bool Ian Rogers
2023-10-24 22:23 ` [PATCH v3 18/50] tools lib api: Add io_dir an allocation free readdir alternative Ian Rogers
2023-10-25 18:43 ` Namhyung Kim
2023-10-25 22:15 ` Ian Rogers
2023-10-24 22:23 ` [PATCH v3 19/50] perf maps: Switch modules tree walk to io_dir__readdir Ian Rogers
2023-10-24 22:23 ` [PATCH v3 20/50] perf record: Be lazier in allocating lost samples buffer Ian Rogers
2023-10-25 3:44 ` Yang Jihong
2023-10-25 17:00 ` Ian Rogers
2023-10-25 19:04 ` Namhyung Kim
2023-10-25 19:00 ` Namhyung Kim
2023-10-24 22:23 ` [PATCH v3 21/50] perf pmu: Switch to io_dir__readdir Ian Rogers
2023-10-24 22:23 ` [PATCH v3 22/50] perf bpf: Don't synthesize BPF events when disabled Ian Rogers
2023-10-24 22:23 ` [PATCH v3 23/50] perf header: Switch mem topology to io_dir__readdir Ian Rogers
2023-10-24 22:23 ` [PATCH v3 24/50] perf events: Remove scandir in thread synthesis Ian Rogers
2023-10-24 22:23 ` [PATCH v3 25/50] perf map: Simplify map_ip/unmap_ip and make map size smaller Ian Rogers
2023-10-24 22:23 ` [PATCH v3 26/50] perf maps: Move symbol maps functions to maps.c Ian Rogers
2023-10-24 22:23 ` [PATCH v3 27/50] perf thread: Add missing RC_CHK_ACCESS Ian Rogers
2023-10-24 22:23 ` [PATCH v3 28/50] perf maps: Add maps__for_each_map to call a function on each entry Ian Rogers
2023-10-24 22:23 ` [PATCH v3 29/50] perf maps: Add remove maps function to remove a map based on callback Ian Rogers
2023-10-24 22:23 ` [PATCH v3 30/50] perf debug: Expose debug file Ian Rogers
2023-10-24 22:23 ` [PATCH v3 31/50] perf maps: Refactor maps__fixup_overlappings Ian Rogers
2023-10-24 22:23 ` [PATCH v3 32/50] perf maps: Do simple merge if given map doesn't overlap Ian Rogers
2023-10-24 22:23 ` [PATCH v3 33/50] perf maps: Rename clone to copy from Ian Rogers
2023-10-24 22:23 ` [PATCH v3 34/50] perf maps: Add maps__load_first Ian Rogers
2023-10-24 22:23 ` [PATCH v3 35/50] perf maps: Add find next entry to give entry after the given map Ian Rogers
2023-10-24 22:23 ` [PATCH v3 36/50] perf maps: Reduce scope of map_rb_node and maps internals Ian Rogers
2023-10-24 22:23 ` [PATCH v3 37/50] perf maps: Fix up overlaps during fixup_end Ian Rogers
2023-10-24 22:23 ` [PATCH v3 38/50] perf maps: Switch from rbtree to lazily sorted array for addresses Ian Rogers
2023-10-24 22:23 ` [PATCH v3 39/50] perf maps: Get map before returning in maps__find Ian Rogers
2023-10-24 22:23 ` [PATCH v3 40/50] perf maps: Get map before returning in maps__find_by_name Ian Rogers
2023-10-24 22:23 ` [PATCH v3 41/50] perf maps: Get map before returning in maps__find_next_entry Ian Rogers
2023-10-24 22:23 ` [PATCH v3 42/50] perf maps: Hide maps internals Ian Rogers
2023-10-24 22:23 ` [PATCH v3 43/50] perf maps: Locking tidy up of nr_maps Ian Rogers
2023-10-24 22:23 ` [PATCH v3 44/50] perf dso: Reorder variables to save space in struct dso Ian Rogers
2023-10-24 22:23 ` [PATCH v3 45/50] perf report: Sort child tasks by tid Ian Rogers
2023-10-24 22:23 ` [PATCH v3 46/50] perf trace: Ignore thread hashing in summary Ian Rogers
2023-10-24 22:23 ` [PATCH v3 47/50] perf machine: Move fprintf to for_each loop and a callback Ian Rogers
2023-10-24 22:23 ` [PATCH v3 48/50] perf threads: Move threads to its own files Ian Rogers
2023-10-24 22:23 ` [PATCH v3 49/50] perf threads: Switch from rbtree to hashmap Ian Rogers
2023-10-24 22:23 ` [PATCH v3 50/50] perf threads: Reduce table size from 256 to 8 Ian Rogers
2023-10-26 17:11 ` (subset) [PATCH v3 00/50] Improvements to memory use Namhyung Kim
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=20231024222353.3024098-5-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=anshuman.khandual@arm.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=changbin.du@huawei.com \
--cc=german.gomez@arm.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=kjain@linux.ibm.com \
--cc=kprateek.nayak@amd.com \
--cc=leo.yan@linaro.org \
--cc=liam.howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=liuwenyu7@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=ojeda@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=sandipan.das@amd.com \
--cc=seanjc@google.com \
--cc=siyanteng@loongson.cn \
--cc=song@kernel.org \
--cc=terrelln@fb.com \
--cc=yangjihong1@huawei.com \
/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