net/tipc: Replace rcu_swap_protected() with rcu_replace_pointer() (1a271ebb) · Commits · 戴 / test

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>

net/tipc/crypto.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -257,9 +257,6 @@ static char *tipc_key_change_dump(struct tipc_key old, struct tipc_key new,
		#define tipc_aead_rcu_ptr(rcu_ptr, lock) \
		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))

		#define tipc_aead_rcu_replace(rcu_ptr, ptr, lock) \
		do { \
		typeof(rcu_ptr) __tmp = rcu_dereference_protected((rcu_ptr), \
		@@ -1189,7 +1186,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, lockdep_is_held(&rx->lock));
		x = (key.passive - key.pending + new_pending) % KEY_MAX;
		new_passive = (x <= 0) ? x + KEY_MAX : x;
		}

Admin message