net_sched: initialize qdisc_skb_cb(skb)->pkt_segs in qdisc_pkt_len_init()

qdisc_pkt_len_init() is currently initalizing qdisc_skb_cb(skb)->pkt_len.

Add qdisc_skb_cb(skb)->pkt_segs initialization and rename this function
to qdisc_pkt_len_segs_init().

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20251121083256.674562-4-edumazet@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/core/dev.c b/net/core/dev.c
index dba9eef8bd83dda89b5edd870b47373722264f48..895c3e37e686f0f625bd5eec7079a43cbd33a7eb 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4069,17 +4069,23 @@ struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *d
 }
 EXPORT_SYMBOL_GPL(validate_xmit_skb_list);
 
-static void qdisc_pkt_len_init(struct sk_buff *skb)
+static void qdisc_pkt_len_segs_init(struct sk_buff *skb)
 {
        struct skb_shared_info *shinfo = skb_shinfo(skb);
+       u16 gso_segs;
 
        qdisc_skb_cb(skb)->pkt_len = skb->len;
+       if (!shinfo->gso_size) {
+               qdisc_skb_cb(skb)->pkt_segs = 1;
+               return;
+       }
+
+       qdisc_skb_cb(skb)->pkt_segs = gso_segs = shinfo->gso_segs;
 
        /* To get more precise estimation of bytes sent on wire,
         * we add to pkt_len the headers size of all segments
         */
-       if (shinfo->gso_size && skb_transport_header_was_set(skb)) {
-               u16 gso_segs = shinfo->gso_segs;
+       if (skb_transport_header_was_set(skb)) {
                unsigned int hdr_len;
 
                /* mac layer + network layer */
@@ -4113,6 +4119,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
                                return;
                        gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size);
                        shinfo->gso_segs = gso_segs;
+                       qdisc_skb_cb(skb)->pkt_segs = gso_segs;
                }
                qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len;
        }
@@ -4738,7 +4745,7 @@ int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev)
 
        skb_update_prio(skb);
 
-       qdisc_pkt_len_init(skb);
+       qdisc_pkt_len_segs_init(skb);
        tcx_set_ingress(skb, false);
 #ifdef CONFIG_NET_EGRESS
        if (static_branch_unlikely(&egress_needed_key)) {

diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 32bacfc314c260dccf94178d309ccb2be22d69e4..9213129f0de10bc67ce418f77c36fed2581f3781 100644 (file)
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1406,7 +1406,7 @@ static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb)
        if (!shinfo->gso_size)
                return cake_calc_overhead(q, len, off);
 
-       /* borrowed from qdisc_pkt_len_init() */
+       /* borrowed from qdisc_pkt_len_segs_init() */
        if (!skb->encapsulation)
                hdr_len = skb_transport_offset(skb);
        else