sch_tree_lock in cbq_put, hfsc_put_class and htb_put
Subsystems (3)
PATCH 1/1 sch_tree_lock in cbq_put, hfsc_put_class and htb_put
[NET_SCHED] sch_tree_lock in cbq_put, hfsc_put_class and htb_put
Qdisc_class_ops ->put() "methods" call xxx_destroy_class() functions without sch_tree_lock(), which is needed at least for qdisc_destroy() of a subqueue, but also for deactivating and list/rb_tree updates in case of HTB. (Since errors caused by such a bug could be very hard to reproduce the effectiveness of this patch wasn't confirmed by tests, but IMHO the need of this lock is quite obvious here.)
---
net/sched/sch_cbq.c | 14 ++++++++------ net/sched/sch_hfsc.c | 5 ++++- net/sched/sch_htb.c | 5 ++++- 3 files changed, 16 insertions(+), 8 deletions(-)
net/sched/sch_cbq.c +8 -6
@@ -1748,16 +1748,18 @@ static void cbq_put(struct Qdisc *sch, unsigned long arg)struct cbq_class *cl = (struct cbq_class *)arg;if (--cl->refcnt ==0 ) { +sch_tree_lock (sch);#ifdef CONFIG_NET_CLS_ACT -struct cbq_sched_data *q =qdisc_priv (sch); + { +struct cbq_sched_data *q =qdisc_priv (sch); -spin_lock_bh (&sch->dev->queue_lock); -if (q->rx_class == cl) - q->rx_class =NULL ; -spin_unlock_bh (&sch->dev->queue_lock); +if (q->rx_class == cl) + q->rx_class =NULL ; + }#endif cbq_destroy_class (sch, cl); +sch_tree_unlock (sch); } }
@@ -1965,10 +1967,10 @@ static int cbq_delete(struct Qdisc *sch, unsigned long arg)cbq_sync_defmap (cl);cbq_rmprio (q, cl); -sch_tree_unlock (sch);if (--cl->refcnt ==0 )cbq_destroy_class (sch, cl); +sch_tree_unlock (sch);return 0 ; }
net/sched/sch_hfsc.c +4 -1
@@ -1262,8 +1262,11 @@ hfsc_put_class(struct Qdisc *sch, unsigned long arg) {struct hfsc_class *cl = (struct hfsc_class *)arg; -if (--cl->refcnt ==0 ) +if (--cl->refcnt ==0 ) { +sch_tree_lock (sch);hfsc_destroy_class (sch, cl); +sch_tree_unlock (sch); + } } static unsigned long
net/sched/sch_htb.c +4 -1
@@ -1305,8 +1305,11 @@ static void htb_put(struct Qdisc *sch, unsigned long arg) {struct htb_class *cl = (struct htb_class *)arg; -if (--cl->refcnt ==0 ) +if (--cl->refcnt ==0 ) { +sch_tree_lock (sch);htb_destroy_class (sch, cl); +sch_tree_unlock (sch); + } } static int htb_change_class(struct Qdisc *sch, u32 classid,
This patch is wrong - don't apply, please!
Sorry,
Jarek P.
Quoted 10 lines · Jarek Poplawski
[
NET_SCHED]sch_tree_lockincbq_put,hfsc_put_classandhtb_put
Qdisc_class_ops->put() "methods" callxxx_destroy_class()functions withoutsch_tree_lock(), which is needed at least forqdisc_destroy()of a subqueue, but also for deactivating and list/rb_tree updates in case of HTB. (Since errors caused by such a bug could be very hard to reproduce the effectiveness of this patch wasn't confirmed by tests, but IMHO the need of this lock is quite obvious here.)Signed-off-by Jarek Poplawski <[email protected]>
...