git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-18 03:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eric Dumazet
2025-11-21 08:32:45 +00:00
committed by Paolo Abeni
parent be1b70ab21
commit 874c1928d3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/core/dev.c
View File

@@ -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); 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); struct skb_shared_info *shinfo = skb_shinfo(skb);
u16 gso_segs;
qdisc_skb_cb(skb)->pkt_len = skb->len; 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, /* To get more precise estimation of bytes sent on wire,
* we add to pkt_len the headers size of all segments * we add to pkt_len the headers size of all segments
*/ */
if (shinfo->gso_size && skb_transport_header_was_set(skb)) { if (skb_transport_header_was_set(skb)) {
u16 gso_segs = shinfo->gso_segs;
unsigned int hdr_len; unsigned int hdr_len;
/* mac layer + network layer */ /* mac layer + network layer */
@@ -4113,6 +4119,7 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
return; return;
gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size); gso_segs = DIV_ROUND_UP(payload, shinfo->gso_size);
shinfo->gso_segs = gso_segs; shinfo->gso_segs = gso_segs;
qdisc_skb_cb(skb)->pkt_segs = gso_segs;
} }
qdisc_skb_cb(skb)->pkt_len += (gso_segs - 1) * hdr_len; 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); skb_update_prio(skb);
qdisc_pkt_len_init(skb); qdisc_pkt_len_segs_init(skb);
tcx_set_ingress(skb, false); tcx_set_ingress(skb, false);
#ifdef CONFIG_NET_EGRESS #ifdef CONFIG_NET_EGRESS
if (static_branch_unlikely(&egress_needed_key)) { if (static_branch_unlikely(&egress_needed_key)) {

2
net/sched/sch_cake.c
View File

@@ -1406,7 +1406,7 @@ static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb)
if (!shinfo->gso_size) if (!shinfo->gso_size)
return cake_calc_overhead(q, len, off); return cake_calc_overhead(q, len, off);
/* borrowed from qdisc_pkt_len_init() */ /* borrowed from qdisc_pkt_len_segs_init() */
if (!skb->encapsulation) if (!skb->encapsulation)
hdr_len = skb_transport_offset(skb); hdr_len = skb_transport_offset(skb);
else else