github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net/sched: sch_dualpi2: annotate data-races in dualpi2_dump_stats()

Browse Source 
dualpi2_dump_stats() runs without qdisc lock held.

Add missing READ_ONCE()/WRITE_ONCE() annotations.

Fixes: d4de8bffbe ("sched: Dump configuration and statistics of dualpi2 qdisc")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Vineet Agarwal <agarwal.vineet2006@gmail.com>
Link: https://patch.msgid.link/20260514114713.4134674-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet 2026-05-14 11:47:13 +00:00 committed by Jakub Kicinski
parent 3931012141
commit 5658bddaca
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
net/sched/sch_dualpi2.c
View File

@ -190,7 +190,7 @@ static bool skb_apply_step(struct sk_buff *skb, struct dualpi2_sched_data *q)
static bool dualpi2_mark(struct dualpi2_sched_data *q, struct sk_buff *skb)
{
if (INET_ECN_set_ce(skb)) {
q->ecn_mark++;
WRITE_ONCE(q->ecn_mark, q->ecn_mark + 1);
return true;
}
return false;
@ -198,7 +198,7 @@ static bool dualpi2_mark(struct dualpi2_sched_data *q, struct sk_buff *skb)
static void dualpi2_reset_c_protection(struct dualpi2_sched_data *q)
{
q->c_protection_credit = q->c_protection_init;
WRITE_ONCE(q->c_protection_credit, q->c_protection_init);
}
/* This computes the initial credit value and WRR weight for the L queue (wl)
@ -403,12 +403,12 @@ static int dualpi2_enqueue_skb(struct sk_buff *skb, struct Qdisc *sch,
cb = dualpi2_skb_cb(skb);
cb->ts = ktime_get_ns();
q->memory_used += skb->truesize;
WRITE_ONCE(q->memory_used, q->memory_used + skb->truesize);
if (q->memory_used > q->max_memory_used)
q->max_memory_used = q->memory_used;
WRITE_ONCE(q->max_memory_used, q->memory_used);
if (qdisc_qlen(sch) > q->maxq)
q->maxq = qdisc_qlen(sch);
WRITE_ONCE(q->maxq, qdisc_qlen(sch));
if (skb_in_l_queue(skb)) {
/* Apply step thresh if skb is L4S && L-queue len >= min_qlen */
@ -417,14 +417,14 @@ static int dualpi2_enqueue_skb(struct sk_buff *skb, struct Qdisc *sch,
/* Keep the overall qdisc stats consistent */
qdisc_qlen_inc(sch);
qdisc_qstats_backlog_inc(sch, skb);
++q->packets_in_l;
WRITE_ONCE(q->packets_in_l, q->packets_in_l + 1);
if (!q->l_head_ts)
q->l_head_ts = cb->ts;
WRITE_ONCE(q->l_head_ts, cb->ts);
return qdisc_enqueue_tail(skb, q->l_queue);
}
++q->packets_in_c;
WRITE_ONCE(q->packets_in_c, q->packets_in_c + 1);
if (!q->c_head_ts)
q->c_head_ts = cb->ts;
WRITE_ONCE(q->c_head_ts, cb->ts);
return qdisc_enqueue_tail(skb, sch);
}
@ -531,17 +531,16 @@ static struct sk_buff *dequeue_packet(struct Qdisc *sch,
/* Keep the global queue size consistent */
qdisc_qlen_dec(sch);
q->memory_used -= skb->truesize;
} else if (c_len) {
skb = __qdisc_dequeue_head(&sch->q);
WRITE_ONCE(q->c_head_ts, head_enqueue_time(sch));
if (qdisc_qlen(q->l_queue))
*credit_change = ~((s32)q->c_protection_wl) + 1;
q->memory_used -= skb->truesize;
} else {
dualpi2_reset_c_protection(q);
return NULL;
}
WRITE_ONCE(q->memory_used, q->memory_used - skb->truesize);
*credit_change *= qdisc_pkt_len(skb);
qdisc_qstats_backlog_dec(sch, skb);
return skb;
@ -564,7 +563,7 @@ static int do_step_aqm(struct dualpi2_sched_data *q, struct sk_buff *skb,
}
if (dualpi2_mark(q, skb))
++q->step_marks;
WRITE_ONCE(q->step_marks, q->step_marks + 1);
}
qdisc_bstats_update(q->l_queue, skb);
return 0;
@ -600,7 +599,8 @@ static struct sk_buff *dualpi2_qdisc_dequeue(struct Qdisc *sch)
continue;
}
q->c_protection_credit += credit_change;
WRITE_ONCE(q->c_protection_credit,
q->c_protection_credit + credit_change);
qdisc_bstats_update(sch, skb);
break;
}
@ -876,7 +876,7 @@ static int dualpi2_change(struct Qdisc *sch, struct nlattr *opt,
WARN_ON_ONCE(1);
break;
}
q->memory_used -= skb->truesize;
WRITE_ONCE(q->memory_used, q->memory_used - skb->truesize);
rtnl_qdisc_drop(skb, sch);
} else if (qdisc_qlen(q->l_queue)) {
skb = qdisc_dequeue_internal(q->l_queue, true);
@ -890,7 +890,7 @@ static int dualpi2_change(struct Qdisc *sch, struct nlattr *opt,
*/
qdisc_qlen_dec(sch);
qdisc_qstats_backlog_dec(sch, skb);
q->memory_used -= skb->truesize;
WRITE_ONCE(q->memory_used, q->memory_used - skb->truesize);
rtnl_qdisc_drop(skb, q->l_queue);
qdisc_qstats_drop(sch);
} else {
@ -1046,15 +1046,15 @@ static int dualpi2_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
struct dualpi2_sched_data *q = qdisc_priv(sch);
struct tc_dualpi2_xstats st = {
.prob = READ_ONCE(q->pi2_prob),
.packets_in_c = q->packets_in_c,
.packets_in_l = q->packets_in_l,
.maxq = q->maxq,
.ecn_mark = q->ecn_mark,
.credit = q->c_protection_credit,
.step_marks = q->step_marks,
.memory_used = q->memory_used,
.max_memory_used = q->max_memory_used,
.memory_limit = q->memory_limit,
.packets_in_c = READ_ONCE(q->packets_in_c),
.packets_in_l = READ_ONCE(q->packets_in_l),
.maxq = READ_ONCE(q->maxq),
.ecn_mark = READ_ONCE(q->ecn_mark),
.credit = READ_ONCE(q->c_protection_credit),
.step_marks = READ_ONCE(q->step_marks),
.memory_used = READ_ONCE(q->memory_used),
.max_memory_used = READ_ONCE(q->max_memory_used),
.memory_limit = READ_ONCE(q->memory_limit),
};
u64 qc, ql;
@ -1074,16 +1074,16 @@ static void dualpi2_reset(struct Qdisc *sch)
qdisc_reset_queue(sch);
qdisc_reset_queue(q->l_queue);
q->c_head_ts = 0;
q->l_head_ts = 0;
q->pi2_prob = 0;
q->packets_in_c = 0;
q->packets_in_l = 0;
q->maxq = 0;
q->ecn_mark = 0;
q->step_marks = 0;
q->memory_used = 0;
q->max_memory_used = 0;
WRITE_ONCE(q->c_head_ts, 0);
WRITE_ONCE(q->l_head_ts, 0);
WRITE_ONCE(q->pi2_prob, 0);
WRITE_ONCE(q->packets_in_c, 0);
WRITE_ONCE(q->packets_in_l, 0);
WRITE_ONCE(q->maxq, 0);
WRITE_ONCE(q->ecn_mark, 0);
WRITE_ONCE(q->step_marks, 0);
WRITE_ONCE(q->memory_used, 0);
WRITE_ONCE(q->max_memory_used, 0);
dualpi2_reset_c_protection(q);
}