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

Commit 79b16aad authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb(). 



That was we can make sure the output path of ipv4/ipv6 operate on
the UDP socket rather than whatever random thing happens to be in
skb->sk.

Based upon a patch by Jiri Pirko.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
parent 7026b1dd

drivers/net/vxlan.c

+8 −6
Original line number Diff line number Diff line
@@ -1672,7 +1672,8 @@ static void vxlan_build_gbp_hdr(struct vxlanhdr *vxh, u32 vxflags, 
}



#if IS_ENABLED(CONFIG_IPV6)

static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,

static int vxlan6_xmit_skb(struct dst_entry *dst, struct sock *sk,

			   struct sk_buff *skb,

			   struct net_device *dev, struct in6_addr *saddr,

			   struct in6_addr *daddr, __u8 prio, __u8 ttl,

			   __be16 src_port, __be16 dst_port,
@@ -1748,7 +1749,7 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, 


	skb_set_inner_protocol(skb, htons(ETH_P_TEB));



	udp_tunnel6_xmit_skb(dst, skb, dev, saddr, daddr, prio,

	udp_tunnel6_xmit_skb(dst, sk, skb, dev, saddr, daddr, prio,

			     ttl, src_port, dst_port,

			     !!(vxflags & VXLAN_F_UDP_ZERO_CSUM6_TX));

	return 0;
@@ -1758,7 +1759,7 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb, 
}

#endif



int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb,

int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,

		   __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,

		   __be16 src_port, __be16 dst_port,

		   struct vxlan_metadata *md, bool xnet, u32 vxflags)
@@ -1827,7 +1828,7 @@ int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb, 


	skb_set_inner_protocol(skb, htons(ETH_P_TEB));



	return udp_tunnel_xmit_skb(rt, skb, src, dst, tos,

	return udp_tunnel_xmit_skb(rt, sk, skb, src, dst, tos,

				   ttl, df, src_port, dst_port, xnet,

				   !(vxflags & VXLAN_F_UDP_CSUM));

}
@@ -1882,6 +1883,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
			   struct vxlan_rdst *rdst, bool did_rsc)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct sock *sk = vxlan->vn_sock->sock->sk;

	struct rtable *rt = NULL;

	const struct iphdr *old_iph;

	struct flowi4 fl4;
@@ -1961,7 +1963,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		md.vni = htonl(vni << 8);

		md.gbp = skb->mark;



		err = vxlan_xmit_skb(rt, skb, fl4.saddr,

		err = vxlan_xmit_skb(rt, sk, skb, fl4.saddr,

				     dst->sin.sin_addr.s_addr, tos, ttl, df,

				     src_port, dst_port, &md,

				     !net_eq(vxlan->net, dev_net(vxlan->dev)),
@@ -2021,7 +2023,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
		md.vni = htonl(vni << 8);

		md.gbp = skb->mark;



		err = vxlan6_xmit_skb(ndst, skb, dev, &fl6.saddr, &fl6.daddr,

		err = vxlan6_xmit_skb(ndst, sk, skb, dev, &fl6.saddr, &fl6.daddr,

				      0, ttl, src_port, dst_port, &md,

				      !net_eq(vxlan->net, dev_net(vxlan->dev)),

				      vxlan->flags);

include/net/ip6_tunnel.h

+3 −2
Original line number Diff line number Diff line
@@ -73,13 +73,14 @@ __u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr, 
struct net *ip6_tnl_get_link_net(const struct net_device *dev);

int ip6_tnl_get_iflink(const struct net_device *dev);



static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,

				  struct net_device *dev)

{

	struct net_device_stats *stats = &dev->stats;

	int pkt_len, err;



	pkt_len = skb->len;

	err = ip6_local_out(skb);

	err = ip6_local_out_sk(sk, skb);



	if (net_xmit_eval(err) == 0) {

		struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);

include/net/ipv6.h

+1 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ int ip6_input(struct sk_buff *skb); 
int ip6_mc_input(struct sk_buff *skb);



int __ip6_local_out(struct sk_buff *skb);

int ip6_local_out_sk(struct sock *sk, struct sk_buff *skb);

int ip6_local_out(struct sk_buff *skb);



/*

include/net/udp_tunnel.h

+3 −2
Original line number Diff line number Diff line
@@ -77,13 +77,14 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock, 
			   struct udp_tunnel_sock_cfg *sock_cfg);



/* Transmit the skb using UDP encapsulation. */

int udp_tunnel_xmit_skb(struct rtable *rt, struct sk_buff *skb,

int udp_tunnel_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,

			__be32 src, __be32 dst, __u8 tos, __u8 ttl,

			__be16 df, __be16 src_port, __be16 dst_port,

			bool xnet, bool nocheck);



#if IS_ENABLED(CONFIG_IPV6)

int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sk_buff *skb,

int udp_tunnel6_xmit_skb(struct dst_entry *dst, struct sock *sk,

			 struct sk_buff *skb,

			 struct net_device *dev, struct in6_addr *saddr,

			 struct in6_addr *daddr,

			 __u8 prio, __u8 ttl, __be16 src_port,

include/net/vxlan.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, 


void vxlan_sock_release(struct vxlan_sock *vs);



int vxlan_xmit_skb(struct rtable *rt, struct sk_buff *skb,

int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,

		   __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df,

		   __be16 src_port, __be16 dst_port, struct vxlan_metadata *md,

		   bool xnet, u32 vxflags);