From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (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 AB37631A07B for ; Sat, 18 Apr 2026 03:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776482438; cv=none; b=fUyq8si0I5Dme5NUoL7xvUFu4eKFqAbhzYla/tEvxvTpnbu4mMVf2GzDyvh+B8YWFuy5C+hcCH6S26z13peLelVBFce9mGdJql7IL1hAHH4ab46SGooONIDrFU6gDRvIY4qVKxn7bqdCmWbqY/TqNF1kyJ9JQzFJbIMdFbE3DO4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776482438; c=relaxed/simple; bh=KRFbZ8e8NoHIOWPL3KDgmYq2vaa/ItF3b70/29KtNxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lI/yQAMNP88i+JfqPFOmIdmwM4wVKieg/nJpwbHv9txuFWNYvZHVAnlmtW4wMFDz6DvPHqyiUOD7thFmWGoGiD0j5WDAxIX6NKD7iFI8NCEMN9BIUfDi5Yg32z7VOQbA6pM2YbVgMSiP/oS8WdEbPi+oIau50eIeL/uQ68IV+yo= 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=Tc+N59E+; arc=none smtp.client-ip=209.85.210.50 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="Tc+N59E+" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-7dca5f64e86so129406a34.0 for ; Fri, 17 Apr 2026 20:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1776482435; x=1777087235; 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=YY5iV7l6gxlqPZikCEp9TEV+FDZFJ5bzFc737a8jc5c=; b=Tc+N59E+g+B8o8RSlEwHZPJj0TtZBz0uihuGlSFlgGztRoJb2yIauIPOTy1R7HwUpR qmhK+DqM2gyDvdSFWMWg7e9HB7p8fOA3c5HTB06T4+ZM/o6nUpfWWQSL8Qmgcjf4nZ+T XgG3G44amwcm66KOjH6TuAQXAGLi7+98+9/Izb4OOn/lrz9UGF3CQQ1sqzH5pGNKeHOg fP1X9IQa9JKPYNKXoV1hOdWqFCQ9Q9ik6j9+VrRogvpkcgIz7eSKY4DNyHOISQosro0u kV9Xrdc4rvMB2kDeJLs3ADnq45bKcAJwHiPi4es9pRdPx1iGyXovV/H4lQCPsGhjRY4D YoBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776482435; x=1777087235; 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=YY5iV7l6gxlqPZikCEp9TEV+FDZFJ5bzFc737a8jc5c=; b=PH6Ut3ezEvEv+pg5twGjAX5YGXi+7sTXM1PccsRBuJj1eB8bHtuxM88+YpyJ5tYNbB WHwbpnJVjIrp5MG8TqoT/CUzPhPNoCB2maIulBsPNHE1kJJYHk5Dx10AshWIp1TrPdez O+cfDhDNgNmsKJlocY23XYPTBJQMzkcIp4F8i7V+zOxSqgdGvZSV5quJwnI/GHUVXQcd gVSdhroyc6dlUEcSnWgEtVdNccY9Kp79JHQfSkXC6z00ZqbVeaPd2T8WdQYqA5p2r+ds xHEA61t8s6cHowQC3JnmHHO0THzrrkq07cbHKM1ew40SPdtg6XuSnxwiAnHZtu/lB8Zm dMtw== X-Forwarded-Encrypted: i=1; AFNElJ/C4x/8YdLgXaA+Ssx2yO1aiYszqGMiYKM/bZ/otY0U8OvCL1jl+TfEDbM4d3xxlpTq2F5gWybZXOV+mH4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq2Dr3WT6wd/HduKttdS3eFsFBMSlsCpevL+QJ247kXNQSkyhW RjhAKariW7UrhzGZ9wlxxOaOZOj6miHxQP3GpCFWxU7eiSSGCPluca1NLGvWF8828OQ= X-Gm-Gg: AeBDietZdOc+6Iwxtg78PiDjZU32QYv3XKXbdF2ulIfZGfOvW5wDmwwmD+lOalqxBVM SCMcK3gsZrWmSbuN18SXmaJMusUNOpbmEeMXaE1AsED+YifHjLEF2HKyaLGER8JnnQAaX4Cl0uV voYI5eCuAKfNEAFQO/ShxdAz82K/FKqWVChRcA34874Mrsv2bCVA/lLz4j1PEud1lBBJssr4FDx 55CM5LQ94Gk/YKUmRfut89ti7JNDH0gpXywTwF5+Ca/k+XDKO8WOd8zMS7+omVDTU9QGbrH7VEh Uc0IxcZiiQ667Xn4fMQSD88M8lQZmpMzi73e89NBmucVX1EQReJucI5LwMoTlVmmTbTr/s7bP0X EGP9UjGjqTJ2WhwrwAPDkQQ13FN41EvQyP9sktp4LlzN2j8fZJwerw+vocxt9Xob/TtvPJ2Zdiv bdEKrPlP34XCFw0LKt1PwyF1o+0LL3gIgtGK2TgYX2GnI= X-Received: by 2002:a05:6830:2815:b0:7d7:48cc:ccdb with SMTP id 46e09a7af769-7dc9521cb0amr3588018a34.19.1776482434717; Fri, 17 Apr 2026 20:20:34 -0700 (PDT) Received: from phoenix.lan ([104.202.41.210]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7dca7b6b5bdsm276902a34.5.2026.04.17.20.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 20:20:34 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: jiri@resnulli.us, jhs@mojatatu.com, horms@kernel.org, Stephen Hemminger , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Martin Ottens , linux-kernel@vger.kernel.org (open list) Subject: [PATCH net v8 2/6] net/sched: netem: fix queue limit check to include reordered packets Date: Fri, 17 Apr 2026 20:19:40 -0700 Message-ID: <20260418032027.900913-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260418032027.900913-1-stephen@networkplumber.org> References: <20260418032027.900913-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: f8d4bc455047 ("net/sched: netem: account for backlog updates from child qdisc") 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