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

Merge branch 'frag-udp-tunneled-skbs' 



Shmulik Ladkani says:

====================
net: Consider fragmentation of udp tunneled skbs in 'ip_finish_output_gso'

Currently IP fragmentation of GSO segments that exceed dst mtu is
considered only in the ipv4 forwarding case.

There are cases where GSO skbs that are bridged and then udp-tunneled
may have gso_size exceeding the egress device mtu.
It makes sense to fragment them, as in the non GSOed code path.

The exact cases where this behavior is needed is described and addressed
in the 2nd patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dfa15378 b8247f09

include/net/ip.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct inet_skb_parm { 
#define IPSKB_REROUTED		BIT(4)

#define IPSKB_DOREDIRECT	BIT(5)

#define IPSKB_FRAG_PMTU		BIT(6)

#define IPSKB_FRAG_SEGS		BIT(7)



	u16			frag_max_size;

};

net/ipv4/ip_forward.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int ip_forward(struct sk_buff *skb) 
	if (opt->is_strictroute && rt->rt_uses_gateway)

		goto sr_failed;



	IPCB(skb)->flags |= IPSKB_FORWARDED;

	IPCB(skb)->flags |= IPSKB_FORWARDED | IPSKB_FRAG_SEGS;

	mtu = ip_dst_mtu_maybe_forward(&rt->dst, true);

	if (ip_exceeds_mtu(skb, mtu)) {

		IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);

net/ipv4/ip_output.c

+4 −2
Original line number Diff line number Diff line
@@ -223,8 +223,10 @@ static int ip_finish_output_gso(struct net *net, struct sock *sk, 
	struct sk_buff *segs;

	int ret = 0;



	/* common case: locally created skb or seglen is <= mtu */

	if (((IPCB(skb)->flags & IPSKB_FORWARDED) == 0) ||

	/* common case: fragmentation of segments is not allowed,

	 * or seglen is <= mtu

	 */

	if (((IPCB(skb)->flags & IPSKB_FRAG_SEGS) == 0) ||

	      skb_gso_validate_mtu(skb, mtu))

		return ip_finish_output2(net, sk, skb);

net/ipv4/ip_tunnel_core.c

+9 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
	int pkt_len = skb->len - skb_inner_network_offset(skb);

	struct net *net = dev_net(rt->dst.dev);

	struct net_device *dev = skb->dev;

	int skb_iif = skb->skb_iif;

	struct iphdr *iph;

	int err;
@@ -72,6 +73,14 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb, 
	skb_dst_set(skb, &rt->dst);

	memset(IPCB(skb), 0, sizeof(*IPCB(skb)));



	if (skb_iif && proto == IPPROTO_UDP) {

		/* Arrived from an ingress interface and got udp encapuslated.

		 * The encapsulated network segment length may exceed dst mtu.

		 * Allow IP Fragmentation of segments.

		 */

		IPCB(skb)->flags |= IPSKB_FRAG_SEGS;

	}



	/* Push down and install the IP header. */

	skb_push(skb, sizeof(struct iphdr));

	skb_reset_network_header(skb);

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -1749,7 +1749,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, 
		vif->dev->stats.tx_bytes += skb->len;

	}



	IPCB(skb)->flags |= IPSKB_FORWARDED;

	IPCB(skb)->flags |= IPSKB_FORWARDED | IPSKB_FRAG_SEGS;



	/* RFC1584 teaches, that DVMRP/PIM router must deliver packets locally

	 * not only before forwarding, but after forwarding on all output

CRA Git | Maintained and supported by SUSTech CRA and CCSE