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 0B9C91482F5; Wed, 7 May 2025 18:57:10 +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=1746644230; cv=none; b=DrTYfNlwOaYqGmEwpUxse9AvUbrnqwn/5nR+YmY0VlJAF7LzWVxb1o+sG+j6KNpoYVJnpAQ8VLpFwyA9NZtbRhbGo4vBDy6aX7u+L0eGaoBkz/wDo/b7gZs97MOuJXP5jKLFw2/+qswNdFyN2pVM+oKc20vZnqE+0tvHNAqguHo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746644230; c=relaxed/simple; bh=ik6i85Y7Wjw6h8srq4pLVAvJl8Y1Tr2bmFedDZDqti8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=snZOpcMP1LnDGdzihapCcOV3r490ioH/3/DCSChdTYpFgNSRpCRuVupnYBFfaxGRRrVANSnvLbASMoxTmHqitg3E97N/FaVZRxrn+d7ubiC0F/32IhhIcqLtZ9Dz8KJxfYlExH6esPQ+szZmpFz1P/s4glnHYVXnpAp4rl2QxLM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bcRIR6zq; 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="bcRIR6zq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 636BBC4CEE2; Wed, 7 May 2025 18:57:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1746644229; bh=ik6i85Y7Wjw6h8srq4pLVAvJl8Y1Tr2bmFedDZDqti8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcRIR6zqv++07HCs3edl54lVhywmJpVOMCblslImZyrIfyZELYkq1/hm4uBhVKin+ 6ytmgm3JxD8Csu/h6GNUkFat3cKanF+hcmnrn0viI4VfB7R03mMYHdqyB8tmYwk0C+ ybcKt/PN3p0X+eDLml3NI01DmzENwXJOPu9cNI3U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gerrard Tai , Cong Wang , Simon Horman , Jamal Hadi Salim , Paolo Abeni Subject: [PATCH 6.14 161/183] sch_htb: make htb_qlen_notify() idempotent Date: Wed, 7 May 2025 20:40:06 +0200 Message-ID: <20250507183831.389555671@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507183824.682671926@linuxfoundation.org> References: <20250507183824.682671926@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cong Wang commit 5ba8b837b522d7051ef81bacf3d95383ff8edce5 upstream. htb_qlen_notify() always deactivates the HTB class and in fact could trigger a warning if it is already deactivated. Therefore, it is not idempotent and not friendly to its callers, like fq_codel_dequeue(). Let's make it idempotent to ease qdisc_tree_reduce_backlog() callers' life. Reported-by: Gerrard Tai Signed-off-by: Cong Wang Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250403211033.166059-2-xiyou.wangcong@gmail.com Acked-by: Jamal Hadi Salim Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_htb.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -1485,6 +1485,8 @@ static void htb_qlen_notify(struct Qdisc { struct htb_class *cl = (struct htb_class *)arg; + if (!cl->prio_activity) + return; htb_deactivate(qdisc_priv(sch), cl); }