Skip to contentSkip to conversation

tipc: tipc_udp_recv() cleanup vs rcu verbs

PATCH Applied Eric Dumazet 2 participants 2 messages Apr 23, 2019 – Apr 24, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tipc: tipc_udp_recv() cleanup vs rcu verbs

First thing tipc_udp_recv() does is to use rcu_dereference_sk_user_data(), and this is really hinting we already own rcu_read_lock() from the caller (UDP stack).

No need to add another rcu_read_lock()/rcu_read_unlock() pair.

Also use rcu_dereference() instead of rcu_dereference_rtnl() in the data path.

---
 net/tipc/udp_media.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
net/tipc/udp_media.c +3 -6
index 6f166fbbfff148b7d3774ece0d68203d9925b3da..7413cbc9b638af492d6a592df957a3229fa6a3fa 100644
@@ -354,10 +354,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb)
 	skb_pull(skb, sizeof(struct udphdr));
 	hdr = buf_msg(skb);
 
-	rcu_read_lock();
-	b = rcu_dereference_rtnl(ub->bearer);
+	b = rcu_dereference(ub->bearer);
 	if (!b)
-		goto rcu_out;
+		goto out;
 
 	if (b && test_bit(0, &b->up)) {
 		tipc_rcv(sock_net(sk), skb, b);
@@ -368,11 +367,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb)
 	if (unlikely(msg_user(hdr) == LINK_CONFIG)) {
 		err = tipc_udp_rcast_disc(b, skb);
 		if (err)
-			goto rcu_out;
+			goto out;
 	}
 
-rcu_out:
-	rcu_read_unlock();
 out:
 	kfree_skb(skb);
 	return 0;
Signature · 1 line
2.21.0.593.g511ec345e18-goog
maintainer Applied
#1 lore raw

From: Eric Dumazet <[email protected]>
Date: Tue, 23 Apr 2019 09:24:46 -0700

Quoted 10 lines

First thing tipc_udp_recv() does is to use rcu_dereference_sk_user_data(), and this is really hinting we already own rcu_read_lock() from the caller (UDP stack).

No need to add another rcu_read_lock()/rcu_read_unlock() pair.

Also use rcu_dereference() instead of rcu_dereference_rtnl() in the data path.

Applied, thanks Eric.