From: Amol Grover <frextrite@gmail.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@redhat.com>, Namhyung Kim <namhyung@kernel.org>
Cc: linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
Joel Fernandes <joel@joelfernandes.org>,
Madhuparna Bhowmik <madhuparnabhowmik10@gmail.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
Amol Grover <frextrite@gmail.com>
Subject: [PATCH] perf_event: Annotate rb pointer with __rcu
Date: Sun, 9 Feb 2020 15:55:31 +0530 [thread overview]
Message-ID: <20200209102530.26115-1-frextrite@gmail.com> (raw)
perf_event::rb is used in RCU context, tell sparse
about it aswell to eliminate false-positives.
Fixes the following instances of sparse error:
incompatible types in comparison expression (different address spaces)
kernel/events/core.c:5596:9
kernel/events/core.c:5302:22
kernel/events/core.c:5438:14
kernel/events/core.c:5471:14
kernel/events/core.c:5528:14
kernel/events/core.c:5614:14
kernel/events/core.c:5627:14
kernel/events/core.c:7182:13
kernel/events/ring_buffer.c:169:14
kernel/events/ring_buffer.c:169:14
kernel/events/ring_buffer.c:169:14
This introduces the following 2 new sparse errors:
kernel/events/core.c:7212:9
kernel/events/core.c:5749:31
which are fixed by using RCU primitives, rcu_dereference()
and rcu_access_pointer() on perf_event::rb.
Signed-off-by: Amol Grover <frextrite@gmail.com>
---
include/linux/perf_event.h | 2 +-
kernel/events/core.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 6d4c22aee384..1691107d2800 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -694,7 +694,7 @@ struct perf_event {
struct mutex mmap_mutex;
atomic_t mmap_count;
- struct ring_buffer *rb;
+ struct ring_buffer __rcu *rb;
struct list_head rb_entry;
unsigned long rcu_batches;
int rcu_pending;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2173c23c25b4..7b9411d21165 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5746,7 +5746,7 @@ static void perf_mmap_close(struct vm_area_struct *vma)
* still restart the iteration to make sure we're not now
* iterating the wrong list.
*/
- if (event->rb == rb)
+ if (rcu_access_pointer(event->rb) == rb)
ring_buffer_attach(event, NULL);
mutex_unlock(&event->mmap_mutex);
@@ -7209,7 +7209,8 @@ static void perf_pmu_output_stop(struct perf_event *event)
restart:
rcu_read_lock();
- list_for_each_entry_rcu(iter, &event->rb->event_list, rb_entry) {
+ list_for_each_entry_rcu(iter, &rcu_dereference(event->rb)->event_list,
+ rb_entry) {
/*
* For per-CPU events, we need to make sure that neither they
* nor their children are running; for cpu==-1 events it's
--
2.24.1
reply other threads:[~2020-02-09 10:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200209102530.26115-1-frextrite@gmail.com \
--to=frextrite@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=joel@joelfernandes.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=madhuparnabhowmik10@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.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).