Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3695e97 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vxlan-geneve-rcu-fixes' 

Jakub Kicinski says:

====================
VXLAN/geneve RCU fixes

VXLAN and GENEVE need to take RCU lock explicitly because TX path
only has the _bh() flavour of RCU locked.  Making the reconfiguration
path wait for both normal and _bh() RCU would be bigger hassle so
just acquire the lock, as suggested by Pravin:

https://www.mail-archive.com/netdev@vger.kernel.org/msg155583.html


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 39e6c820 a717e3f7

drivers/net/geneve.c

+2 −0
Original line number Diff line number Diff line
@@ -881,12 +881,14 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) 
		info = &geneve->info;

	}



	rcu_read_lock();

#if IS_ENABLED(CONFIG_IPV6)

	if (info->mode & IP_TUNNEL_INFO_IPV6)

		err = geneve6_xmit_skb(skb, dev, geneve, info);

	else

#endif

		err = geneve_xmit_skb(skb, dev, geneve, info);

	rcu_read_unlock();



	if (likely(!err))

		return NETDEV_TX_OK;

drivers/net/vxlan.c

+6 −2
Original line number Diff line number Diff line
@@ -2105,6 +2105,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	src_port = udp_flow_src_port(dev_net(dev), skb, vxlan->cfg.port_min,

				     vxlan->cfg.port_max, true);



	rcu_read_lock();

	if (dst->sa.sa_family == AF_INET) {

		struct vxlan_sock *sock4 = rcu_dereference(vxlan->vn4_sock);

		struct rtable *rt;
@@ -2127,7 +2128,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
						    dst_port, vni, &rt->dst,

						    rt->rt_flags);

			if (err)

				return;

				goto out_unlock;

		} else if (info->key.tun_flags & TUNNEL_DONT_FRAGMENT) {

			df = htons(IP_DF);

		}
@@ -2166,7 +2167,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
						    dst_port, vni, ndst,

						    rt6i_flags);

			if (err)

				return;

				goto out_unlock;

		}



		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
@@ -2183,6 +2184,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
				     label, src_port, dst_port, !udp_sum);

#endif

	}

out_unlock:

	rcu_read_unlock();

	return;



drop:
@@ -2191,6 +2194,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
	return;



tx_error:

	rcu_read_unlock();

	if (err == -ELOOP)

		dev->stats.collisions++;

	else if (err == -ENETUNREACH)