Patch "net: sched: do not requeue a NULL skb" has been added to the 4.5-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: sched: do not requeue a NULL skb
to the 4.5-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-do-not-requeue-a-null-skb.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon May 16 11:20:33 PDT 2016
From: Lars Persson <[email protected]>
Date: Tue, 12 Apr 2016 08:45:52 +0200
Subject: net: sched: do not requeue a NULL skb
From: Lars Persson <[email protected]>
[ Upstream commit 3dcd493fbebfd631913df6e2773cc295d3bf7d22 ]
A failure in validate_xmit_skb_list() triggered an unconditional call to dev_requeue_skb with skb=NULL. This slowly grows the queue discipline's qlen count until all traffic through the queue stops.
We take the optimistic approach and continue running the queue after a failure since it is unknown if later packets also will fail in the validate path.
--- net/sched/sch_generic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/sched/sch_generic.c +4 -1
@@ -159,12 +159,15 @@ int sch_direct_xmit(struct sk_buff *skb,if (validate) skb =validate_xmit_skb_list (skb, dev); -if (skb) { +if (likely (skb)) {HARD_TX_LOCK (dev, txq,smp_processor_id ());if (!netif_xmit_frozen_or_stopped (txq)) skb =dev_hard_start_xmit (skb, dev, txq, &ret);HARD_TX_UNLOCK (dev, txq); + }else { +spin_lock (root_lock); +return qdisc_qlen (q); }spin_lock (root_lock);
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/net-sched-do-not-requeue-a-null-skb.patch