]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: sched: tbf: handle GSO_BY_FRAGS case in enqueue
authorDaniel Axtens <dja@axtens.net>
Thu, 1 Mar 2018 06:13:38 +0000 (17:13 +1100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Mar 2018 22:49:17 +0000 (17:49 -0500)
tbf_enqueue() checks the size of a packet before enqueuing it.
However, the GSO size check does not consider the GSO_BY_FRAGS
case, and so will drop GSO SCTP packets, causing a massive drop
in throughput.

Use skb_gso_validate_mac_len() instead, as it does consider that
case.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_tbf.c

index 229172d509cc5d189b926f15ec06785c7f6303ab..03225a8df9730cee7e020331b42a805d42b6f25c 100644 (file)
@@ -188,7 +188,8 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc *sch,
        int ret;
 
        if (qdisc_pkt_len(skb) > q->max_size) {
-               if (skb_is_gso(skb) && skb_gso_mac_seglen(skb) <= q->max_size)
+               if (skb_is_gso(skb) &&
+                   skb_gso_validate_mac_len(skb, q->max_size))
                        return tbf_segment(skb, sch, to_free);
                return qdisc_drop(skb, sch, to_free);
        }