diff options
Diffstat (limited to 'target/linux/generic/backport-4.19/391-v5.1-sch_cake-Correctly-update-parent-qlen-when-splitting.patch')
| -rw-r--r-- | target/linux/generic/backport-4.19/391-v5.1-sch_cake-Correctly-update-parent-qlen-when-splitting.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Correctly-update-parent-qlen-when-splitting.patch b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Correctly-update-parent-qlen-when-splitting.patch new file mode 100644 index 0000000000..f6de44568a --- /dev/null +++ b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Correctly-update-parent-qlen-when-splitting.patch @@ -0,0 +1,50 @@ +From 8c6c37fdc20ec9ffaa342f827a8e20afe736fb0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com> +Date: Wed, 9 Jan 2019 17:09:44 +0100 +Subject: [PATCH] sch_cake: Correctly update parent qlen when splitting GSO + packets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +To ensure parent qdiscs have the same notion of the number of enqueued +packets even after splitting a GSO packet, update the qdisc tree with the +number of packets that was added due to the split. + +Reported-by: Pete Heist <pete@heistp.net> +Tested-by: Pete Heist <pete@heistp.net> +Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> +--- + net/sched/sch_cake.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/net/sched/sch_cake.c ++++ b/net/sched/sch_cake.c +@@ -1666,7 +1666,7 @@ static s32 cake_enqueue(struct sk_buff * + if (skb_is_gso(skb) && q->rate_flags & CAKE_FLAG_SPLIT_GSO) { + struct sk_buff *segs, *nskb; + netdev_features_t features = netif_skb_features(skb); +- unsigned int slen = 0; ++ unsigned int slen = 0, numsegs = 0; + + segs = skb_gso_segment(skb, features & ~NETIF_F_GSO_MASK); + if (IS_ERR_OR_NULL(segs)) +@@ -1682,6 +1682,7 @@ static s32 cake_enqueue(struct sk_buff * + flow_queue_add(flow, segs); + + sch->q.qlen++; ++ numsegs++; + slen += segs->len; + q->buffer_used += segs->truesize; + b->packets++; +@@ -1695,7 +1696,7 @@ static s32 cake_enqueue(struct sk_buff * + sch->qstats.backlog += slen; + q->avg_window_bytes += slen; + +- qdisc_tree_reduce_backlog(sch, 1, len); ++ qdisc_tree_reduce_backlog(sch, 1-numsegs, len-slen); + consume_skb(skb); + } else { + /* not splitting */ |