From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mail.toke.dk; dkim=pass header.d=mojatatu.com header.i=@mojatatu.com header.a=rsa-sha256 header.s=google header.b=VwUobVm9; arc=none (Message is not ARC signed); dmarc=none Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) by mail.toke.dk (Postfix) with ESMTPS id 853D317E7AC2 for ; Wed, 14 Oct 2026 11:55:42 +0200 (CEST) Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-93e56c287b3so14665885a.0 for ; Wed, 14 Oct 2026 02:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu.com; s=google; t=1791971741; x=1792576541; darn=lists.bufferbloat.net; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3Tl8jhcy/Tz5PdUSPZNxGbL9+G5WZrnWW+i9/q1nR7g=; b=VwUobVm9A7uZe/pFRVBgzG9vyuU7gOlVi++PyV22qiJpWp0543WL2CD/XwOQgALqZL dEjED/QFPW7UJ76Drn3wwMQoI/+Xs1X5a/dgvOr5ICKlfBRRpuFBDgLvEhpQcONmUbLf kLt5/f7zRpNi/YPAPu8ZBj1cC3GFAf6O4YnJ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791971741; x=1792576541; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3Tl8jhcy/Tz5PdUSPZNxGbL9+G5WZrnWW+i9/q1nR7g=; b=QjxMYXVrjbQFHlgU7D/S7fiBGuX5pyhfsjzItjLlBAaK/r25EXDqQ5N0rUvRnGoMkI 8VQ5GBVfaXfILg86axCiEvHIAy+r6+J/0XsdmZUUtp3TpWQhorWPEvJ6aqhZcYeOTONP Yj1LVf/sB/141qJT+LtZIMHu6UryPHzSpCNysVNg2SDc076rD8hoHYPbb7m4wlkVFDqK lZdzBzZ0/Ps6yDqxt64sNwTpfMNS4vX3q0Xyk7HxEJwZWSHF/4HghP4cjh6KK5g9WHVv 7530ktPfhttQdcpw6m90NXt1o9PcPQRQE68XwtZdqlYfkVcEDiBkPPQz7eX8k7RXCEqV hLsQ== X-Forwarded-Encrypted: i=1; AKwUvBx+ua9r6az/c9+mClpoSObeOa3lkuzNJFp+t4tW+xNYeSTjPX7otRe+Hde8CPv/OkNvsEKr@lists.bufferbloat.net X-Gm-Message-State: AFq9FYJgfU46I/Td375zHuAkUj0mofB88j8O6zg2xNkB8UjTzUdvILJm lq25XTAX3DPF9MQ27dZpA0Nenk3d2wZ1jhnohiAB8qCmzlRwiuxesPiJXfrj9MGw6w== X-Gm-Gg: AYBFou2WQhohydqNfuUfK2STVKIb6iFFkuqhV0D3z4SC+TBdJsTd1HitmZE2pMANI6u L4YoOUONiBbqnNPptOJ4bLA+xB/IOvEumSzb7m1mqURtzKPjWkUVg7xHNgJfhIj9C6Z811U/41/ UljEIPE57W6N8UIumIJrCCEfASVNua5kbz0m3bR5q8Cj4CUCVKBd8wrnwaPDh63wfKsYPtQkrc7 WuUFK8qUWQBQKeiav65ZNqeIN4JOx3pUxI5CSGFogp23gaJDfASXzzsps0RJKqJ+L/MZeIbzDVY sijTNnAqFSmLrvWDCGBMG3mvRNQu4b1IqU+0dzDKCcXmKGMBp7Dwfn0YE8P+/mJrjhetiloe1Na pDo/AFeK93iJtNbC8E2yLTIVWP40pJcFqonJZ7KZBY+KSV8JGWdHX+VbPl9n7k1V+nVNSt91Rap DL3I+xzXPDTiOJ9nGgLUbRMtRJmajVTnVLbztdp4/4dyHkST7oOx+J89zue5RBPXwO/tU4SOBg4 xzNU4biP3ERI2/LwVQ0/GtI26Rnd+5K1A2qkgic9tOqZrTzo+kAarma8QLP X-Received: by 2002:a05:620a:6496:b0:93e:c12c:9b6d with SMTP id af79cd13be357-93ec12c9ee5mr2462767785a.72.1791971741042; Wed, 14 Oct 2026 02:55:41 -0700 (PDT) Received: from mbili.tail33bf8.ts.net ([64.203.83.2]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93ef5055eb3sm453074985a.33.2026.10.14.02.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 02:55:39 -0700 (PDT) From: Jamal Hadi Salim To: netdev@vger.kernel.org Cc: Jamal Hadi Salim , Jiri Pirko , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Victor Nogueira , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , cake@lists.bufferbloat.net, Sashiko Date: Wed, 14 Oct 2026 05:55:30 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: QP2PBP4WISNA3DZ7TO45ERL2S35LPWT7 X-Message-ID-Hash: QP2PBP4WISNA3DZ7TO45ERL2S35LPWT7 X-MailFrom: jhs@mojatatu.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Subject: [Cake] [PATCH net-next v6 2/4] net/sched: cake: use a dedicated split-GSO list iterator List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: skb_list_walk_safe(segs, segs, nskb) reuses the list head as the walk cursor, so segs no longer names the segment list once the walk finishes. Use a separate seg cursor to keep the head and the walker distinct. No behaviour change. Reviewed-by: Victor Nogueira Signed-off-by: Jamal Hadi Salim --- v5 -> v6: split out of the single v5 patch; no code change. --- net/sched/sch_cake.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 6432d10c992e..0d13c4b0bfe3 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1810,7 +1810,7 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, WRITE_ONCE(b->max_skblen, len); if (qdisc_pkt_segs(skb) > 1 && q->config->rate_flags & CAKE_FLAG_SPLIT_GSO) { - struct sk_buff *segs, *nskb; + struct sk_buff *segs, *nskb, *seg; netdev_features_t features = netif_skb_features(skb); unsigned int slen = 0, numsegs = 0; @@ -1818,19 +1818,19 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, if (IS_ERR_OR_NULL(segs)) return qdisc_drop(skb, sch, to_free); - skb_list_walk_safe(segs, segs, nskb) { - skb_mark_not_on_list(segs); - qdisc_skb_cb(segs)->pkt_len = segs->len; - qdisc_skb_cb(segs)->pkt_segs = 1; - cobalt_set_enqueue_time(segs, now); - get_cobalt_cb(segs)->adjusted_len = cake_overhead(q, - segs); - flow_queue_add(flow, segs); + skb_list_walk_safe(segs, seg, nskb) { + skb_mark_not_on_list(seg); + qdisc_skb_cb(seg)->pkt_len = seg->len; + qdisc_skb_cb(seg)->pkt_segs = 1; + cobalt_set_enqueue_time(seg, now); + get_cobalt_cb(seg)->adjusted_len = cake_overhead(q, + seg); + flow_queue_add(flow, seg); qdisc_qlen_inc(sch); numsegs++; - slen += segs->len; - q->buffer_used += segs->truesize; + q->buffer_used += seg->truesize; + slen += seg->len; WRITE_ONCE(b->packets, b->packets + 1); } -- 2.43.0