From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: "Martin KaFai Lau" <kafai@fb.com>,
"Hangbin Liu" <liuhangbin@gmail.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Magnus Karlsson" <magnus.karlsson@gmail.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
"Toke Høiland-Jørgensen" <toke@redhat.com>
Subject: [PATCH bpf-next 01/17] rcu: Create an unrcu_pointer() to remove __rcu from a pointer
Date: Wed, 9 Jun 2021 12:33:10 +0200 [thread overview]
Message-ID: <20210609103326.278782-2-toke@redhat.com> (raw)
In-Reply-To: <20210609103326.278782-1-toke@redhat.com>
From: "Paul E. McKenney" <paulmck@kernel.org>
The xchg() and cmpxchg() functions are sometimes used to carry out RCU
updates. Unfortunately, this can result in sparse warnings for both
the old-value and new-value arguments, as well as for the return value.
The arguments can be dealt with using RCU_INITIALIZER():
old_p = xchg(&p, RCU_INITIALIZER(new_p));
But a sparse warning still remains due to assigning the __rcu pointer
returned from xchg to the (most likely) non-__rcu pointer old_p.
This commit therefore provides an unrcu_pointer() macro that strips
the __rcu. This macro can be used as follows:
old_p = unrcu_pointer(xchg(&p, RCU_INITIALIZER(new_p)));
Reported-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
include/linux/rcupdate.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 9455476c5ba2..d7895b81264e 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -363,6 +363,20 @@ static inline void rcu_preempt_sleep_check(void) { }
#define rcu_check_sparse(p, space)
#endif /* #else #ifdef __CHECKER__ */
+/**
+ * unrcu_pointer - mark a pointer as not being RCU protected
+ * @p: pointer needing to lose its __rcu property
+ *
+ * Converts @p from an __rcu pointer to a __kernel pointer.
+ * This allows an __rcu pointer to be used with xchg() and friends.
+ */
+#define unrcu_pointer(p) \
+({ \
+ typeof(*p) *_________p1 = (typeof(*p) *__force)(p); \
+ rcu_check_sparse(p, __rcu); \
+ ((typeof(*p) __force __kernel *)(_________p1)); \
+})
+
#define __rcu_access_pointer(p, space) \
({ \
typeof(*p) *_________p1 = (typeof(*p) *__force)READ_ONCE(p); \
--
2.31.1
next prev parent reply other threads:[~2021-06-09 10:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 10:33 [PATCH bpf-next 00/17] Clean up and document RCU-based object protection for XDP_REDIRECT Toke Høiland-Jørgensen
2021-06-09 10:33 ` Toke Høiland-Jørgensen [this message]
2021-06-09 10:33 ` [PATCH bpf-next 02/17] bpf: allow RCU-protected lookups to happen from bh context Toke Høiland-Jørgensen
2021-06-10 18:38 ` Alexei Starovoitov
2021-06-10 21:24 ` Daniel Borkmann
2021-06-10 22:27 ` Toke Høiland-Jørgensen
2021-06-10 19:33 ` Martin KaFai Lau
2021-06-09 10:33 ` [PATCH bpf-next 03/17] dev: add rcu_read_lock_bh_held() as a valid check when getting a RCU dev ref Toke Høiland-Jørgensen
2021-06-10 19:37 ` Martin KaFai Lau
2021-06-10 23:05 ` Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 04/17] xdp: add proper __rcu annotations to redirect map entries Toke Høiland-Jørgensen
2021-06-10 21:09 ` Martin KaFai Lau
2021-06-10 23:19 ` Toke Høiland-Jørgensen
2021-06-10 23:32 ` Martin KaFai Lau
2021-06-10 23:41 ` Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 05/17] ena: remove rcu_read_lock() around XDP program invocation Toke Høiland-Jørgensen
2021-06-09 13:57 ` Paul E. McKenney
2021-06-09 10:33 ` [PATCH bpf-next 06/17] bnxt: " Toke Høiland-Jørgensen
2021-06-09 13:58 ` Paul E. McKenney
2021-06-10 8:47 ` Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 07/17] thunderx: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 08/17] freescale: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 09/17] net: intel: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 10/17] marvell: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 11/17] mlx4: " Toke Høiland-Jørgensen
2021-06-10 7:10 ` Tariq Toukan
2021-06-09 10:33 ` [PATCH bpf-next 12/17] nfp: " Toke Høiland-Jørgensen
2021-06-11 16:30 ` Simon Horman
2021-06-09 10:33 ` [PATCH bpf-next 13/17] qede: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 14/17] sfc: " Toke Høiland-Jørgensen
2021-06-09 12:15 ` Edward Cree
2021-06-09 10:33 ` [PATCH bpf-next 15/17] netsec: " Toke Høiland-Jørgensen
2021-06-10 5:30 ` Ilias Apalodimas
2021-06-09 10:33 ` [PATCH bpf-next 16/17] stmmac: " Toke Høiland-Jørgensen
2021-06-09 10:33 ` [PATCH bpf-next 17/17] net: ti: " Toke Høiland-Jørgensen
2021-06-09 17:04 ` Grygorii Strashko
2021-06-10 0:18 ` [PATCH bpf-next 00/17] Clean up and document RCU-based object protection for XDP_REDIRECT Yonghong Song
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=20210609103326.278782-2-toke@redhat.com \
--to=toke@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=kafai@fb.com \
--cc=liuhangbin@gmail.com \
--cc=magnus.karlsson@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@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).