[PATCH net] net_sched: make qdisc_tree_decrease_qlen() work for non mq

[PATCH net] net_sched: make qdisc_tree_decrease_qlen() work for non mq

[Eric Dumazet]

From: Eric Dumazet <edumazet@google.com>

Stas Nichiporovich reported a regression in his HFSC qdisc setup
on a non multi queue device.

It turns out I mistakenly added a TCQ_F_NOPARENT flag on all qdisc
allocated in qdisc_create() for non multi queue devices, which was
rather buggy. I was clearly mislead by the TCQ_F_ONETXQUEUE that is
also set here for no good reason, since it only matters for the root
qdisc.

Fixes: 4eaf3b84f288 ("net_sched: fix qdisc_tree_decrease_qlen() races")
Reported-by: Stas Nichiporovich <stasn77@gmail.com>
Tested-by: Stas Nichiporovich <stasn77@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/sched/sch_api.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 7ec667dd4ce1..b5c2cf2aa6d4 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -950,7 +950,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
 		}
 		lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock);
 		if (!netif_is_multiqueue(dev))
-			sch->flags |= TCQ_F_ONETXQUEUE | TCQ_F_NOPARENT;
+			sch->flags |= TCQ_F_ONETXQUEUE;
 	}
 
 	sch->handle = handle;

Re: [PATCH net] net_sched: make qdisc_tree_decrease_qlen() work for non mq

[David Miller]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 15 Dec 2015 09:43:12 -0800

> From: Eric Dumazet <edumazet@google.com>
> 
> Stas Nichiporovich reported a regression in his HFSC qdisc setup
> on a non multi queue device.
> 
> It turns out I mistakenly added a TCQ_F_NOPARENT flag on all qdisc
> allocated in qdisc_create() for non multi queue devices, which was
> rather buggy. I was clearly mislead by the TCQ_F_ONETXQUEUE that is
> also set here for no good reason, since it only matters for the root
> qdisc.
> 
> Fixes: 4eaf3b84f288 ("net_sched: fix qdisc_tree_decrease_qlen() races")
> Reported-by: Stas Nichiporovich <stasn77@gmail.com>
> Tested-by: Stas Nichiporovich <stasn77@gmail.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied and queued up for -stable.