From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mail.toke.dk; spf=pass smtp.mailfrom=; dkim=pass header.d=kernel.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=kernel.org policy.dmarc=quarantine Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by mail.toke.dk (Postfix) with ESMTPS id 20303A108B5 for ; Tue, 02 Dec 2025 02:05:09 +0100 (CET) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id B621243862; Tue, 2 Dec 2025 01:05:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C1D2C4CEF1; Tue, 2 Dec 2025 01:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764637507; bh=cXQH/ctkDiDQh3xBDL7BFKJAorODKba2HS8mZ4TuzXI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=tRpsp/xDtkTz6aG6kBRfmltmu2fAzwNxRqSyqckjvzM4TCMU3ouyT9CHm0lK7LUIl FP9TkxRPv68STofYQo+zp3odCi8Q4FPbZrfOLyD2hFTQlORBw9+uUOXJC8jMH6iX/Z EVNuuzW1qFhiz/82Ng0IEjeKpHferc9Bu/urkI2fAu1NvROgkrdgzXjAUz/IVHh4+g cYRP7d8cXPWwv3diWp5ShRkrkyTCxdg4Njfq4adqOPTEDjoosG1bCus7vQlLMVduUl V6vqoO+zukMfhIcy8eoyXwaeOgo0YYWC5bBg+xHUUeei9xBE2h7bda5Xk2XTS82ckn Mak082Ki0vByg== Date: Mon, 1 Dec 2025 17:05:05 -0800 From: Jakub Kicinski To: Toke =?UTF-8?B?SMO4aWxhbmQtSsO4cmdlbnNlbg==?= Cc: Xiang Mei , security@kernel.org, netdev@vger.kernel.org, xiyou.wangcong@gmail.com, cake@lists.bufferbloat.net, bestswngs@gmail.com Message-ID: <20251201170505.6e74c1e4@kernel.org> In-Reply-To: <87ikeubjqu.fsf@toke.dk> References: <20251128001415.377823-1-xmei5@asu.edu> <87ikeubjqu.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SHYRYYTQS5HPZTXVLFDV4XTJUT6HQLZB X-Message-ID-Hash: SHYRYYTQS5HPZTXVLFDV4XTJUT6HQLZB X-MailFrom: kuba@kernel.org 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] Re: [PATCH net v8 1/2] net/sched: sch_cake: Fix incorrect qlen reduction in cake_drop List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Fri, 28 Nov 2025 10:15:53 +0100 Toke H=C3=B8iland-J=C3=B8rgensen wrote: > Xiang Mei writes: >=20 > > In cake_drop(), qdisc_tree_reduce_backlog() is used to update the qlen > > and backlog of the qdisc hierarchy. Its caller, cake_enqueue(), assumes > > that the parent qdisc will enqueue the current packet. However, this > > assumption breaks when cake_enqueue() returns NET_XMIT_CN: the parent > > qdisc stops enqueuing current packet, leaving the tree qlen/backlog > > accounting inconsistent. This mismatch can lead to a NULL dereference > > (e.g., when the parent Qdisc is qfq_qdisc). > > > > This patch computes the qlen/backlog delta in a more robust way by > > observing the difference before and after the series of cake_drop() > > calls, and then compensates the qdisc tree accounting if cake_enqueue() > > returns NET_XMIT_CN. > > > > To ensure correct compensation when ACK thinning is enabled, a new > > variable is introduced to keep qlen unchanged. > > > > Fixes: 15de71d06a40 ("net/sched: Make cake_enqueue return NET_XMIT_CN w= hen past buffer_limit") > > Signed-off-by: Xiang Mei =20 >=20 > Please retain tags when reposting... >=20 > Reviewed-by: Toke H=C3=B8iland-J=C3=B8rgensen AI code review asks: When ACK thinning occurs, the incoming packet contributes len - ack_pkt_len bytes to sch->qstats.backlog, but this compensation uses the full len value. Should this be prev_backlog - (len - ack_pkt_len) to match what was actually added to the backlog?