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/core | |
| parent | 5e701e49b7b40166cc56f7b0db205355095cad6b (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/core')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 3a46b86cbd67..c02bae927812 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3749,7 +3749,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, qdisc_calculate_pkt_len(skb, q); if (q->flags & TCQ_F_NOLOCK) { - rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK; + rc = q->enqueue(skb, q, NULL, &to_free) & NET_XMIT_MASK; qdisc_run(q); if (unlikely(to_free)) @@ -3792,7 +3792,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, qdisc_run_end(q); rc = NET_XMIT_SUCCESS; } else { - rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK; + rc = q->enqueue(skb, q, root_lock, &to_free) & NET_XMIT_MASK; if (qdisc_run_begin(q)) { if (unlikely(contended)) { spin_unlock(&q->busylock); |