Skip to content

Commit 8b42290

Browse files
edumazetgregkh
authored andcommitted
net/sched: sch_hfsc: annotate data-races in hfsc_dump_class_stats()
[ Upstream commit e300c7d ] hfsc_dump_class_stats() runs without qdisc spinlock being held. Add READ_ONCE()/WRITE_ONCE() annotations around: - cl->level - cl->cl_vtperiod - cl->cl_total - cl->cl_cumul Fixes: edb09eb ("net: sched: do not acquire qdisc spinlock in qdisc/class stats dump") Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Toke Høiland-Jørgensen <toke@toke.dk> Link: https://patch.msgid.link/20260513080853.1383975-4-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d29b9c3 commit 8b42290

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

net/sched/sch_hfsc.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ init_vf(struct hfsc_class *cl, unsigned int len)
715715
rtsc_min(&cl->cl_virtual, &cl->cl_fsc, cl->cl_vt, cl->cl_total);
716716
cl->cl_vtadj = 0;
717717

718-
cl->cl_vtperiod++; /* increment vt period */
718+
WRITE_ONCE(cl->cl_vtperiod, cl->cl_vtperiod + 1); /* increment vt period */
719719
cl->cl_parentperiod = cl->cl_parent->cl_vtperiod;
720720
if (cl->cl_parent->cl_nactive == 0)
721721
cl->cl_parentperiod++;
@@ -757,7 +757,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)
757757
go_passive = 1;
758758

759759
for (; cl->cl_parent != NULL; cl = cl->cl_parent) {
760-
cl->cl_total += len;
760+
WRITE_ONCE(cl->cl_total, cl->cl_total + len);
761761

762762
if (!(cl->cl_flags & HFSC_FSC) || cl->cl_nactive == 0)
763763
continue;
@@ -847,7 +847,7 @@ hfsc_adjust_levels(struct hfsc_class *cl)
847847
if (p->level >= level)
848848
level = p->level + 1;
849849
}
850-
cl->level = level;
850+
WRITE_ONCE(cl->level, level);
851851
} while ((cl = cl->cl_parent) != NULL);
852852
}
853853

@@ -1338,10 +1338,10 @@ hfsc_dump_class_stats(struct Qdisc *sch, unsigned long arg,
13381338
__u32 qlen;
13391339

13401340
qdisc_qstats_qlen_backlog(cl->qdisc, &qlen, &cl->qstats.backlog);
1341-
xstats.level = cl->level;
1342-
xstats.period = cl->cl_vtperiod;
1343-
xstats.work = cl->cl_total;
1344-
xstats.rtwork = cl->cl_cumul;
1341+
xstats.level = READ_ONCE(cl->level);
1342+
xstats.period = READ_ONCE(cl->cl_vtperiod);
1343+
xstats.work = READ_ONCE(cl->cl_total);
1344+
xstats.rtwork = READ_ONCE(cl->cl_cumul);
13451345

13461346
if (gnet_stats_copy_basic(d, NULL, &cl->bstats, true) < 0 ||
13471347
gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
@@ -1452,15 +1452,15 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt,
14521452
static void
14531453
hfsc_reset_class(struct hfsc_class *cl)
14541454
{
1455-
cl->cl_total = 0;
1456-
cl->cl_cumul = 0;
1455+
WRITE_ONCE(cl->cl_total, 0);
1456+
WRITE_ONCE(cl->cl_cumul, 0);
14571457
cl->cl_d = 0;
14581458
cl->cl_e = 0;
14591459
cl->cl_vt = 0;
14601460
cl->cl_vtadj = 0;
14611461
cl->cl_cvtmin = 0;
14621462
cl->cl_cvtoff = 0;
1463-
cl->cl_vtperiod = 0;
1463+
WRITE_ONCE(cl->cl_vtperiod, 0);
14641464
cl->cl_parentperiod = 0;
14651465
cl->cl_f = 0;
14661466
cl->cl_myf = 0;
@@ -1626,7 +1626,7 @@ hfsc_dequeue(struct Qdisc *sch)
16261626
bstats_update(&cl->bstats, skb);
16271627
update_vf(cl, qdisc_pkt_len(skb), cur_time);
16281628
if (realtime)
1629-
cl->cl_cumul += qdisc_pkt_len(skb);
1629+
WRITE_ONCE(cl->cl_cumul, cl->cl_cumul + qdisc_pkt_len(skb));
16301630

16311631
if (cl->cl_flags & HFSC_RSC) {
16321632
if (cl->qdisc->q.qlen != 0) {

0 commit comments

Comments
 (0)