From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f42.google.com (mail-dl1-f42.google.com [74.125.82.42]) (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 761E63A5E94 for ; Sat, 28 Mar 2026 18:23:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774722224; cv=none; b=oxyfuH79dSI966wm3bTWO5i1KppfU9wQBEWIL01UN4Qxoj3bgTNZ0EIH/xIQLwytJMYq8gH+4GOWPLdWn6m2e99qnWs8wp3oBZlOLbaOaLDFPEQERQNhLm38kENyPBSTV4ea3cTv0y5e+CX0Ka5XNUmLYrGSeramnCimBeW6M2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774722224; c=relaxed/simple; bh=t0CwRt1pvXLs9jaUwM8prQrR5RD1xErsce9sGZFLF6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pAi6zKJmmv0DARC2lmXEv0ql5H5NeAHVZ/VqIe+Oc3LoFdvKDrX+qwqj3cOdL9qHdk08Dq/EfuUAd7C9hzUiRDVRZuQzmpsYiAbEw8dDs4SJHMP0MLlQwEVhj40SIP5fEfc3gRfB0dXNcbElOUCKrmldYYuwcwsQYrzPnSSZrCQ= 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.20230601.gappssmtp.com header.i=@networkplumber-org.20230601.gappssmtp.com header.b=wRLNHv/5; arc=none smtp.client-ip=74.125.82.42 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.20230601.gappssmtp.com header.i=@networkplumber-org.20230601.gappssmtp.com header.b="wRLNHv/5" Received: by mail-dl1-f42.google.com with SMTP id a92af1059eb24-128b9b7e3edso475237c88.0 for ; Sat, 28 Mar 2026 11:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1774722223; x=1775327023; 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=Ug1C/tlCnEtwGMUhMwFWNweed+dY/6DFQVGOoZU9ZaU=; b=wRLNHv/5DGwboYh0fopfjfiNMwsAAhHFPmUmYeVpv3+geAiXPcX4V3q+4RMFUZUdBX oEoSkaAJd73uh49bNCZn3cw4s+wCfaWY/km2Yg2iLpepc3F8Fr7lBVbLpbd1q6Jxq68M WatHAC4MgvXapTVFQuOTKquRXZER89BNOnWD1ov3+utuHrPrteI+9Efv3VfixBmExK32 I3J2Y2wJWQnxFWdT6RRqB3ISjo6gC0udpPEHlrAq8+J57inHpjAJ5eVj6o0yXJBvcdng asC8JHIoB4GuobUB6CdiUpxsWBpL7nXGKtQ/hGqNc1cEKtST+xbpwrxkyc5PiKx9ibek Zjog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774722223; x=1775327023; 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=Ug1C/tlCnEtwGMUhMwFWNweed+dY/6DFQVGOoZU9ZaU=; b=sLFe+6lCuH2luy/lvazhlf96BdzBEoAEIsZtcaj4ULTitf8DlkGY5AGChDkyP9RQOt OPuPvSwDU0nAUXaATInrmxNcrepb9nGAMRt8Y2YTV0q2YgkBaEk178mr42y1QAgrnSIC kKRHxvnr0ufwiGPo7St88Sx+QIJZci6r6X/uTGBKoyVsSnmxdM/o4CJSoMsuCpQaNGeI GHVv3Ymgb5B1vTnzls3aFNv6n3u/X3CEugKBVUJioEuozh2p5LpgYd3LZ0IY8yKQRPNu FyYjLobFqdDrYCFjAlXB6tXOsvQnSRkvNPfxtRtf3r/QWC4/uAPF2otQrEpRcLErnX1i MRCg== X-Forwarded-Encrypted: i=1; AJvYcCWqZt69azUaRCMuaPoHTNy2Km421wmnALmeoMiFEKAG/eoWNiRnUopSg7Ua4ZzdkxWGtaiJFB/5bvYrvws=@vger.kernel.org X-Gm-Message-State: AOJu0Yyex0nKK5YuZy/vD6MdO1johd2eJ7tof8kHsOkrZaFNHK0IivkC Ppp7Mqjom/Ge2+ss9qyEjZ1HmOKCxBUB1MIWnAg2LTibab90cBLZt54Ae3bq84VFrI8= X-Gm-Gg: ATEYQzwDCaRhLgkBG4cuTV53BBIrf9X3WumIRsBwGu21gLP5Jh92uugVAbs80JOX2Kk T8ncEaYTkkvV7Cfy+k/bhLhUDF9Fm72y4baQLkQeaeGQnyHN7fTh/IbRxiPztvlp0t+x4o1fYu8 DgUvFKsr7pxPPeApB5t5RfZP4/769XOq2XNvSWgsfxr+qOKofJGFods8q1F1SUFd/bZs/foUfhS N+L7rsQHD6F5sewOAt/9zUBBqlaWOzpcP+MEU8qF3oxPi311Ux0lqvUy+5rguBFlu769IeKYxkN HHYSOk6a12bKCIimYMM5e/rF0H2ZGlfahcWFVTNLkNiPgGoyCFAQ1sGAmTNzH+9OV996Y+B+RBE YHjZh0ShS9ALXnJiU88O5Uxc3eEQTR5aCUap7XusFWq55t/JmdDhJbaZtDr9wqDUZevWUkEafk+ P2A9hZxJNVhV1uHXOL2IiV0e8xsoF7CObP X-Received: by 2002:a05:7022:6182:b0:124:9e46:82d6 with SMTP id a92af1059eb24-12ab291277bmr3730502c88.25.1774722222630; Sat, 28 Mar 2026 11:23:42 -0700 (PDT) Received: from phoenix.lan ([104.202.29.139]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12aba581027sm3133008c88.4.2026.03.28.11.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2026 11:23:42 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger , Jamal Hadi Salim , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net 2/5] net/sched: netem: fix queue limit check to include reordered packets Date: Sat, 28 Mar 2026 11:21:46 -0700 Message-ID: <20260328182336.392817-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260328182336.392817-1-stephen@networkplumber.org> References: <20260328182336.392817-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 --- 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 2cc3acaa4068..6cc48b698e48 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -523,7 +523,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch, 1<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