diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-05-15 03:05:22 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-05-15 03:05:22 +0300 |
| commit | 8ee838c8888da88e27ef30739fefc882eb30478d (patch) | |
| tree | 487278a46e9fcff45365e79fdeb70dad6dba4df9 /include | |
| parent | f65d40643e425d2346d1fd7e1bbaa2efeeb8b70f (diff) | |
| parent | e300c7d470ad2726d6abf7d11b31b5d9912d9cf0 (diff) | |
| download | linux-8ee838c8888da88e27ef30739fefc882eb30478d.tar.xz | |
Merge branch 'net-sched-changes-around-qdisc_qstats_qlen_backlog'
Eric Dumazet says:
====================
net/sched: changes around qdisc_qstats_qlen_backlog()
First patch makes clear qdisc_qstats_qlen_backlog() runs locklessly.
Second patch changes ioam6 to not acquire qdisc spinlock anymore.
Third pach adds missing READ_ONCE()/WRITE_ONCE() annotations in hfsc.
htb still needs fixes, I will take care of them separately.
====================
Link: https://patch.msgid.link/20260513080853.1383975-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sch_generic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 9e6ed92729d2..d0ca932b1871 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -1070,13 +1070,13 @@ static inline int qdisc_qstats_copy(struct gnet_dump *d, const struct Qdisc *sch return gnet_stats_copy_queue(d, sch->cpu_qstats, &sch->qstats, qlen); } -static inline void qdisc_qstats_qlen_backlog(struct Qdisc *sch, __u32 *qlen, - __u32 *backlog) +static inline void qdisc_qstats_qlen_backlog(const struct Qdisc *sch, + u32 *qlen, u32 *backlog) { struct gnet_stats_queue qstats = { 0 }; gnet_stats_add_queue(&qstats, sch->cpu_qstats, &sch->qstats); - *qlen = qstats.qlen + qdisc_qlen(sch); + *qlen = qstats.qlen + qdisc_qlen_lockless(sch); *backlog = qstats.backlog; } |