From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 97E7A407CDA; Tue, 21 Jul 2026 22:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673509; cv=none; b=sakgcJOmr2eyXMr38gKPS9yJ2ZXLjwFy6KYtmhMaFUBNrTyLzMcw/4BJZp6noJgZy66HHNno2psR3YKSNFwHZpktLIEHyxnbh2nmecCv7cHWqoxuuBuX9IX3AIGSlU/f19AKWNklWzHm7fEdkxD0gq5A1JL4nS17iBN8K3zOxIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673509; c=relaxed/simple; bh=QwTkPToA1kwrLK2jsFitJNUUQ+T36K6SkBE1AtMUSj8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C4T996Mz+WHB3jLcooX5mjJvw4+bI9RPLans0Rd6+E11jRezqV0gdyVIL8GsXZhVYZgYx7RaamdbiN2veIZZoGwBAcwDsnmLf7pMlFkkdf8QRzJlrVZEe/tdg/u8fny8RXbLJXAbCdjbmsMjyMpNzixTb/PUdu9UlRSX37Ugrck= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JD3KO+v1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JD3KO+v1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CF9B1F00AC4; Tue, 21 Jul 2026 22:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784673501; bh=7adf0UptX69QeCvVBHmqay+JkJEMx93WDAiJ39h/3HQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JD3KO+v1Ysc79xOq521AP+7a3jtK32DscRXFE6D/lfoAXUYrMtFqH3D4S+PF1tRTB 2vvt5S8ZCVbogpKoFFuA03UkGqEGeqO7pIxleBvA9NSuwMYckc6vZMNmpJupeIk8D8 QQcakpcFDDO5v82RvqILh8gSiw32gZjHpI+REWR8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 187/699] net/sched: sch_htb: annotate data-races (I) Date: Tue, 21 Jul 2026 17:19:06 +0200 Message-ID: <20260721152359.917160454@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@linuxfoundation.org> User-Agent: quilt/0.69 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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit e54c33503bf7cebb1c1790251ce90f1252678081 ] htb_dump() runs without holding qdisc spinlock. Add missing READ_ONCE()/WRITE_ONCE() annotations around q->overlimits and q->direct_pkts. Fixes: edb09eb17ed8 ("net: sched: do not acquire qdisc spinlock in qdisc/class stats dump") Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20260514095935.3926276-3-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_htb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index b301efa41c1ced..75ca5e5def3fea 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -536,7 +536,7 @@ htb_change_class_mode(struct htb_sched *q, struct htb_class *cl, s64 *diff) if (new_mode == HTB_CANT_SEND) { cl->overlimits++; - q->overlimits++; + WRITE_ONCE(q->overlimits, q->overlimits + 1); } if (cl->prio_activity) { /* not necessary: speed optimization */ @@ -592,7 +592,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch, /* enqueue to helper queue */ if (q->direct_queue.qlen < q->direct_qlen) { __qdisc_enqueue_tail(skb, &q->direct_queue); - q->direct_pkts++; + WRITE_ONCE(q->direct_pkts, q->direct_pkts + 1); } else { return qdisc_drop(skb, sch, to_free); } @@ -1050,12 +1050,12 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) struct nlattr *nest; struct tc_htb_glob gopt; - sch->qstats.overlimits = q->overlimits; + sch->qstats.overlimits = READ_ONCE(q->overlimits); /* Its safe to not acquire qdisc lock. As we hold RTNL, * no change can happen on the qdisc parameters. */ - gopt.direct_pkts = q->direct_pkts; + gopt.direct_pkts = READ_ONCE(q->direct_pkts); gopt.version = HTB_VER; gopt.rate2quantum = q->rate2quantum; gopt.defcls = q->defcls; -- 2.53.0