From: "Paul E. McKenney" <paulmck@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: jon.maloy@ericsson.com, ying.xue@windriver.com,
davem@davemloft.net, netdev@vger.kernel.org,
tipc-discussion@lists.sourceforge.net,
torvalds@linux-foundation.org, mingo@kernel.org,
kernel-team@fb.com
Subject: [PATCH net/tipc] Replace rcu_swap_protected() with rcu_replace_pointer()
Date: Mon, 9 Dec 2019 19:31:46 -0800 [thread overview]
Message-ID: <20191210033146.GA32522@paulmck-ThinkPad-P72> (raw)
This commit replaces the use of rcu_swap_protected() with the more
intuitively appealing rcu_replace_pointer() as a step towards removing
rcu_swap_protected().
Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Jon Maloy <jon.maloy@ericsson.com>
Cc: Ying Xue <ying.xue@windriver.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Cc: <tipc-discussion@lists.sourceforge.net>
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index 990a872..64cf831 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c
@@ -258,7 +258,7 @@ static char *tipc_key_change_dump(struct tipc_key old, struct tipc_key new,
rcu_dereference_protected((rcu_ptr), lockdep_is_held(lock))
#define tipc_aead_rcu_swap(rcu_ptr, ptr, lock) \
- rcu_swap_protected((rcu_ptr), (ptr), lockdep_is_held(lock))
+ rcu_replace_pointer((rcu_ptr), (ptr), lockdep_is_held(lock))
#define tipc_aead_rcu_replace(rcu_ptr, ptr, lock) \
do { \
@@ -1189,7 +1189,7 @@ static bool tipc_crypto_key_try_align(struct tipc_crypto *rx, u8 new_pending)
/* Move passive key if any */
if (key.passive) {
- tipc_aead_rcu_swap(rx->aead[key.passive], tmp2, &rx->lock);
+ tmp2 = rcu_replace_pointer(rx->aead[key.passive], tmp2, &rx->lock);
x = (key.passive - key.pending + new_pending) % KEY_MAX;
new_passive = (x <= 0) ? x + KEY_MAX : x;
}
next reply other threads:[~2019-12-10 3:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 3:31 Paul E. McKenney [this message]
2019-12-10 14:36 ` [PATCH net/tipc] Replace rcu_swap_protected() with rcu_replace_pointer() Ying Xue
2019-12-10 22:38 ` Paul E. McKenney
2019-12-11 1:31 ` Ying Xue
2019-12-11 2:00 ` [tipc-discussion] " Tuong Lien Tong
2019-12-11 3:17 ` Paul E. McKenney
2019-12-11 4:35 ` Ying Xue
2019-12-11 4:42 ` Ying Xue
2019-12-11 18:46 ` Paul E. McKenney
2019-12-12 6:14 ` Ying Xue
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=20191210033146.GA32522@paulmck-ThinkPad-P72 \
--to=paulmck@kernel.org \
--cc=davem@davemloft.net \
--cc=jon.maloy@ericsson.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tipc-discussion@lists.sourceforge.net \
--cc=torvalds@linux-foundation.org \
--cc=ying.xue@windriver.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;
as well as URLs for NNTP newsgroup(s).