net: sched: put back q.qlen into a single location
Subsystems (3)
PATCH 1/1 net: sched: put back q.qlen into a single location
In the series fc8b81a5981f ("Merge branch 'lockless-qdisc-series'") John made the assumption that the data path had no need to read the qdisc qlen (number of packets in the qdisc).
It is true when pfifo_fast is used as the root qdisc, or as direct MQ/MQPRIO children.
But pfifo_fast can be used as leaf in class full qdiscs, and existing logic needs to access the child qlen in an efficient way.
HTB breaks badly, since it uses cl->leaf.q->q.qlen in :
htb_activate() -> WARN_ON()
htb_dequeue_tree() to decide if a class can be htb_deactivated when it has no more packets.
HFSC, DRR, CBQ, QFQ have similar issues, and some calls to qdisc_tree_reduce_backlog() also read q.qlen directly.
Using qdisc_qlen_sum() (which iterates over all possible cpus) in the data path is a non starter.
It seems we have to put back qlen in a central location, at least for stable kernels.
For all qdisc but pfifo_fast, qlen is guarded by the qdisc lock, so the existing q.qlen{++|--} are correct.
For 'lockless' qdisc (pfifo_fast so far), we need to use atomic_{inc|dec}() because the spinlock might be not held (for example from pfifo_fast_enqueue() and pfifo_fast_dequeue())
This patch adds atomic_qlen (in the same location than qlen) and renames the following helpers, since we want to express they can be used without qdisc lock, and that qlen is no longer percpu.
- qdisc_qstats_cpu_qlen_dec -> qdisc_qstats_atomic_qlen_dec()
- qdisc_qstats_cpu_qlen_inc -> qdisc_qstats_atomic_qlen_inc()
Later (net-next) we might revert this patch by tracking all these qlen uses and replace them by a more efficient method (not having to access a precise qlen, but an empty/non_empty status that might be less expensive to maintain/track).
Another possibility is to have a legacy pfifo_fast version that would be used when used a a child qdisc, since the parent qdisc needs a spinlock anyway. But then, future lockless qdiscs would also have the same problem.
--- include/net/sch_generic.h | 31 +++++++++++++------------------ net/core/gen_stats.c | 2 -- net/sched/sch_generic.c | 13 ++++++------- 3 files changed, 19 insertions(+), 27 deletions(-)
include/net/sch_generic.h +13 -18
@@ -51,7 +51,10 @@ struct qdisc_size_table {struct qdisc_skb_head {struct sk_buff *head;struct sk_buff *tail; -__u32 qlen; +union { +u32 qlen; +atomic_t atomic_qlen; + };spinlock_t lock; };
@@ -408,27 +411,19 @@ static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)BUILD_BUG_ON (sizeof (qcb->data) < sz); } -static inline int qdisc_qlen_cpu (const struct Qdisc *q) -{ -return this_cpu_ptr (q->cpu_qstats)->qlen; -} -static inline int qdisc_qlen (const struct Qdisc *q) {return q->q.qlen; } -static inline int qdisc_qlen_sum (const struct Qdisc *q) +static inline u32 qdisc_qlen_sum (const struct Qdisc *q) { -__u32 qlen = q->qstats.qlen; -int i; +u32 qlen = q->qstats.qlen; -if (q->flags &TCQ_F_NOLOCK ) { -for_each_possible_cpu (i) - qlen +=per_cpu_ptr (q->cpu_qstats, i)->qlen; - }else { +if (q->flags &TCQ_F_NOLOCK ) + qlen +=atomic_read (&q->q.atomic_qlen); +else qlen += q->q.qlen; - }return qlen; }
@@ -825,14 +820,14 @@ static inline void qdisc_qstats_cpu_backlog_inc(struct Qdisc *sch,this_cpu_add (sch->cpu_qstats->backlog,qdisc_pkt_len (skb)); } -static inline void qdisc_qstats_cpu_qlen_inc (struct Qdisc *sch) +static inline void qdisc_qstats_atomic_qlen_inc (struct Qdisc *sch) { -this_cpu_inc (sch->cpu_qstats->qlen); +atomic_inc (&sch->q.atomic_qlen); } -static inline void qdisc_qstats_cpu_qlen_dec (struct Qdisc *sch) +static inline void qdisc_qstats_atomic_qlen_dec (struct Qdisc *sch) { -this_cpu_dec (sch->cpu_qstats->qlen); +atomic_dec (&sch->q.atomic_qlen); }static inline void qdisc_qstats_cpu_requeues_inc (struct Qdisc *sch)
net/core/gen_stats.c +0 -2
@@ -291,7 +291,6 @@ __gnet_stats_copy_queue_cpu(struct gnet_stats_queue *qstats,for_each_possible_cpu (i) {const struct gnet_stats_queue *qcpu =per_cpu_ptr (q, i); - qstats->qlen =0 ; qstats->backlog += qcpu->backlog; qstats->drops += qcpu->drops; qstats->requeues += qcpu->requeues;
@@ -307,7 +306,6 @@ void __gnet_stats_copy_queue(struct gnet_stats_queue *qstats,if (cpu) {__gnet_stats_copy_queue_cpu (qstats, cpu); }else { - qstats->qlen = q->qlen; qstats->backlog = q->backlog; qstats->drops = q->drops; qstats->requeues = q->requeues;
net/sched/sch_generic.c +6 -7
@@ -68,7 +68,7 @@ static inline struct sk_buff *__skb_dequeue_bad_txq(struct Qdisc *q) skb =__skb_dequeue (&q->skb_bad_txq);if (qdisc_is_percpu_stats (q)) {qdisc_qstats_cpu_backlog_dec (q, skb); -qdisc_qstats_cpu_qlen_dec (q); +qdisc_qstats_atomic_qlen_dec (q); }else {qdisc_qstats_backlog_dec (q, skb); q->q.qlen--;
@@ -108,7 +108,7 @@ static inline void qdisc_enqueue_skb_bad_txq(struct Qdisc *q,if (qdisc_is_percpu_stats (q)) {qdisc_qstats_cpu_backlog_inc (q, skb); -qdisc_qstats_cpu_qlen_inc (q); +qdisc_qstats_atomic_qlen_inc (q); }else {qdisc_qstats_backlog_inc (q, skb); q->q.qlen++;
@@ -147,7 +147,7 @@ static inline int dev_requeue_skb_locked(struct sk_buff *skb, struct Qdisc *q)qdisc_qstats_cpu_requeues_inc (q);qdisc_qstats_cpu_backlog_inc (q, skb); -qdisc_qstats_cpu_qlen_inc (q); +qdisc_qstats_atomic_qlen_inc (q); skb = next; }
@@ -252,7 +252,7 @@ static struct sk_buff *dequeue_skb(struct Qdisc *q, bool *validate, skb =__skb_dequeue (&q->gso_skb);if (qdisc_is_percpu_stats (q)) {qdisc_qstats_cpu_backlog_dec (q, skb); -qdisc_qstats_cpu_qlen_dec (q); +qdisc_qstats_atomic_qlen_dec (q); }else {qdisc_qstats_backlog_dec (q, skb); q->q.qlen--;
@@ -645,7 +645,7 @@ static int pfifo_fast_enqueue(struct sk_buff *skb, struct Qdisc *qdisc,if (unlikely (err))return qdisc_drop_cpu (skb, qdisc, to_free); -qdisc_qstats_cpu_qlen_inc (qdisc); +qdisc_qstats_atomic_qlen_inc (qdisc);/* Note: skb can not be used after skb_array_produce(), * so we better not use qdisc_qstats_cpu_backlog_inc() */
@@ -670,7 +670,7 @@ static struct sk_buff *pfifo_fast_dequeue(struct Qdisc *qdisc)if (likely (skb)) {qdisc_qstats_cpu_backlog_dec (qdisc, skb);qdisc_bstats_cpu_update (qdisc, skb); -qdisc_qstats_cpu_qlen_dec (qdisc); +qdisc_qstats_atomic_qlen_dec (qdisc); }return skb;
@@ -714,7 +714,6 @@ static void pfifo_fast_reset(struct Qdisc *qdisc)struct gnet_stats_queue *q =per_cpu_ptr (qdisc->cpu_qstats, i); q->backlog =0 ; - q->qlen =0 ; } }
Signature · 1 line
2.21.0.352.gf09ad66450-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Thu, 28 Feb 2019 12:55:43 -0800
Quoted 9 lines
In the series
fc8b81a5981f("Merge branch 'lockless-qdisc-series'") John made the assumption that the data path had no need to read the qdisc qlen (number of packets in the qdisc).It is true when
pfifo_fastis used as the root qdisc, or as direct MQ/MQPRIO children.But
pfifo_fastcan be used as leaf in class full qdiscs, and existing logic needs to access the child qlen in an efficient way.
...
I'm going to let this sit a bit for review...
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Thu, 28 Feb 2019 12:55:43 -0800
Quoted 17 lines
In the series
fc8b81a5981f("Merge branch 'lockless-qdisc-series'") John made the assumption that the data path had no need to read the qdisc qlen (number of packets in the qdisc).It is true when
pfifo_fastis used as the root qdisc, or as direct MQ/MQPRIO children.But
pfifo_fastcan be used as leaf in class full qdiscs, and existing logic needs to access the child qlen in an efficient way.HTB breaks badly, since it uses
cl->leaf.q->q.qlenin :
htb_activate()->WARN_ON()
htb_dequeue_tree()to decide if a class can behtb_deactivatedwhen it has no more packets.HFSC, DRR, CBQ, QFQ have similar issues, and some calls to
qdisc_tree_reduce_backlog()also read q.qlen directly.
...
Quoted 12 lines
This patch adds
atomic_qlen(in the same location than qlen) and renames the following helpers, since we want to express they can be used without qdisc lock, and that qlen is no longer percpu.-
qdisc_qstats_cpu_qlen_dec->qdisc_qstats_atomic_qlen_dec()
-qdisc_qstats_cpu_qlen_inc->qdisc_qstats_atomic_qlen_inc()Later (net-next) we might revert this patch by tracking all these qlen uses and replace them by a more efficient method (not having to access a precise qlen, but an empty/non_empty status that might be less expensive to maintain/track).
Quoted 7 lines
Another possibility is to have a legacy
pfifo_fastversion that would be used when used a a child qdisc, since the parent qdisc needs a spinlock anyway. But then, future lockless qdiscs would also have the same problem.Fixes 7e66016f2c65 ("net: sched: helpers to sum qlen and qlen for per cpu logic")Signed-off-by Eric Dumazet <[email protected]>
Applied and queued up for -stable, thanks Eric.
Quoted 15 lines · Eric Dumazet
In the series
fc8b81a5981f("Merge branch 'lockless-qdisc-series'") John made the assumption that the data path had no need to read the qdisc qlen (number of packets in the qdisc).It is true when
pfifo_fastis used as the root qdisc, or as direct MQ/MQPRIO children.But
pfifo_fastcan be used as leaf in class full qdiscs, and existing logic needs to access the child qlen in an efficient way.HTB breaks badly, since it uses
cl->leaf.q->q.qlenin :
htb_activate()->WARN_ON()
htb_dequeue_tree()to decide if a class can behtb_deactivatedwhen it has no more packets.
Quoted 6 lines
HFSC, DRR, CBQ, QFQ have similar issues, and some calls to
qdisc_tree_reduce_backlog()also read q.qlen directly.Using
qdisc_qlen_sum()(which iterates over all possible cpus) in the data path is a non starter.
Yep.
Quoted 3 lines
It seems we have to put back qlen in a central location, at least for stable kernels.
I can't think of anything better either unfortunately.
Quoted 11 lines
For all qdisc but
pfifo_fast, qlen is guarded by the qdisc lock, so the existing q.qlen{++|--} are correct.For 'lockless' qdisc (
pfifo_fastso far), we need to use atomic_{inc|dec}() because the spinlock might be not held (for example frompfifo_fast_enqueue()andpfifo_fast_dequeue())This patch adds
atomic_qlen(in the same location than qlen) and renames the following helpers, since we want to express they can be used without qdisc lock, and that qlen is no longer percpu.
Quoted 7 lines
-
qdisc_qstats_cpu_qlen_dec->qdisc_qstats_atomic_qlen_dec()
-qdisc_qstats_cpu_qlen_inc->qdisc_qstats_atomic_qlen_inc()Later (net-next) we might revert this patch by tracking all these qlen uses and replace them by a more efficient method (not having to access a precise qlen, but an empty/non_empty status that might be less expensive to maintain/track).
Right I think this is the next step.
Quoted 6 lines
Another possibility is to have a legacy
pfifo_fastversion that would be used when used a a child qdisc, since the parent qdisc needs a spinlock anyway. But then, future lockless qdiscs would also have the same problem.
I would prefer to optimize the qlen checks out for each qdisc but haven't checked its possible yet in all cases.
Quoted 6 lines
Fixes 7e66016f2c65 ("net: sched: helpers to sum qlen and qlen for per cpu logic")Signed-off-by Eric Dumazet <[email protected]>Cc John Fastabend <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Cong Wang <[email protected]>Cc Jiri Pirko <[email protected]>
Quoted 6 lines
--- include/net/sch_generic.h | 31 +++++++++++++------------------ net/core/gen_stats.c | 2 -- net/sched/sch_generic.c | 13 ++++++------- 3 files changed, 19 insertions(+), 27 deletions(-)
Thanks!
Paolo Abeni
maintainerHi,
Thank you for fixing this!
Quoted 4 lines · Eric Dumazet
Later (net-next) we might revert this patch by tracking all these qlen uses and replace them by a more efficient method (not having to access a precise qlen, but an empty/non_empty status that might be less expensive to maintain/track).
We are working on this. The final goal is using this info to enable TCQ_F_CAN_BYPASS for nolock qdisc, too, as we see regressions in uncontended scenarios with pfifo_fast compared to pre TCQ_F_NOLOCK implementation.
Please let us know if the "empty/non_empty status" refactor is in your radar, so we can avoid conflicts.
Thanks!
Paolo