net/core/dev.c | 5 ++++- net/sched/sch_cake.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
Refine qdisc_pkt_len_init to include headers up through
the inner transport header when computing header size
for encapsulations. Also refine net/sched/sch_cake.c
borrowed from qdisc_pkt_len_init().
Signed-off-by: Fengyuan Gong <gfengyuan@google.com>
---
net/core/dev.c | 5 ++++-
net/sched/sch_cake.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 11da1e272ec20..dfec541f68e3a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3944,7 +3944,10 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
unsigned int hdr_len;
/* mac layer + network layer */
- hdr_len = skb_transport_offset(skb);
+ if (!skb->encapsulation)
+ hdr_len = skb_transport_offset(skb);
+ else
+ hdr_len = skb_inner_transport_offset(skb);
/* + transport layer */
if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) {
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c
index 48dd8c88903fe..dbcfb948c8670 100644
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@ -1407,7 +1407,10 @@ static u32 cake_overhead(struct cake_sched_data *q, const struct sk_buff *skb)
return cake_calc_overhead(q, len, off);
/* borrowed from qdisc_pkt_len_init() */
- hdr_len = skb_transport_offset(skb);
+ if (!skb->encapsulation)
+ hdr_len = skb_transport_offset(skb);
+ else
+ hdr_len = skb_inner_transport_offset(skb);
/* + transport layer */
if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 |
--
2.50.0.727.gbf7dc18ff4-googOn Wed, Jul 02, 2025 at 04:07:41PM +0000, Fengyuan Gong wrote:
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 11da1e272ec20..dfec541f68e3a 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -3944,7 +3944,10 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
> unsigned int hdr_len;
>
> /* mac layer + network layer */
> - hdr_len = skb_transport_offset(skb);
> + if (!skb->encapsulation)
> + hdr_len = skb_transport_offset(skb);
> + else
> + hdr_len = skb_inner_transport_offset(skb);
This pattern seems repeated in a few places, other than the two you are
patching, I saw another one:
2465 static netdev_features_t hns3_features_check(struct sk_buff *skb,
2466 struct net_device *dev,
2467 netdev_features_t features)
2468 {
2469 #define HNS3_MAX_HDR_LEN 480U
2470 #define HNS3_MAX_L4_HDR_LEN 60U
2471
2472 size_t len;
2473
2474 if (skb->ip_summed != CHECKSUM_PARTIAL)
2475 return features;
2476
2477 if (skb->encapsulation)
2478 len = skb_inner_transport_offset(skb);
2479 else
2480 len = skb_transport_offset(skb);
Maybe worth a helper now?
Thanks!
Cong Wang wrote:
> On Wed, Jul 02, 2025 at 04:07:41PM +0000, Fengyuan Gong wrote:
> > diff --git a/net/core/dev.c b/net/core/dev.c
> > index 11da1e272ec20..dfec541f68e3a 100644
> > --- a/net/core/dev.c
> > +++ b/net/core/dev.c
> > @@ -3944,7 +3944,10 @@ static void qdisc_pkt_len_init(struct sk_buff *skb)
> > unsigned int hdr_len;
> >
> > /* mac layer + network layer */
> > - hdr_len = skb_transport_offset(skb);
> > + if (!skb->encapsulation)
> > + hdr_len = skb_transport_offset(skb);
> > + else
> > + hdr_len = skb_inner_transport_offset(skb);
>
> This pattern seems repeated in a few places, other than the two you are
> patching, I saw another one:
>
> 2465 static netdev_features_t hns3_features_check(struct sk_buff *skb,
> 2466 struct net_device *dev,
> 2467 netdev_features_t features)
> 2468 {
> 2469 #define HNS3_MAX_HDR_LEN 480U
> 2470 #define HNS3_MAX_L4_HDR_LEN 60U
> 2471
> 2472 size_t len;
> 2473
> 2474 if (skb->ip_summed != CHECKSUM_PARTIAL)
> 2475 return features;
> 2476
> 2477 if (skb->encapsulation)
> 2478 len = skb_inner_transport_offset(skb);
> 2479 else
> 2480 len = skb_transport_offset(skb);
From a quick grep, this is the only other case, right?
> Maybe worth a helper now?
If only one more, I wouldn't respin for that.
Fengyuan Gong <gfengyuan@google.com> writes: > Refine qdisc_pkt_len_init to include headers up through > the inner transport header when computing header size > for encapsulations. Also refine net/sched/sch_cake.c > borrowed from qdisc_pkt_len_init(). > > Signed-off-by: Fengyuan Gong <gfengyuan@google.com> Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Fengyuan Gong wrote: > Refine qdisc_pkt_len_init to include headers up through > the inner transport header when computing header size > for encapsulations. Also refine net/sched/sch_cake.c > borrowed from qdisc_pkt_len_init(). > > Signed-off-by: Fengyuan Gong <gfengyuan@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com>
On Wed, Jul 2, 2025 at 9:53 AM Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > > Fengyuan Gong wrote: > > Refine qdisc_pkt_len_init to include headers up through > > the inner transport header when computing header size > > for encapsulations. Also refine net/sched/sch_cake.c > > borrowed from qdisc_pkt_len_init(). > > > > Signed-off-by: Fengyuan Gong <gfengyuan@google.com> > > Reviewed-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Eric Dumazet <edumazet@google.com>
© 2016 - 2026 Red Hat, Inc.