From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f51.google.com (mail-dl1-f51.google.com [74.125.82.51]) (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 57C87381B02 for ; Wed, 1 Apr 2026 14:53:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775055220; cv=none; b=dalv3f89RqObXN2kgen7Vnc84TKYEEfvIaHDZXpl9bKYNoRvxctUZBNNuw2UWFyeJ3zBIXUEqPKo6kloSmxrhEUENsq8hkS5FfA57Tady7GJBwMhLa2Cw4sl2lldri8G4Rce/T9B1x5CAO1mkeRkrJeWPbmoiIUr2+yLwnIflY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775055220; c=relaxed/simple; bh=4YzR0RT9+pwUNwlsBXG96fmgGJsmVlZwx+0otA70hL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ASJOVyie6jqxsa3AEASDDOP0qUxWiXlpzpdzO2EivNiqrg1c9KhVNiiWGGoh0Unn5ukh/43TrcPG5jMQ36QJ7/0rbhl+ht8qJLUcMJiEu07iEUzuqWUz1Bvq75diFv9QEpR5H0Yl84P6f5rdPMPGo2xHpOK6x8ChlOjfEN86/C4= 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=AOkmJ3DM; arc=none smtp.client-ip=74.125.82.51 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="AOkmJ3DM" Received: by mail-dl1-f51.google.com with SMTP id a92af1059eb24-127380532eeso2422513c88.1 for ; Wed, 01 Apr 2026 07:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1775055217; x=1775660017; 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=UQEU246ZQ8XEOpZb4Pory1ftv7hcOK58ObhfiXMiXQ0=; b=AOkmJ3DMq8CDn3GSeXAR5YYmfaQrPXlX/bCpaSoCwL3C4uNK9iZYiakKCEalnzfR7c pgYrlZhVLAiZ05BQqvxaim7fDYPlJu/KO6nONP4fwg+fkzsD2vzme2N5Mgz93v08AQKN vCZjWEQTbNYY/O8JbHsnHniEJjj+5nF+KyKJxggH1p8lZ+R+1bXn651tIkqZAyQXxOMN bE3Oq+4sq0Bbv0Y5AYovBl3e92UBGUdXzMsZ1canvzt31IWV1qRWZ03+Va0x4G9NM/R+ k5EiX1wCH21HHRX+oA8aT3/dFkEIRQGQ3+SVDbSKQa3dh7/DaPGDdFCCtGLQy3KMeRLR DO+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775055217; x=1775660017; 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=UQEU246ZQ8XEOpZb4Pory1ftv7hcOK58ObhfiXMiXQ0=; b=lAnTmDvZunE+fDzOSLx9MqwwNtHU9gwlifNZd/RfB8NUYAQ5/YFf8nTPfCb6w7dr45 hbRPL11rxOUfgkRbMunnSazu2NJvZc+cwj6+CWqu5AonUObxtXtpgocDPoTyNQT8LZ+b 7AEcKtBooP5mfwkETX+xlkm3tDm4vEX2Kt7GbS18QEePuktsU3fr2GZr2KVV+siTmOBC eto9FTXV25CrSHdjjhccaHBPy9h99MCour7WYkhDLQIdei60Mqrz/gLseqjqM+57tseK epNvLp+j+nokKMKfDQfRG6LO3X3AOj0scTeN+Ak3USjIOq66J8Kqq4CUO5uLMedkDWBR D96Q== X-Forwarded-Encrypted: i=1; AJvYcCWSES5pNll9erHBqUN4nXsFbOmal7HruZ0BE829ZYlXlpGg6LMXQkEmoZer/5+xVtDyzsYc61gqIz3uoWk=@vger.kernel.org X-Gm-Message-State: AOJu0YxYizHupnFWQFTnaUD0w2LwjDsHyBkfPH1wLIpHwzgahlc8+Qcz DI6081+h4AeC85kl62xkoMNwvDN7hcp47j5nJmvsXFWkj9j9F+l85krmsg8VUob5LY0= X-Gm-Gg: ATEYQzx9sGD1/0QPdFOdcgzA3aCaIW04b3W476wpVNdJP3XwDn3djJb9lf71bGLxQwj 1EZQZyMpmtj5Yvrz2DiM8fY3+/Mewp2GtbQMnmC0xBOwDvWiIpqtsyFU94C6CCDczam6cNs9ujT pavrDMnej6c6entsEC4xHFhUlFyJb35MSoftqeGesrPaxh+oRsL2T5qlxsYLqcaFEhgRpIQooQV sO/GQGIVG2+WbhlCNjj585olODKssiF1dLFGtjKEX2cLsl3R/gnA5xVSzdQn6TCyry0/vl+kpgo TTeU8JIJqFSIzwBnoJgvV4/3izKwR8moFOdDaMxzrYZk6C8FJsdXnyGlmwPoXHkh6cUYKa7D6Ew cEeXct7v0strUQ6qKK6FLfv9ldUP39246EaXkh620LOE/GEXcemagYzO2+1u15BkuqAyjSdBn1i hfv6Cv0FG9uKWYfefCsy86ZpIiP5zoxqLm X-Received: by 2002:a05:7300:ed06:b0:2c8:72ff:bfb8 with SMTP id 5a478bee46e88-2c92e03c293mr2042700eec.0.1775055217518; Wed, 01 Apr 2026 07:53:37 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c3c3bda13csm12804830eec.6.2026.04.01.07.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 07:53:37 -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 v2 2/7] net/sched: netem: fix queue limit check to include reordered packets Date: Wed, 1 Apr 2026 07:51:54 -0700 Message-ID: <20260401145332.78285-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260401145332.78285-1-stephen@networkplumber.org> References: <20260401145332.78285-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