From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) (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 B23A83B2A4 for ; Fri, 4 Jul 2025 00:31:20 -0400 (EDT) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-b34a6d0c9a3so585477a12.3 for ; Thu, 03 Jul 2025 21:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751603480; x=1752208280; darn=lists.bufferbloat.net; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=fxALKIjMO7YvRd1pEEIdH4CeFOM7Eh9lzExephTx580=; b=SMoidZ2CC7eIuM+dlrzCAM689q/CAkUaP8En5ldaizHG/Ghv2xewFw2Xm7Ikww2ghQ vg7bN7h80TMpd8E2xCbc43IHExsQAlsNLHIQdg4Qy7lmS9v8PQmS/sAXmKUJVs3VRxhi 9reF14UfFd5CnptgTBFDvVNYe7bAbjFq8Yf32SdZRSDCTjw7OnBfM+z+AtqZ/X6Ow4Bu GUp+S5K5OX+f85ILMKpeWkOErffa0jiVisggyZuDyoBfQRrbrHYddc/tCa5T6h61Zf4d G5d5pHML9CkCQ38MXAfQRUZ1eynLKCutfY3GlAy27LL1ahxVYL3DC+les88DLjfY/DtT qWpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751603480; x=1752208280; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=fxALKIjMO7YvRd1pEEIdH4CeFOM7Eh9lzExephTx580=; b=Yio2reXOL3aZg9lxN/B+hhVzbwHtjPLvc4Gnh8R/gWCYamEfYLpK+poE1/TpnxHe0q NTl3bCAo/CyvEFdxWhSoxCBC+zAmZifVS2fZr5MwrSAlE5LkWGXm8jeZfifVFRjILSPc /1xtXQPxXgdeu9/wFUuF99DrmV/pkyA3fy+ky9j8dWCPtL9h/6/rAW7PO97ZQAyGyQAt z+nYvOYsOUZQWZ9mWexmkLniqRM61Z7l+xUgUSjH1q7sEo8AhqT+jorT52P7LPdG6c0G to41oQRlfvMaCp6zWTZDSBqCR/ac3bweiXb8kW3cyYa82EJsDIg9wpizFQPf2IwCQ4bm PfFw== X-Forwarded-Encrypted: i=1; AJvYcCVNDCqZfLenz9Lw4oI2XmiPQJWrVC9tylE5cGGLMs7zBnwozpACnv+jw8rtawUgAkgQuS5t@lists.bufferbloat.net X-Gm-Message-State: AOJu0Ywio4QJ860bZuXOuY5/X0OWt8jsKLuoNg/KcZ/ZL+pFBkepMgIz SoRdV6O9LU148Ac4rMJIKhVoLlmmHdrU+5WvmJWo0G06VXdaoKIEqBQK X-Gm-Gg: ASbGncsh1NGlVQM0aLeM9t5eJmVfepJ28H5XPVfcn2I/uiItgH63Is3sdFF+EikH4I6 vCcdUGqBGn3/2/U4kGdyLCMUhDnROX4yKuPLkJ2be5m1l4lOkEZ2Ew4n3c2neOoBEgGeKzrHGiK iptu8+0jEPRkplH3ZLKhURCGLyWfWtCZCI8MvCyhNqNdiJICZzBgnVTXQJQUAj3eUkgbdoMbb9p 5MBCDX0Q8QcEH0/pXaRb+LGM8/iVDr27myKF+QfGEI8sHjuuzX10LDWyxUe0Oa7j/oWPAzlDp2Z iJmWFZFxYovtSRDzpPRz09LBUAHOp+w43uXRM/qTH/WUG3lO8/Jt/q8wzv0zxMRpW2yynocEGVq g9S8= X-Google-Smtp-Source: AGHT+IHkvlcewWbWz3RLsWy6U2O5nxq2HueWe9yVOwfG6KNgonIBzAzpwgDA+2exlfrQ3C/FYpx7rg== X-Received: by 2002:a05:6a21:a8e:b0:220:a3de:a083 with SMTP id adf61e73a8af0-225b85f3eafmr2173223637.10.1751603479663; Thu, 03 Jul 2025 21:31:19 -0700 (PDT) Received: from localhost ([2601:647:6881:9060:1aeb:7d0c:33d1:51f4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74ce35cc72dsm1023375b3a.42.2025.07.03.21.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jul 2025 21:31:19 -0700 (PDT) Date: Thu, 3 Jul 2025 21:31:18 -0700 From: Cong Wang To: 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: References: <20250702160741.1204919-1-gfengyuan@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250702160741.1204919-1-gfengyuan@google.com> 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: Fri, 04 Jul 2025 04:31:20 -0000 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); Maybe worth a helper now? Thanks!