From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.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 1836917B425 for ; Sat, 11 Apr 2026 05:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775884642; cv=none; b=rw+tMQAjqiEItbYW8M+Yao50W2I2UVGZyxi29jFxnE84iXgamf5e6XLy8o6kkhDMoqJzBFn1bLCKEo6/PS5IYYnqLO829gA1r/FTQWPTfUixpehyjfHV2ex+wP1HbviX3K6rRLYseCPdnOpXXaeH/tsJfXbV1zzfnUaWzAqJY/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775884642; c=relaxed/simple; bh=s4lztYW+o3nGIxFjsxucEcD/mHJsr45a8yPmtPrgowY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dasH/5S2E50ycuc1X0bTpmO83IVItjPzaRLYarkQnMHJhBBunm8RUotQJfJ6/8X+dyqWM9J3nyJhQbshTMGwNHhqOpoCOMOh86/NHlpA4GbBuz/B3WS7nd1bR0vqpWmpcWCf2yd9kPzB1sx+fj0xOMFXGKarAr17ufEe3kyVMJY= 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=kmJ1DrSB; arc=none smtp.client-ip=209.85.215.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="kmJ1DrSB" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-b6ce6d1d3dcso1083279a12.3 for ; Fri, 10 Apr 2026 22:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1775884639; x=1776489439; 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=kmJ1DrSBRDt7Xls71Dlld+62IKkcnB66N8p6wMX8f7/EgDupuSL0fg8ZrPzQtkjAA3 Ewi6FFmZt7RgFBB/bUVyUCLz/9b6SNgUM0LdA342EKjKmU/ew/LsmQgtNqG0Eq1eicHa knu0z4CRQnZj05xgkjcLL4KY0xqoqA1DLy5LY7SpawfEpskYF8s/X54DVUrD0acONYI1 HlGoMrT142rRwcLc7kIYrbdG7OQhkxC0arTnII08ZViN2YNZUJW7KvuIMWIgySqHZosN 0iH0y3yFNvLs2UmF4Dz9R3+juw8ggCjhbZkllpV4nhwAZDstcXmpDYecF0bEAEsrPi8S +Ilw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775884639; x=1776489439; 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=YoDLe9/7kofkty2ty+/FgKVhr34ZRJgKRTuFZ0aZe6xL50NZqfiotXNVtuR0r+ExRy PVRF3X7w6rrLhVFaQx3hY4cCRmx4opW7ujaiycNvnnVdTIldyjrA8dyrpxSE3tar9oKb XSHuHIPZFzfk7gnRheHPjex9E00m6nYvhsdLV9eybG/ueS3QIHX1ST5qi8OP3T4Hd9r9 YpbR0PnCSaJP/z7820dGhYOMIqzbQqq/R0uqTij49vN/l4AHuRZntRW6Ci2xM3bemlDz w2Uov3rCRnxUnTCXWnbKBGD62qvvGCgPKnTd+oSYSP2u4SnrRsG568N2+Ry2MTEGMv3h oQDw== X-Forwarded-Encrypted: i=1; AJvYcCUTQXck9wjza5I5Wt0QcI2UXYYgv6X6GHKwqhWti8fWkBkYfkjmAVV5ffzvdn7cntSc56qVOOPoPf4RGWA=@vger.kernel.org X-Gm-Message-State: AOJu0YxDcw0RNLlhSWmsFN/fwBR2I48sx0V1KInLj1v/JtlbJA+EFYlf b6HAJUJ6mYvI9cikYOJ2GuDQHk1qHcJQORSVZkp+n+AnPLNc0eD2P+e68ZOAJ0/6XAE= X-Gm-Gg: AeBDiesDzGaJb3GNIj6ZNynO0hXO9ZagX3WZ7DJmiMEA5zjjVomRxcO8Tq99hf6nQ8H UQvaH6Q0LPX+A1nrl4EmkZRXEwrGFN2GJcKCOOLOn8Lg2yh0QlyqpmzxxxTM0g3UVaAmIty7ayR wmKUWgVDPPGHOzIk8UNkoIs//eIv3Wk1VytItiYjpsrieRQl799qOD9xnABi8Z3jxNZUId6y3nL orMqSolqTv7XC26I+Gi7qA0vklWVczmY8Um/OD6qM+Tmz9VJRVzciNnbqTT2IqjeGltDzIPO0r2 45kXjsqtf4+jYe1uxJzdfFMT990MNeC1jDpR3si9TinZY2sigdqWfk+WNXnAhWk8CR+ZeZeqkjT KPTQtLISq1Mw69ngJBicO9DJ9xAO5YSUy/D04dZZlb1ZzJiGnYc0UtL8XSK84WH/eLPljrqJW4u fy1Wckqv18BtS6oRrMQWFja+gQEkRDIHBE X-Received: by 2002:a05:6300:6c1a:b0:39f:2af3:e937 with SMTP id adf61e73a8af0-39fe408406amr4679437637.49.1775884639495; Fri, 10 Apr 2026 22:17:19 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7921a1ef00sm3855700a12.28.2026.04.10.22.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2026 22:17:19 -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: [PATTCH net v5 2/8] net/sched: netem: fix queue limit check to include reordered packets Date: Fri, 10 Apr 2026 22:15:51 -0700 Message-ID: <20260411051700.311679-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411051700.311679-1-stephen@networkplumber.org> References: <20260411051700.311679-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