Skip to content

Commit c5f1dde

Browse files
edumazetdavem330
authored andcommitted
net_sched: sch_ets: implement lockless ets_dump()
Instead of relying on RTNL, ets_dump() can use READ_ONCE() annotations, paired with WRITE_ONCE() ones in ets_change(). Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent a1ac3a7 commit c5f1dde

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

net/sched/sch_ets.c

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,
646646

647647
sch_tree_lock(sch);
648648

649-
q->nbands = nbands;
649+
WRITE_ONCE(q->nbands, nbands);
650650
for (i = nstrict; i < q->nstrict; i++) {
651651
if (q->classes[i].qdisc->q.qlen) {
652652
list_add_tail(&q->classes[i].alist, &q->active);
@@ -658,11 +658,11 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,
658658
list_del(&q->classes[i].alist);
659659
qdisc_tree_flush_backlog(q->classes[i].qdisc);
660660
}
661-
q->nstrict = nstrict;
661+
WRITE_ONCE(q->nstrict, nstrict);
662662
memcpy(q->prio2band, priomap, sizeof(priomap));
663663

664664
for (i = 0; i < q->nbands; i++)
665-
q->classes[i].quantum = quanta[i];
665+
WRITE_ONCE(q->classes[i].quantum, quanta[i]);
666666

667667
for (i = oldbands; i < q->nbands; i++) {
668668
q->classes[i].qdisc = queues[i];
@@ -676,7 +676,7 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt,
676676
for (i = q->nbands; i < oldbands; i++) {
677677
qdisc_put(q->classes[i].qdisc);
678678
q->classes[i].qdisc = NULL;
679-
q->classes[i].quantum = 0;
679+
WRITE_ONCE(q->classes[i].quantum, 0);
680680
q->classes[i].deficit = 0;
681681
gnet_stats_basic_sync_init(&q->classes[i].bstats);
682682
memset(&q->classes[i].qstats, 0, sizeof(q->classes[i].qstats));
@@ -733,6 +733,7 @@ static int ets_qdisc_dump(struct Qdisc *sch, struct sk_buff *skb)
733733
struct ets_sched *q = qdisc_priv(sch);
734734
struct nlattr *opts;
735735
struct nlattr *nest;
736+
u8 nbands, nstrict;
736737
int band;
737738
int prio;
738739
int err;
@@ -745,21 +746,22 @@ static int ets_qdisc_dump(struct Qdisc *sch, struct sk_buff *skb)
745746
if (!opts)
746747
goto nla_err;
747748

748-
if (nla_put_u8(skb, TCA_ETS_NBANDS, q->nbands))
749+
nbands = READ_ONCE(q->nbands);
750+
if (nla_put_u8(skb, TCA_ETS_NBANDS, nbands))
749751
goto nla_err;
750752

751-
if (q->nstrict &&
752-
nla_put_u8(skb, TCA_ETS_NSTRICT, q->nstrict))
753+
nstrict = READ_ONCE(q->nstrict);
754+
if (nstrict && nla_put_u8(skb, TCA_ETS_NSTRICT, nstrict))
753755
goto nla_err;
754756

755-
if (q->nbands > q->nstrict) {
757+
if (nbands > nstrict) {
756758
nest = nla_nest_start(skb, TCA_ETS_QUANTA);
757759
if (!nest)
758760
goto nla_err;
759761

760-
for (band = q->nstrict; band < q->nbands; band++) {
762+
for (band = nstrict; band < nbands; band++) {
761763
if (nla_put_u32(skb, TCA_ETS_QUANTA_BAND,
762-
q->classes[band].quantum))
764+
READ_ONCE(q->classes[band].quantum)))
763765
goto nla_err;
764766
}
765767

@@ -771,7 +773,8 @@ static int ets_qdisc_dump(struct Qdisc *sch, struct sk_buff *skb)
771773
goto nla_err;
772774

773775
for (prio = 0; prio <= TC_PRIO_MAX; prio++) {
774-
if (nla_put_u8(skb, TCA_ETS_PRIOMAP_BAND, q->prio2band[prio]))
776+
if (nla_put_u8(skb, TCA_ETS_PRIOMAP_BAND,
777+
READ_ONCE(q->prio2band[prio])))
775778
goto nla_err;
776779
}
777780

0 commit comments

Comments
 (0)