diff options
| author | Petr Machata <petrm@mellanox.com> | 2020-01-06 18:01:56 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-12 12:17:29 +0100 |
| commit | 672d3ca2f395c8e1b92b79c03ef38953dfe79caa (patch) | |
| tree | e0a9f7c00f21e0ead8905abf0cbc810d9beca6cc /net/sched | |
| parent | 741cf884069e8260c6ec9a1e7dcc5fe516867a60 (diff) | |
net: sch_prio: When ungrafting, replace with FIFO
[ Upstream commit 240ce7f6428ff5188b9eedc066e1e4d645b8635f ]
When a child Qdisc is removed from one of the PRIO Qdisc's bands, it is
replaced unconditionally by a NOOP qdisc. As a result, any traffic hitting
that band gets dropped. That is incorrect--no Qdisc was explicitly added
when PRIO was created, and after removal, none should have to be added
either.
Fix PRIO by first attempting to create a default Qdisc and only falling
back to noop when that fails. This pattern of attempting to create an
invisible FIFO, using NOOP only as a fallback, is also seen in other
Qdiscs.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_prio.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 5672abede0cc..1cbbd8c31405 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c @@ -314,8 +314,14 @@ static int prio_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, bool any_qdisc_is_offloaded; int err; - if (new == NULL) - new = &noop_qdisc; + if (!new) { + new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, + TC_H_MAKE(sch->handle, arg), extack); + if (!new) + new = &noop_qdisc; + else + qdisc_hash_add(new, true); + } *old = qdisc_replace(sch, new, &q->queues[band]); |