From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8746313B59A; Mon, 6 Jan 2025 15:57:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736179045; cv=none; b=EHQwfHQpzi9D9EQ758rldsWiVABNVxV5C63Kiauv0TMbTCX69PDs8gt02U79iP1YisTR08hWL9Nycf85UoK3WWAqmIbIq/tOdvEToIHSvpSFJIUnaJsqPsaLrUArObV1jbCkH9VNN1YkLZpdOnRXzk+90fWO7rJFvYqjb43ij3E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736179045; c=relaxed/simple; bh=GHR3uQB8XyOwPG+qHgPghhqaz7cffBmsWt/CuuUcFDM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qviqpxkJ1FIqaNb2+vrwacSKhCrNQsoNHi4XxzdYBb4OJrVy8ClbDvKJRgfPmjuhB8fZapBCRGjps/Tm1z4fhTKfd0NVKX239xK5YvxQ27J1ABS5TqTKErLmwEzFFUJRKFOJSEb26ve23rWSgdt5JDHnYLvxiv8bRew7jDeydoE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XeFcxrJB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XeFcxrJB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ED49C4CED2; Mon, 6 Jan 2025 15:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736179045; bh=GHR3uQB8XyOwPG+qHgPghhqaz7cffBmsWt/CuuUcFDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XeFcxrJBH2aUB7VQ4Un3MwuF/isvQpgp7SlXCgbJqQWhecEy/LHx+zGQBgHqEY1vK b8ZAzEA9owSz8SNkTvKlbU/NpV0zyIZ7izlqNqd7SakAMbsqzNVEcxlqNfDvcVXpLO RG4vF40tYBhUhq3aFP/O4lyVgD8GvmwdhXl6OvLw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lion Ackermann , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , "David S. Miller" , Artem Metla Subject: [PATCH 5.4 01/93] net: sched: fix ordering of qlen adjustment Date: Mon, 6 Jan 2025 16:16:37 +0100 Message-ID: <20250106151128.746093928@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151128.686130933@linuxfoundation.org> References: <20250106151128.686130933@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lion Ackermann commit 5eb7de8cd58e73851cd37ff8d0666517d9926948 upstream. Changes to sch->q.qlen around qdisc_tree_reduce_backlog() need to happen _before_ a call to said function because otherwise it may fail to notify parent qdiscs when the child is about to become empty. Signed-off-by: Lion Ackermann Acked-by: Toke Høiland-Jørgensen Signed-off-by: David S. Miller Cc: Artem Metla Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_cake.c | 2 +- net/sched/sch_choke.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1505,7 +1505,6 @@ static unsigned int cake_drop(struct Qdi b->backlogs[idx] -= len; b->tin_backlog -= len; sch->qstats.backlog -= len; - qdisc_tree_reduce_backlog(sch, 1, len); flow->dropped++; b->tin_dropped++; @@ -1516,6 +1515,7 @@ static unsigned int cake_drop(struct Qdi __qdisc_drop(skb, to_free); sch->q.qlen--; + qdisc_tree_reduce_backlog(sch, 1, len); cake_heapify(q, 0); --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -124,10 +124,10 @@ static void choke_drop_by_idx(struct Qdi if (idx == q->tail) choke_zap_tail_holes(q); + --sch->q.qlen; qdisc_qstats_backlog_dec(sch, skb); qdisc_tree_reduce_backlog(sch, 1, qdisc_pkt_len(skb)); qdisc_drop(skb, sch, to_free); - --sch->q.qlen; } struct choke_skb_cb {