udp: gso: do not drop small packets when PMTU reduces

[ Upstream commit 235174b2bed88501fda689c113c55737f99332d8 ]

Commit 4094871db1d6 ("udp: only do GSO if # of segs > 1") avoided GSO
for small packets. But the kernel currently dismisses GSO requests only
after checking MTU/PMTU on gso_size. This means any packets, regardless
of their payload sizes, could be dropped when PMTU becomes smaller than
requested gso_size. We encountered this issue in production and it
caused a reliability problem that new QUIC connection cannot be
established before PMTU cache expired, while non GSO sockets still
worked fine at the same time.

Ideally, do not check any GSO related constraints when payload size is
smaller than requested gso_size, and return EMSGSIZE instead of EINVAL
on MTU/PMTU check failure to be more specific on the error cause.

Fixes: 4094871db1d6 ("udp: only do GSO if # of segs > 1")
Signed-off-by: Yan Zhai <yan@cloudflare.com>
Suggested-by: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index d2eeb6fc49b382f372e6c7ccf0e34ac9fe08fcfc..8da74dc63061c08e93fa98f05fd10de4c8628a23 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -985,9 +985,9 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4,
                const int hlen = skb_network_header_len(skb) +
                                 sizeof(struct udphdr);
 
-               if (hlen + cork->gso_size > cork->fragsize) {
+               if (hlen + min(datalen, cork->gso_size) > cork->fragsize) {
                        kfree_skb(skb);
-                       return -EINVAL;
+                       return -EMSGSIZE;
                }
                if (datalen > cork->gso_size * UDP_MAX_SEGMENTS) {
                        kfree_skb(skb);

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 896c9c827a288c7b842235a3b37e7f912f0faae9..197d0ac47592ad15ceb887aa70276d91cef7abb7 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1294,9 +1294,9 @@ static int udp_v6_send_skb(struct sk_buff *skb, struct flowi6 *fl6,
                const int hlen = skb_network_header_len(skb) +
                                 sizeof(struct udphdr);
 
-               if (hlen + cork->gso_size > cork->fragsize) {
+               if (hlen + min(datalen, cork->gso_size) > cork->fragsize) {
                        kfree_skb(skb);
-                       return -EINVAL;
+                       return -EMSGSIZE;
                }
                if (datalen > cork->gso_size * UDP_MAX_SEGMENTS) {
                        kfree_skb(skb);

diff --git a/tools/testing/selftests/net/udpgso.c b/tools/testing/selftests/net/udpgso.c
index 3f2fca02fec53f52beaddb43ea4255bca24b79b8..36ff28af4b19059204728d13c0155c5a5cc84bba 100644 (file)
--- a/tools/testing/selftests/net/udpgso.c
+++ b/tools/testing/selftests/net/udpgso.c
@@ -102,6 +102,19 @@ struct testcase testcases_v4[] = {
                .gso_len = CONST_MSS_V4,
                .r_num_mss = 1,
        },
+       {
+               /* datalen <= MSS < gso_len: will fall back to no GSO */
+               .tlen = CONST_MSS_V4,
+               .gso_len = CONST_MSS_V4 + 1,
+               .r_num_mss = 0,
+               .r_len_last = CONST_MSS_V4,
+       },
+       {
+               /* MSS < datalen < gso_len: fail */
+               .tlen = CONST_MSS_V4 + 1,
+               .gso_len = CONST_MSS_V4 + 2,
+               .tfail = true,
+       },
        {
                /* send a single MSS + 1B */
                .tlen = CONST_MSS_V4 + 1,
@@ -205,6 +218,19 @@ struct testcase testcases_v6[] = {
                .gso_len = CONST_MSS_V6,
                .r_num_mss = 1,
        },
+       {
+               /* datalen <= MSS < gso_len: will fall back to no GSO */
+               .tlen = CONST_MSS_V6,
+               .gso_len = CONST_MSS_V6 + 1,
+               .r_num_mss = 0,
+               .r_len_last = CONST_MSS_V6,
+       },
+       {
+               /* MSS < datalen < gso_len: fail */
+               .tlen = CONST_MSS_V6 + 1,
+               .gso_len = CONST_MSS_V6 + 2,
+               .tfail = true
+       },
        {
                /* send a single MSS + 1B */
                .tlen = CONST_MSS_V6 + 1,