diff options
| author |  Petr Machata <petrm@mellanox.com>
| 2020-06-27 01:45:25 +0300 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2020-06-29 17:08:28 -0700 |
| commit | aebe4426ccaa4838f36ea805cdf7d76503e65117 (patch) | |
| tree | 2086a44d7f134b47c8817e68fc67f1e1d1fbc9ba /net/sched/sch_htb.c | |
| parent | Merge branch 'net-ethernet-ti-am65-cpsw-update-and-enable-sr2-0-soc' (diff) | |
| download | linux-aebe4426ccaa4838f36ea805cdf7d76503e65117.tar.gz linux-aebe4426ccaa4838f36ea805cdf7d76503e65117.tar.bz2 linux-aebe4426ccaa4838f36ea805cdf7d76503e65117.zip | |
net: sched: Pass root lock to Qdisc_ops.enqueue
A following patch introduces qevents, points in qdisc algorithm where
packet can be processed by user-defined filters. Should this processing
lead to a situation where a new packet is to be enqueued on the same port,
holding the root lock would lead to deadlocks. To solve the issue, qevent
handler needs to unlock and relock the root lock when necessary.
To that end, add the root lock argument to the qdisc op enqueue, and
propagate throughout.
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
| -rw-r--r-- | net/sched/sch_htb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 8184c87da8be..52fc513688b1 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -576,7 +576,7 @@ static inline void htb_deactivate(struct htb_sched *q, struct htb_class *cl) cl->prio_activity = 0; } -static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch, +static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch, spinlock_t *root_lock, struct sk_buff **to_free) { int uninitialized_var(ret); @@ -599,7 +599,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch, __qdisc_drop(skb, to_free); return ret; #endif - } else if ((ret = qdisc_enqueue(skb, cl->leaf.q, + } else if ((ret = qdisc_enqueue(skb, cl->leaf.q, root_lock, to_free)) != NET_XMIT_SUCCESS) { if (net_xmit_drop_count(ret)) { qdisc_qstats_drop(sch); |