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=bFLtvDsj; arc=none (Message is not ARC signed); dmarc=none Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by mail.toke.dk (Postfix) with ESMTPS id 97E9A177C548 for ; Thu, 08 Oct 2026 09:47:35 +0200 (CEST) Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-5339199d8c3so22976571cf.0 for ; Thu, 08 Oct 2026 00:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu.com; s=google; t=1791445654; x=1792050454; 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=sopkCnIQW7vZq31gYzSsRjKwH3otxOOz8nPSRwXJ2s0=; b=bFLtvDsjY8r1O+QYaL9Pp6ANuPXMMAaqkFoHkB7vhxM82myzPq1FU0F1ybMlu6vp3t SUr+GUrOMJ6mPSm+Be8i/o6mZ696nFelbvESSuK40r7jV46Nh3Ns3eH2qqQimGM5HzPG /qUG0ovzs9+FzF+lyHquCiQQlpGDZKHJq+lKU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791445654; x=1792050454; 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=sopkCnIQW7vZq31gYzSsRjKwH3otxOOz8nPSRwXJ2s0=; b=ozER23GzBK3PG3UiML13fJ3Qz3atDvist1P5GmSOqegfODVRUMc+Gv707R18z2TBsZ dnpM1/0PsVVBZzqlgIvz1XjftNOk+uF0cg040iMiQ+05CSvJ6EtlAD9rdyR1NX4v3w7J a6W/nKMIa2f5hL0AET7mVd3iVfNu2W5rYHAqNi57Ho2xu4o/qTGGV4syxiLI7DxqRJqT pL5zp/GDRveVCEQx4qQ0d7aZgaaNU3srtNS/i+9W7AnKdtXockTtGPFn446N4g2R7pf4 r3tgsIZXSMOkR1sM9Xm8YEc/m5Dz4yHljPJUjIXA0oiaKZq6jmL25QJ8H862mmnCDV9L HaOQ== X-Forwarded-Encrypted: i=1; AKwUvByAvl+BCzjFJiwdRwMzGY7V+vyvvMg4YWh8ocBfvzInyW6JREt8E6/jcpyHXtwET2uiuhCX@lists.bufferbloat.net X-Gm-Message-State: AFuF++lM2+kWWfW11ZDRpmLhnPZB77w/dJxhdD5rYZQRnaBn2i54BTA1 jr+haHUsoDl5z2Z1pWlgi1vjunFUkM8lEr1mp4ZTy0d7wF0jhcoXcdPT6ftuV/geTg== X-Gm-Gg: AYBFou3tFOSR9oSoKUTnPhNeqSxyaYDGxEaadYtJ2aWbcZ4VdiYxgmU/B1198b/TNW6 L7lbT4TEsz/q6EfXHMeXt0fyO5lJtUpMj3cSMeZOVajLM7mzEh9yAhopUtkZJKSPr0WtwoKiCqg D+8t0LyuYPrJ9wMFBkRnNgUOkeQkhjZu+50vWaaIWckZVCF8gjhbr8uMmROdoNygGdmBJhlBtUI tqP9DJFh66leMBfJ4gR+/bbR6uAoD+N1MMUZEwfdDhQRq5R+Ir6h7gwA+IcEAbNJjCkNuoBc7Fj 83NT+I0KasW3j8PUfgfnS4Kw62ZeC/nJzgkgJlB35HQThEvezeQFqPiKqdyNzyhFEyXZCp2jgjy Dq9CNvmupGxevmwccyC8LdMSS6K7g9hZ1sXyn4bLnyl0E32w+d453p9paHDA3AAG0BmiyVKaAfu Bmgo1c0VQzj4HE7XpZRnctJIgZhEUgkF9WyUKQa4D3RV2GAQb74UDJf7ouJ1K43kA0ynMLxGNtj fX7umjTU2IO/6PzIdtFw3eZjso2QO7kmuAcBYg4vvNkAc5DCg== X-Received: by 2002:a05:622a:4808:b0:535:70c5:d45 with SMTP id d75a77b69052e-535756d6d7cmr81633911cf.74.1791445654276; Thu, 08 Oct 2026 00:47:34 -0700 (PDT) Received: from majuu.waya ([184.147.180.207]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5357213f3dcsm38253961cf.17.2026.10.08.00.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 00:47:33 -0700 (PDT) From: Jamal Hadi Salim To: netdev@vger.kernel.org Cc: Jamal Hadi Salim , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Victor Nogueira , cake@lists.bufferbloat.net, Sashiko Date: Thu, 8 Oct 2026 03:47:11 -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: 2XNHP5DMU6OFWR54ZGHKAMTTYKMWOEJJ X-Message-ID-Hash: 2XNHP5DMU6OFWR54ZGHKAMTTYKMWOEJJ 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 3/4] net/sched/sch_cake: widen buffer_used to u64 List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is a follow-up to commit 4c660ee8c809 ("net: sched: fix 32-bit backlog wrap in gred, bfifo and plug enqueue"), which promoted the backlog + length admission sums in gred, bfifo and plug to u64. CAKE's own memory accounting has the same 32-bit wrap. cake_sched_data.buffer_used accumulates skb->truesize and is compared against memory_limit: q->buffer_used += skb->truesize; if (q->buffer_used <= q->buffer_limit) return NET_XMIT_SUCCESS; while (q->buffer_used > q->buffer_limit) drop... buffer_used is u32, so once the resident truesize passes 2^32 it wraps to a small value, the <= test passes and the drop loop is skipped even though far more than the configured limit is queued. memory_limit is a u32 attribute (TCA_CAKE_MEMORY), so buffer_limit can be as large as U32_MAX and never caps buffer_used below the wrap point; with a large memory_limit the queue then grows until the machine is out of memory. Widen buffer_used and buffer_max_used to u64, the same shape as the gred/bfifo/plug fix. buffer_limit stays u32; the comparison promotes it to u64, so the bounded queue stops at the configured limit below 2^32 and the counter can no longer wrap. buffer_used is subtracted on dequeue and drop, so the widened type flows through unchanged. The ACK-filter replacement applied the net delta as one expression, q->buffer_used += skb->truesize - ack->truesize. Both operands are unsigned int, so the subtraction is evaluated at u32 and a larger removed ACK wraps the delta; the old u32 accumulator folded that back to the correct net value, but the widened u64 accumulator would persist it as a roughly 4 GiB over-count. Apply the replacement as two exact operations on the widened counter instead; the queue already accounts ack->truesize, so the subtraction cannot underflow. Conditions to recreate the bug: CAP_NET_ADMIN (root or a user namespace, the qdisc attach is gated by netlink_net_capable(CAP_NET_ADMIN)). # hold a tun device's tx ring so the root qdisc parks packets ip tuntap add tun0 mode tun ip link set tun0 txqueuelen 32 up ip addr add 10.99.0.1/24 dev tun0 tc qdisc add dev tun0 root handle 1: cake memlimit 4294967295 # drive >4 GiB of resident truesize through the qdisc (e.g. several UDP # sockets with SO_SNDBUFFORCE). On the unfixed kernel buffer_used wraps, # the drop loop is bypassed and the guest OOMs; with the fix the counter # passes the limit without wrapping and drops the excess. # the ACK-filter over-count is reached with ack-filter enabled and a # queued pure ACK whose truesize is larger than the replacement ACK: tc qdisc add dev tun0 root handle 1: cake ack-filter Reported-by: Sashiko (gemini) Closes: https://sashiko.dev/#/patchset/20260818095927.15901-1-jhs@mojatatu.com Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260818095927.15901-1-jhs@mojatatu.com Link: https://lore.kernel.org/netdev/20260818095927.15901-1-jhs@mojatatu.com/ Reviewed-by: Victor Nogueira Signed-off-by: Jamal Hadi Salim --- net/sched/sch_cake.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 2bad0b6eb13f..4caf9718c9bd 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -234,8 +234,9 @@ struct cake_sched_data { u16 tin_cnt; /* resource tracking */ - u32 buffer_used; - u32 buffer_max_used; + + u64 buffer_max_used; + u64 buffer_used; u32 buffer_limit; /* indices for dequeue */ @@ -1850,7 +1851,8 @@ static s32 cake_enqueue(struct sk_buff *skb, struct Qdisc *sch, qdisc_qstats_drop(sch); ack_pkt_len = qdisc_pkt_len(ack); WRITE_ONCE(b->bytes, b->bytes + ack_pkt_len); - q->buffer_used += skb->truesize - ack->truesize; + q->buffer_used += skb->truesize; + q->buffer_used -= ack->truesize; if (q->config->rate_flags & CAKE_FLAG_INGRESS) cake_advance_shaper(q, b, ack, now, true); -- 2.43.0