From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) (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 D73B13B2A4 for ; Sun, 6 Jul 2025 10:30:19 -0400 (EDT) Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-710e344bbf9so18869887b3.2 for ; Sun, 06 Jul 2025 07:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751812219; x=1752417019; darn=lists.bufferbloat.net; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=ILk6V+IjCGdWOhQWfk6SrwBKe81/cN3kOICCBDFtPzw=; b=WSv4qF5TL+sPRlHeHfNFqHxvPDCWZo2BNy+TxqF1Kk7XWAcJRO1ckRmzK82W6BvpyQ /3zYeRe8rSNLt0gRF2KCCivXAJYnX6li4HpSGdtya0etLRcpHQAdR8GAff6f+/0m40Gn So9fZZmKo7gkv/cPIBjSYNYpKz6hLCHCTGx1zq3KWBuexzD9DwTZFGWilZKcweHXt671 OTJW58+tlkL5u2MPDkKQG6L68t6iRupvYIgTpkj0CZyDIyha5EcuGQFl8M9YWxi0bdVG Mwur/EiCexwrQRCubJsZVrQ+NZhomxrwBI4adaaubqH/dB1YjnmA9MMEgdX7J9ikhYSH wUGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751812219; x=1752417019; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ILk6V+IjCGdWOhQWfk6SrwBKe81/cN3kOICCBDFtPzw=; b=OR37RSw/i2FU5zC74G4OsBQd4HOSFEajnOQA/y1uFok6BARCqEaZZ5sC8c8k1J3JSA RgsXV92XBfso+Db+4ES5I+Z93cRmMjn2DaA9KrUwisNSxh3PDkfPEBK9MIEmSOOtMwl6 sO+ljs4NBr3rGByY1nrbdgF2iM5S0Zy+J4FTqxs/bXfP1VTUoZe3+tuhxsMVInq6TDPu YgadJmAahNhBXgCuc4kLkLY+P7R50qS6zPP9OCCHF3IrjDFk8HgKBg+ILmBnY/2mCWs2 5uCsVgXtEzJMz5XasSMzaVL0s1F1itF35hbgDUfFpVOdoxllOAXmxzWASWbE+mOBfjPe x0vA== X-Forwarded-Encrypted: i=1; AJvYcCVOE9TG1J5INb2RXnLrGDnv7sLs3yGYBUsWGPFgH2MKKh2vPGwLGsvxdl0eFwCYdSjsWJoM@lists.bufferbloat.net X-Gm-Message-State: AOJu0Yzeq40jOrl2kte0X+I/JpbDTyY955JsNzxnzBFj9djQYagTvRbl Jj74fz+P46kDm3/sq3q5F3n0mT8gNUpUKY+2V/3bgDa9USXc12rY3VC1 X-Gm-Gg: ASbGncu6IwEBXFfP20ZkfCMyaD8bHccQBYLT104ECTxsvMRixyWejW/s+it4lqCsLa1 SOjCyr6v54Xbyth7Z+M1wGTjj1vrcbc9zSojYzqUCdDJR0vwkGoGW/5WGCp9wK5tuR1+U2vNQq1 SEhEWH9TqHlC/brkNtuXSAo58g50Spaxvbk8g2rDIQnCexckz/gDcM/ESsER06FlTxs6CTVJURQ 2GQsIQLsoUrBn31QGlTJ5ZqTYk0pkT3Boy9gPNygsPHzNsOKOzc3MPDlRAxJ9iLygzdt/Ikq5BZ SmRjjf9S8kUoLV9X/6WocD9SYHA59LZ2B9BMIthjB2eKvlWOQSHsKBaw/OUc4w6gI+5MzzT1Cvb 8rxgysLoitSTU9YEWH2IjWeThDcUa/zFsaZkW4dY= X-Google-Smtp-Source: AGHT+IEBmKQ51ZAVM2knwYxTBZrzCKTaZIBinugB6wBxG5OAXF22jsYHYXdSZcwqnMwbxhIIzKhdhg== X-Received: by 2002:a05:690c:38a:b0:712:d946:788e with SMTP id 00721157ae682-7166b5f6d7emr106376527b3.14.1751812219293; Sun, 06 Jul 2025 07:30:19 -0700 (PDT) Received: from localhost (234.207.85.34.bc.googleusercontent.com. [34.85.207.234]) by smtp.gmail.com with UTF8SMTPSA id 3f1490d57ef6-e899c440e7bsm2016366276.37.2025.07.06.07.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jul 2025 07:30:18 -0700 (PDT) Date: Sun, 06 Jul 2025 10:30:18 -0400 From: Willem de Bruijn To: Cong Wang , Fengyuan Gong Cc: Jakub Kicinski , Paolo Abeni , Simon Horman , toke@toke.dk, edumazet@google.com, "David S . Miller" , Jamal Hadi Salim , 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 Message-ID: <686a887a34d5a_3ad0f3294c@willemb.c.googlers.com.notmuch> In-Reply-To: References: <20250702160741.1204919-1-gfengyuan@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Fri, 11 Jul 2025 07:48:57 -0400 Subject: Re: [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: Sun, 06 Jul 2025 14:30:19 -0000 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.