amt: no longer rely on RTNL in amt_fill_info()
Subsystems (3)
PATCH 1/1 amt: no longer rely on RTNL in amt_fill_info()
Update amt_fill_info() to run under RCU read lock instead of RTNL.
The AMT device configuration fields (mode, relay_port, gw_port, local_ip, discovery_ip, max_tunnels) and stream_dev pointer are initialized during device creation (amt_newlink) and are immutable. Accessing them locklessly is safe. The stream_dev net_device structure is protected from being freed by RCU.
The only field that can change concurrently is amt->remote_ip, which is updated in the packet receive path (amt_advertisement_handler) and workqueue (amt_req_work). Add READ_ONCE()/WRITE_ONCE() annotations around amt->remote_ip to prevent data races.
--- drivers/net/amt.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-)
drivers/net/amt.c +27 -16
@@ -708,11 +708,13 @@ static void amt_send_request(struct amt_dev *amt, bool v6)struct iphdr *iph;struct rtable *rt;struct flowi4 fl4; +__be32 remote_ip;struct sock *sk;u32 len;int err;rcu_read_lock (); + remote_ip =READ_ONCE (amt->remote_ip); sk =rcu_dereference (amt->sk);if (!sk) goto out;
@@ -721,7 +723,7 @@ static void amt_send_request(struct amt_dev *amt, bool v6) goto out; rt =ip_route_output_ports (amt->net, &fl4, sk, - amt->remote_ip, amt->local_ip, + remote_ip, amt->local_ip, amt->gw_port, amt->relay_port,IPPROTO_UDP ,0 , amt->stream_dev->ifindex);
@@ -762,7 +764,7 @@ static void amt_send_request(struct amt_dev *amt, bool v6) udph->check =0 ; offset =skb_transport_offset (skb); skb->csum =skb_checksum (skb, offset, skb->len - offset,0 ); - udph->check =csum_tcpudp_magic (amt->local_ip, amt->remote_ip, + udph->check =csum_tcpudp_magic (amt->local_ip, remote_ip,sizeof (*udph) +sizeof (*amtrh),IPPROTO_UDP , skb->csum);
@@ -773,7 +775,7 @@ static void amt_send_request(struct amt_dev *amt, bool v6) iph->tos =AMT_TOS ; iph->frag_off =0 ; iph->ttl =ip4_dst_hoplimit (&rt->dst); - iph->daddr = amt->remote_ip; + iph->daddr = remote_ip; iph->saddr = amt->local_ip; iph->protocol =IPPROTO_UDP ; iph->tot_len =htons (len);
@@ -962,7 +964,7 @@ static void amt_event_send_request(struct amt_dev *amt) amt->qi =AMT_INIT_REQ_TIMEOUT ;WRITE_ONCE (amt->ready4, false);WRITE_ONCE (amt->ready6, false); - amt->remote_ip =0 ; +WRITE_ONCE (amt->remote_ip,0 );amt_update_gw_status (amt,AMT_STATUS_INIT , false); amt->req_cnt =0 ; amt->nonce =0 ;
@@ -999,6 +1001,7 @@ static bool amt_send_membership_update(struct amt_dev *amt, struct sk_buff *skb, bool v6) { +__be32 remote_ip =READ_ONCE (amt->remote_ip);struct amt_header_membership_update *amtmu;struct iphdr *iph;struct flowi4 fl4;
@@ -1018,13 +1021,13 @@ static bool amt_send_membership_update(struct amt_dev *amt,skb_reset_inner_headers (skb);memset (&fl4,0 ,sizeof (struct flowi4 )); fl4.flowi4_oif = amt->stream_dev->ifindex; - fl4.daddr = amt->remote_ip; + fl4.daddr = remote_ip; fl4.saddr = amt->local_ip; fl4.flowi4_dscp =inet_dsfield_to_dscp (AMT_TOS ); fl4.flowi4_proto =IPPROTO_UDP ; rt =ip_route_output_key (amt->net, &fl4);if (IS_ERR (rt)) { -netdev_dbg (amt->dev,"no route to %pI4\n" , &amt->remote_ip); +netdev_dbg (amt->dev,"no route to %pI4\n" , &remote_ip);return true; }
@@ -2272,8 +2275,8 @@ static bool amt_advertisement_handler(struct amt_dev *amt, struct sk_buff *skb) amt->nonce != amta->nonce)return true; - amt->remote_ip = amta->ip4; -netdev_dbg (amt->dev,"advertised remote ip = %pI4\n" , &amt->remote_ip); +WRITE_ONCE (amt->remote_ip, amta->ip4); +netdev_dbg (amt->dev,"advertised remote ip = %pI4\n" , &amta->ip4);mod_delayed_work (amt_wq, &amt->req_wq,0 );amt_update_gw_status (amt,AMT_STATUS_RECEIVED_ADVERTISEMENT , true);
@@ -2773,6 +2776,7 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb) {struct amt_dev *amt;struct iphdr *iph; +__be32 remote_ip;int type;bool err;
@@ -2783,6 +2787,7 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb)kfree_skb (skb); goto out; } + remote_ip =READ_ONCE (amt->remote_ip); skb->dev = amt->dev; iph =ip_hdr (skb);
@@ -2807,7 +2812,7 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb) } goto out;case AMT_MSG_MULTICAST_DATA : -if (iph->saddr != amt->remote_ip) { +if (iph->saddr != remote_ip) {netdev_dbg (amt->dev,"Invalid Relay IP\n" ); err = true; goto drop;
@@ -2818,7 +2823,7 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb)else goto out;case AMT_MSG_MEMBERSHIP_QUERY : -if (iph->saddr != amt->remote_ip) { +if (iph->saddr != remote_ip) {netdev_dbg (amt->dev,"Invalid Relay IP\n" ); err = true; goto drop;
@@ -3000,7 +3005,7 @@ static int amt_dev_open(struct net_device *dev)return err; amt->req_cnt =0 ; - amt->remote_ip =0 ; +WRITE_ONCE (amt->remote_ip,0 ); amt->nonce =0 ;get_random_bytes (&amt->key,sizeof (siphash_key_t));
@@ -3045,7 +3050,7 @@ static int amt_dev_stop(struct net_device *dev) amt->ready4 = false; amt->ready6 = false; amt->req_cnt =0 ; - amt->remote_ip =0 ; +WRITE_ONCE (amt->remote_ip,0 );list_for_each_entry_safe (tunnel, tmp, &amt->tunnel_list, list) {list_del_rcu (&tunnel->list);
@@ -3244,7 +3249,7 @@ static int amt_newlink(struct net_device *dev, "gateway port must not be 0"); goto err; } - amt->remote_ip =0 ; +WRITE_ONCE (amt->remote_ip,0 ); amt->discovery_ip =nla_get_in_addr (data[IFLA_AMT_DISCOVERY_IP ]); if (ipv4_is_loopback(amt->discovery_ip) || ipv4_is_zeronet(amt->discovery_ip) ||
@@ -3308,8 +3313,10 @@ static size_t amt_get_size(const struct net_device *dev)static int amt_fill_info (struct sk_buff *skb,const struct net_device *dev) { -struct amt_dev *amt =netdev_priv (dev); +const struct amt_dev *amt =netdev_priv (dev); +__be32 remote_ip; +rcu_read_lock ();if (nla_put_u32 (skb,IFLA_AMT_MODE , amt->mode)) goto nla_put_failure;if (nla_put_be16 (skb,IFLA_AMT_RELAY_PORT , amt->relay_port))
@@ -3322,15 +3329,19 @@ static int amt_fill_info(struct sk_buff *skb, const struct net_device *dev) goto nla_put_failure;if (nla_put_in_addr (skb,IFLA_AMT_DISCOVERY_IP , amt->discovery_ip)) goto nla_put_failure; -if (amt->remote_ip) -if (nla_put_in_addr (skb,IFLA_AMT_REMOTE_IP , amt->remote_ip)) + + remote_ip =READ_ONCE (amt->remote_ip); +if (remote_ip) +if (nla_put_in_addr (skb,IFLA_AMT_REMOTE_IP , remote_ip)) goto nla_put_failure;if (nla_put_u32 (skb,IFLA_AMT_MAX_TUNNELS , amt->max_tunnels)) goto nla_put_failure; +rcu_read_unlock ();return 0 ; nla_put_failure: +rcu_read_unlock ();return -EMSGSIZE ; }
Signature · 1 line
2.55.0.rc0.799.gd6f94ed593-goog
Quoted 9 lines · Eric Dumazet
Update
amt_fill_info()to run under RCU read lock instead of RTNL.The AMT device configuration fields (mode,
relay_port,gw_port,local_ip,discovery_ip,max_tunnels) andstream_devpointer are initialized during device creation (amt_newlink) and are immutable. Accessing them locklessly is safe. Thestream_devnet_devicestructure is protected from being freed by RCU.
Quoted 6 lines
The only field that can change concurrently is
amt->remote_ip, which is updated in the packet receive path (amt_advertisement_handler) and workqueue (amt_req_work). Add READ_ONCE()/WRITE_ONCE() annotations aroundamt->remote_ipto prevent data races.Signed-off-by Eric Dumazet <[email protected]>
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Wed, 1 Jul 2026 12:50:16 +0000 you wrote:
Update
amt_fill_info()to run under RCU read lock instead of RTNL.The AMT device configuration fields (mode,
relay_port,gw_port,local_ip,discovery_ip,max_tunnels) andstream_devpointer are initialized during device creation (amt_newlink) and are immutable. Accessing them locklessly is safe. Thestream_devnet_devicestructure is protected from being freed by RCU.[...]
Here is the summary with links:
- [net-next] amt: no longer rely on RTNL in amt_fill_info()
https://git.kernel.org/netdev/net-next/c/586c4dcf28eb
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html