net/sched: sch_hfsc: annotate data-races in hfsc_dump_class_stats()

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: edb09eb17ed8 ("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>

diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 59409ee2d2ff9279d7439b744030c0e845386de0..c06d2761a1fb9dbc711b18d61cfa8c28a7de0bd8 100644 (file)
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -715,7 +715,7 @@ init_vf(struct hfsc_class *cl, unsigned int len)
                        rtsc_min(&cl->cl_virtual, &cl->cl_fsc, cl->cl_vt, cl->cl_total);
                        cl->cl_vtadj = 0;
 
-                       cl->cl_vtperiod++;  /* increment vt period */
+                       WRITE_ONCE(cl->cl_vtperiod, cl->cl_vtperiod + 1);  /* increment vt period */
                        cl->cl_parentperiod = cl->cl_parent->cl_vtperiod;
                        if (cl->cl_parent->cl_nactive == 0)
                                cl->cl_parentperiod++;
@@ -757,7 +757,7 @@ update_vf(struct hfsc_class *cl, unsigned int len, u64 cur_time)
                go_passive = 1;
 
        for (; cl->cl_parent != NULL; cl = cl->cl_parent) {
-               cl->cl_total += len;
+               WRITE_ONCE(cl->cl_total, cl->cl_total + len);
 
                if (!(cl->cl_flags & HFSC_FSC) || cl->cl_nactive == 0)
                        continue;
@@ -847,7 +847,7 @@ hfsc_adjust_levels(struct hfsc_class *cl)
                        if (p->level >= level)
                                level = p->level + 1;
                }
-               cl->level = level;
+               WRITE_ONCE(cl->level, level);
        } while ((cl = cl->cl_parent) != NULL);
 }
 
@@ -1338,10 +1338,10 @@ hfsc_dump_class_stats(struct Qdisc *sch, unsigned long arg,
        __u32 qlen;
 
        qdisc_qstats_qlen_backlog(cl->qdisc, &qlen, &cl->qstats.backlog);
-       xstats.level   = cl->level;
-       xstats.period  = cl->cl_vtperiod;
-       xstats.work    = cl->cl_total;
-       xstats.rtwork  = cl->cl_cumul;
+       xstats.level   = READ_ONCE(cl->level);
+       xstats.period  = READ_ONCE(cl->cl_vtperiod);
+       xstats.work    = READ_ONCE(cl->cl_total);
+       xstats.rtwork  = READ_ONCE(cl->cl_cumul);
 
        if (gnet_stats_copy_basic(d, NULL, &cl->bstats, true) < 0 ||
            gnet_stats_copy_rate_est(d, &cl->rate_est) < 0 ||
@@ -1452,15 +1452,15 @@ hfsc_change_qdisc(struct Qdisc *sch, struct nlattr *opt,
 static void
 hfsc_reset_class(struct hfsc_class *cl)
 {
-       cl->cl_total        = 0;
-       cl->cl_cumul        = 0;
+       WRITE_ONCE(cl->cl_total, 0);
+       WRITE_ONCE(cl->cl_cumul, 0);
        cl->cl_d            = 0;
        cl->cl_e            = 0;
        cl->cl_vt           = 0;
        cl->cl_vtadj        = 0;
        cl->cl_cvtmin       = 0;
        cl->cl_cvtoff       = 0;
-       cl->cl_vtperiod     = 0;
+       WRITE_ONCE(cl->cl_vtperiod, 0);
        cl->cl_parentperiod = 0;
        cl->cl_f            = 0;
        cl->cl_myf          = 0;
@@ -1626,7 +1626,7 @@ hfsc_dequeue(struct Qdisc *sch)
        bstats_update(&cl->bstats, skb);
        update_vf(cl, qdisc_pkt_len(skb), cur_time);
        if (realtime)
-               cl->cl_cumul += qdisc_pkt_len(skb);
+               WRITE_ONCE(cl->cl_cumul, cl->cl_cumul + qdisc_pkt_len(skb));
 
        if (cl->cl_flags & HFSC_RSC) {
                if (cl->qdisc->q.qlen != 0) {