From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D646390205 for ; Mon, 6 Apr 2026 17:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775496408; cv=none; b=flKzuDkj2fAFYAoB8tBoTP8iGWUqN5OhUeMvPGTIitHleXfe59Ppq1pbRZ6YuKlQ4DelWsGHj4bc7MQr9EdIktr2+6PDkjxaxoAdGpY3GCDMO9zvMOCWwa3IdlyhYiZa59vjOGNUmkDX2cjF7iyotPSFcM9htgGjnM0XDFnlKnM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775496408; c=relaxed/simple; bh=s4lztYW+o3nGIxFjsxucEcD/mHJsr45a8yPmtPrgowY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NXSvYkqtKCl+UwDv3/YNqoxcj+2p/eoBFQ5BVoqktbWFun217jvwE86QTXEskQtEpS15HuMx9LazktZhuCUKrQyc93nY/j0QPRXW9LqUou37YVpVdUX13vUyIPi2FfR3RrnvH9LvFvgZoARwecpEdjq8959i0IoyqCEpA0rsurc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org; spf=pass smtp.mailfrom=networkplumber.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20251104.gappssmtp.com header.i=@networkplumber-org.20251104.gappssmtp.com header.b=OlwNl7LX; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=networkplumber.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=networkplumber-org.20251104.gappssmtp.com header.i=@networkplumber-org.20251104.gappssmtp.com header.b="OlwNl7LX" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2b0ba3bfe16so40941145ad.1 for ; Mon, 06 Apr 2026 10:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1775496406; x=1776101206; darn=vger.kernel.org; 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; bh=Ia5I7mTnznx5IS5yxdTatjnN99ECF6Uimb8GJ43NewE=; b=OlwNl7LXifqiMx1+n+Uc8hdsmajCKLRdRx12oK0pAEqk1HsspMYMmURMm6ZMcv19ga 2eT35Z8DRH29NkCpKupv/IvsqGXhRm2LcETSYyWTjhgMFLaiU5DpwFR/pyG/JRWmQNRF 2aTQ+9HEo0FtyQ4lBnd8uGYbrYUKtkhKz9LB2TdK5/GUBlVulhEc7litdlgtuBXe1wOv B5agtUTNtuNA7UuK0zac7BpTuGdoiQ5slFS4o5ezaUAVVh6CJD+oDFxizunuTQ3IdTSG 3P8I82VWNb2QDiikhJJfMGGr0i3s9Hcur4U4afSlWz9D44IIDU+tFT0FLbCw0uXpH0ZT /ZUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775496406; x=1776101206; 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; bh=Ia5I7mTnznx5IS5yxdTatjnN99ECF6Uimb8GJ43NewE=; b=VQTZxStt36qP6nlSpOLaxqjlCIVYNXX6Bi+JOd1dUSnHySlxILdkzOWhZSFHUmYqxw D/ixLoJhvvNkcyogk1+DzbjxPzaFCBF3FVJoSmwKlSOoT2HFSSfQbgNq/yg1wgaqV91O xqd59jCu9ZgtyVDp4n8hNRB/gOH3ZKsxvCmKE2t+1k/Iva1zWGMV9lGjSfhRuofTb3zB /XyBf/70PJInrm3hgd1zYOMJvQo94+rG7n3Wephjsh3N5+dBQZl809CuTihuXEX40C0F RW33siUBz072fh5KtvYtCWzdgyVjIo5LgYg+a+wPen+oZQ1W6TUcdqTt9JSvYwCX5mWb XyEQ== X-Forwarded-Encrypted: i=1; AJvYcCWF6Nr9Pu0CNthhETr6cXx5CtMBfbfByXLPb0n7FpxF3vBzi3qRGR4nAtPgkE0tain9PX5NSAPZYLEA+8g=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1WxMstmXKAXEhLuuWrp2L12Yqt0TmOw9eRfbIsTVEzqHWIFZx w9euLItpUUoR27vI0BMnOf2dU3jWUpM7XYcXQPF9/61JYwBat2qXvwHkWyiIlvQeGGQ= X-Gm-Gg: AeBDiesu2JMe3jQJgzqKsvMD3vC6RyYY4eV7AI3IMHbqzfWOyShWAL22pLLBO7tkxQP A4NK6erunahl6iiuABxih4dhIR6OZyjjWXQSXyHLNOJB2fXdyrz5E2JHjNZf6im7pKT/EHxWhLe OnHnvQpxUQuCk+tYFMyBEL0sMQcsppE6KkMfhXMd0/2eCDsSDZltLUlEvlPleurVbeoUg/IA4Dj FKKrS9aK9e/UJcIYmv7Qid4Px9KT7fsVf+x6xtTTKwb+TnzC9hlvXkVWtpCvNgf9nzVM8su9Qm5 2CjJ7jBkWGYs7dhR4IwgnifzDBA+WeL7pJwkgzAjhMp4Eyv62WW6IS3L3cQxlSq7nu+6b3J6wVo 8WUAuqWA+vsplsws1eLASsyXXCsAPDKATw5r3LeUrNzZbQGcReOIczPu8VOE2GBwqTTRP3S6NEw WOPa7Lbtt5WrlLhVkKfC4v/IqazDo+gLx6 X-Received: by 2002:a17:903:707:b0:2b2:5168:2f82 with SMTP id d9443c01a7336-2b277e52d28mr88982855ad.24.1775496406554; Mon, 06 Apr 2026 10:26:46 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27477a13dsm146437945ad.26.2026.04.06.10.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 10:26:46 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger , Simon Horman , Jamal Hadi Salim , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v4 2/8] net/sched: netem: fix queue limit check to include reordered packets Date: Mon, 6 Apr 2026 10:25:10 -0700 Message-ID: <20260406172627.210894-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260406172627.210894-1-stephen@networkplumber.org> References: <20260406172627.210894-1-stephen@networkplumber.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The queue limit check in netem_enqueue() uses q->t_len which only counts packets in the internal tfifo. Packets placed in sch->q by the reorder path (__qdisc_enqueue_head) are not counted, allowing the total queue occupancy to exceed sch->limit under reordering. Include sch->q.qlen in the limit check. Fixes: 50612537e9ab ("netem: fix classful handling") Signed-off-by: Stephen Hemminger Reviewed-by: Simon Horman --- net/sched/sch_netem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 8ee72cac1faf..d400a730eadd 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -524,7 +524,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 1 << get_random_u32_below(8); } - if (unlikely(q->t_len >= sch->limit)) { + if (unlikely(sch->q.qlen >= sch->limit)) { /* re-link segs, so that qdisc_drop_all() frees them all */ skb->next = segs; qdisc_drop_all(skb, sch, to_free); -- 2.53.0