Messages in this thread Patch in this message | | | Date | Tue, 10 Dec 2019 19:17:51 -0800 | From | "Paul E. McKenney" <> | Subject | Re: [tipc-discussion] [PATCH net/tipc] Replace rcu_swap_protected() with rcu_replace_pointer() |
| |
On Wed, Dec 11, 2019 at 09:00:39AM +0700, Tuong Lien Tong wrote: > Hi Ying, Paul, > > Please see my comments inline. Thanks!
Good catch!
> BR/Tuong > > -----Original Message----- > From: Ying Xue <ying.xue@windriver.com> > Sent: Wednesday, December 11, 2019 8:32 AM > To: paulmck@kernel.org > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; mingo@kernel.org; > tipc-discussion@lists.sourceforge.net; kernel-team@fb.com; > torvalds@linux-foundation.org; davem@davemloft.net > Subject: Re: [tipc-discussion] [PATCH net/tipc] Replace rcu_swap_protected() > with rcu_replace_pointer() > > On 12/11/19 6:38 AM, Paul E. McKenney wrote: > > commit 4ee8e2c68b076867b7a5af82a38010fffcab611c > > Author: Paul E. McKenney <paulmck@kernel.org> > > Date: Mon Dec 9 19:13:45 2019 -0800 > > > > net/tipc: Replace rcu_swap_protected() with rcu_replace_pointer() > > > > 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+BHqta4g > g6Hw@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> > > Acked-by: Ying Xue <ying.xue@windriver.com>
As in the following? If so, I will be very happy to apply your Acked-by.
Thanx, Paul
------------------------------------------------------------------------
commit 4c0855120704e7a578dc6862ae57babf6dc9bc77 Author: Paul E. McKenney <paulmck@kernel.org> Date: Mon Dec 9 19:13:45 2019 -0800
net/tipc: Replace rcu_swap_protected() with rcu_replace_pointer() 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> [ paulmck: Updated based on Ying Xue and Tuong Lien Tong feedback. ] 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..39a13b4 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 = tipc_aead_rcu_swap(rx->aead[key.passive], tmp2, &rx->lock); x = (key.passive - key.pending + new_pending) % KEY_MAX; new_passive = (x <= 0) ? x + KEY_MAX : x; }
| |