net: netem: fix backlog accounting for corrupted GSO frames

BugLink: https://bugs.launchpad.net/bugs/1863019
[ Upstream commit 177b8007463c4f36c9a2c7ce7aa9875a4cad9bd5 ]

When GSO frame has to be corrupted netem uses skb_gso_segment()
to produce the list of frames, and re-enqueues the segments one
by one.  The backlog length has to be adjusted to account for
new frames.

The current calculation is incorrect, leading to wrong backlog
lengths in the parent qdisc (both bytes and packets), and
incorrect packet backlog count in netem itself.

Parent backlog goes negative, netem's packet backlog counts
all non-first segments twice (thus remaining non-zero even
after qdisc is emptied).

Move the variables used to count the adjustment into local
scope to make 100% sure they aren't used at any stage in
backports.

Fixes: 6071bd1aa13e ("netem: Segment GSO packets on enqueue")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index bffcfc64eb6d7255a2359690fc8f689e5c88c6bf..402bd05c17a427df3944fff0854220983ae7d0d4 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -433,8 +433,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
        struct netem_skb_cb *cb;
        struct sk_buff *skb2;
        struct sk_buff *segs = NULL;
-       unsigned int len = 0, last_len, prev_len = qdisc_pkt_len(skb);
-       int nb = 0;
+       unsigned int prev_len = qdisc_pkt_len(skb);
        int count = 1;
        int rc = NET_XMIT_SUCCESS;
        int rc_drop = NET_XMIT_DROP;
@@ -491,6 +490,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                        segs = netem_segment(skb, sch, to_free);
                        if (!segs)
                                return rc_drop;
+                       qdisc_skb_cb(segs)->pkt_len = segs->len;
                } else {
                        segs = skb;
                }
@@ -580,6 +580,11 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 
 finish_segs:
        if (segs) {
+               unsigned int len, last_len;
+               int nb = 0;
+
+               len = skb->len;
+
                while (segs) {
                        skb2 = segs->next;
                        segs->next = NULL;
@@ -595,9 +600,7 @@ finish_segs:
                        }
                        segs = skb2;
                }
-               sch->q.qlen += nb;
-               if (nb > 1)
-                       qdisc_tree_reduce_backlog(sch, 1 - nb, prev_len - len);
+               qdisc_tree_reduce_backlog(sch, -nb, prev_len - len);
        }
        return NET_XMIT_SUCCESS;
 }