From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3UlllaAkKBOMLKJSLdZFSLTTLQJ.HTRHFPJQNXYX.GZKKJWGQTFY.SJY@flex--gfengyuan.bounces.google.com> Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 4B8E73CB37 for ; Wed, 2 Jul 2025 12:07:47 -0400 (EDT) Received: by mail-qv1-xf49.google.com with SMTP id 6a1803df08f44-6fb3654112fso160618386d6.3 for ; Wed, 02 Jul 2025 09:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751472467; x=1752077267; darn=lists.bufferbloat.net; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=SpkubWRCAgA3n9kTQKYoyEm6Wf3b95Ji8UJpkdBVSfE=; b=IVnuXVlNp0PwSHoo+rrnV9jBydzc/rzqg1tAQzaQujjZHoBs6Us+7CgHfPvmRhgE1L ezF1a2isFV2kRMyNUEDeK7sAYO7gqZ0e0AhHPGscxDqT0Od1dXULvEJpO0MTPaiiHA0V iQPxebuT1abalSV6XSDl1AP/+kZoYw4ovDW+fRzINyiVc4yO/4e/qiU+A8nihJ2wP2yQ /AAcq1xFKsJ1uXw557GIQcehXrReh8LL+gO95i1hKj6+sTk7w/8D4tr4yf3mVUf4p4yZ AKsfGUA3PYt/H3fTY6gMGdm+ovYdhkIwdoraCG4rXQnY++ZfGIn54GyLCvS9jXEwaJXW nbeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751472467; x=1752077267; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SpkubWRCAgA3n9kTQKYoyEm6Wf3b95Ji8UJpkdBVSfE=; b=r1jk3955yxKFP7JNqEncpFU2Q+SDZzIElgNLs7JNTTR/QFb15tUJ8p5yg0iMgJ5zgc 2hjXIx2rMIrYa252xxkQcEgq3JyPTPbovFHH0Uk04NG8Pa6MBUtd9sB6WkWiR+NE3cnf jg60aOJQJ1fZn1hXtXS013CXRtvEZ4vtvKsmT7sit4A+wVAqTjliS1iev1fgrzLEMnsX 54DpnRdP4ZPm6QA1fnEKE2do9z3FbiuaROHSYk98Hsn7B/cu+dY7XXe+oLHXwarBhMle RNEQZoL8It6nbr57t3q2mvquP3x164M3dFvZQmMcQg1sYsij2BPPpWdReQ6mJtbiBabL QewA== X-Forwarded-Encrypted: i=1; AJvYcCVySU0EW/CkLrOpWglteYfYdFergVcnYX/feQwQBPtXQ++vaejvqpGjKHNkgpm2MmKtTy9Z@lists.bufferbloat.net X-Gm-Message-State: AOJu0YynBFeMLSW8QRdVu2LsvlNwMbAn7HdbAx/aUPHMUFvrz/U4+270 hKO9zW+M19iEAK2UVVEcjsuql7MwuO3VExvhHsVDLe598CASe4bRZ1WXLjhgL05DZG9U4/oP15O Hy8IVtqt8jML3NE/0bA== X-Google-Smtp-Source: AGHT+IHGNihSVZdYeWYYvtq4JoWLcrdHbmonFDlPgo0zGbDWddFZcCsax7mf8uhd5h7l7WG3jcryV6vZXPJM6UE= X-Received: from qvbpj1.prod.google.com ([2002:a05:6214:4b01:b0:6fd:50bd:be0a]) (user=gfengyuan job=prod-delivery.src-stubby-dispatcher) by 2002:ad4:5e8a:0:b0:6fb:25f:ac8c with SMTP id 6a1803df08f44-702b1b71361mr56520516d6.31.1751472466382; Wed, 02 Jul 2025 09:07:46 -0700 (PDT) Date: Wed, 2 Jul 2025 16:07:41 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250702160741.1204919-1-gfengyuan@google.com> From: Fengyuan Gong To: Jakub Kicinski , Paolo Abeni , Simon Horman , toke@toke.dk, edumazet@google.com, "David S . Miller" Cc: Jamal Hadi Salim , Cong Wang , Jiri Pirko , Stanislav Fomichev , Kuniyuki Iwashima , Ahmed Zaki , Alexander Lobakin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cake@lists.bufferbloat.net, willemb@google.com, Fengyuan Gong Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Fri, 04 Jul 2025 14:01:12 -0400 Subject: [Cake] [PATCH net-next] net: account for encap headers in qdisc pkt len X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jul 2025 16:07:47 -0000 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 --- 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-goog