Commit 4094871d authored by Josh Hunt's avatar Josh Hunt Committed by David S. Miller
Browse files

udp: only do GSO if # of segs > 1 



Prior to this change an application sending <= 1MSS worth of data and
enabling UDP GSO would fail if the system had SW GSO enabled, but the
same send would succeed if HW GSO offload is enabled. In addition to this
inconsistency the error in the SW GSO case does not get back to the
application if sending out of a real device so the user is unaware of this
failure.

With this change we only perform GSO if the # of segments is > 1 even
if the application has enabled segmentation. I've also updated the
relevant udpgso selftests.

Fixes: bec1f6f6 ("udp: generate gso with UDP_SEGMENT")
Signed-off-by: default avatarJosh Hunt <johunt@akamai.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44b321e5

net/ipv4/udp.c

+7 −4
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4, 
	int is_udplite = IS_UDPLITE(sk);

	int offset = skb_transport_offset(skb);

	int len = skb->len - offset;

	int datalen = len - sizeof(*uh);

	__wsum csum = 0;



	/*
@@ -854,10 +855,12 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4, 
			return -EIO;

		}



		if (datalen > cork->gso_size) {

			skb_shinfo(skb)->gso_size = cork->gso_size;

			skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;

		skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(*uh),

			skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(datalen,

								 cork->gso_size);

		}

		goto csum_partial;

	}

net/ipv6/udp.c

+7 −4
Original line number Diff line number Diff line
@@ -1109,6 +1109,7 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6, 
	__wsum csum = 0;

	int offset = skb_transport_offset(skb);

	int len = skb->len - offset;

	int datalen = len - sizeof(*uh);



	/*

	 * Create a UDP header
@@ -1141,10 +1142,12 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6, 
			return -EIO;

		}



		if (datalen > cork->gso_size) {

			skb_shinfo(skb)->gso_size = cork->gso_size;

			skb_shinfo(skb)->gso_type = SKB_GSO_UDP_L4;

		skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(len - sizeof(*uh),

			skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(datalen,

								 cork->gso_size);

		}

		goto csum_partial;

	}

tools/testing/selftests/net/udpgso.c

+4 −12
Original line number Diff line number Diff line
@@ -89,12 +89,9 @@ struct testcase testcases_v4[] = { 
		.tfail = true,

	},

	{

		/* send a single MSS: will fail with GSO, because the segment

		 * logic in udp4_ufo_fragment demands a gso skb to be > MTU

		 */

		/* send a single MSS: will fall back to no GSO */

		.tlen = CONST_MSS_V4,

		.gso_len = CONST_MSS_V4,

		.tfail = true,

		.r_num_mss = 1,

	},

	{
@@ -139,10 +136,9 @@ struct testcase testcases_v4[] = { 
		.tfail = true,

	},

	{

		/* send a single 1B MSS: will fail, see single MSS above */

		/* send a single 1B MSS: will fall back to no GSO */

		.tlen = 1,

		.gso_len = 1,

		.tfail = true,

		.r_num_mss = 1,

	},

	{
@@ -196,12 +192,9 @@ struct testcase testcases_v6[] = { 
		.tfail = true,

	},

	{

		/* send a single MSS: will fail with GSO, because the segment

		 * logic in udp4_ufo_fragment demands a gso skb to be > MTU

		 */

		/* send a single MSS: will fall back to no GSO */

		.tlen = CONST_MSS_V6,

		.gso_len = CONST_MSS_V6,

		.tfail = true,

		.r_num_mss = 1,

	},

	{
@@ -246,10 +239,9 @@ struct testcase testcases_v6[] = { 
		.tfail = true,

	},

	{

		/* send a single 1B MSS: will fail, see single MSS above */

		/* send a single 1B MSS: will fall back to no GSO */

		.tlen = 1,

		.gso_len = 1,

		.tfail = true,

		.r_num_mss = 1,

	},

	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE