Patch "net_sched: make qdisc_tree_decrease_qlen() work for non mq" has been added to the 4.3-stable tree

Patch "net_sched: make qdisc_tree_decrease_qlen() work for non mq" has been added to the 4.3-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    net_sched: make qdisc_tree_decrease_qlen() work for non mq

to the 4.3-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net_sched-make-qdisc_tree_decrease_qlen-work-for-non-mq.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Wed Dec 30 19:48:47 PST 2015
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 15 Dec 2015 09:43:12 -0800
Subject: net_sched: make qdisc_tree_decrease_qlen() work for non mq

From: Eric Dumazet <edumazet@google.com>

[ Upstream commit 225734de70cd0a9e0b978f3583a4a87939271d5e ]

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/sched/sch_api.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -950,7 +950,7 @@ qdisc_create(struct net_device *dev, str
 		}
 		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;


Patches currently in stable-queue which might be from edumazet@google.com are

queue-4.3/inet-tcp-fix-inetpeer_set_addr_v4.patch
queue-4.3/ipv6-sctp-clone-options-to-avoid-use-after-free.patch
queue-4.3/tcp-restore-fastopen-with-no-data-in-syn-packet.patch
queue-4.3/net_sched-make-qdisc_tree_decrease_qlen-work-for-non-mq.patch
queue-4.3/net-fix-ip-early-demux-races.patch