mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pkt_sched: Fix handling of gso skbs on requeuing 

Jay Cliburn noticed and diagnosed a bug triggered in
dev_gso_skb_destructor() after last change from qdisc->gso_skb
to qdisc->requeue list. Since gso_segmented skbs can't be queued
to another list this patch brings back qdisc->gso_skb for them.

Reported-by: Jay Cliburn <jcliburn@gmail.com>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski 2008-10-06 09:54:39 -07:00 committed by David S. Miller
parent 13c1d18931
commit 554794de79
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/sch_generic.h
View File

@ -52,6 +52,7 @@ struct Qdisc
u32 parent; u32 parent;
atomic_t refcnt; atomic_t refcnt;
unsigned long state; unsigned long state;
struct sk_buff *gso_skb;
struct sk_buff_head requeue; struct sk_buff_head requeue;
struct sk_buff_head q; struct sk_buff_head q;
struct netdev_queue *dev_queue; struct netdev_queue *dev_queue;

22
net/sched/sch_generic.c
View File

@ -44,7 +44,10 @@ static inline int qdisc_qlen(struct Qdisc *q)
static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q) static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
{ {
__skb_queue_head(&q->requeue, skb); if (unlikely(skb->next))
q->gso_skb = skb;
else
__skb_queue_head(&q->requeue, skb);
__netif_schedule(q); __netif_schedule(q);
return 0; return 0;
@ -52,7 +55,10 @@ static inline int dev_requeue_skb(struct sk_buff *skb, struct Qdisc *q)
static inline struct sk_buff *dequeue_skb(struct Qdisc *q) static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
{ {
struct sk_buff *skb = skb_peek(&q->requeue); struct sk_buff *skb = q->gso_skb;
if (!skb)
skb = skb_peek(&q->requeue);
if (unlikely(skb)) { if (unlikely(skb)) {
struct net_device *dev = qdisc_dev(q); struct net_device *dev = qdisc_dev(q);
@ -60,10 +66,15 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q)
/* check the reason of requeuing without tx lock first */ /* check the reason of requeuing without tx lock first */
txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb)); txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
if (!netif_tx_queue_stopped(txq) && !netif_tx_queue_frozen(txq)) if (!netif_tx_queue_stopped(txq) &&
__skb_unlink(skb, &q->requeue); !netif_tx_queue_frozen(txq)) {
else if (q->gso_skb)
q->gso_skb = NULL;
else
__skb_unlink(skb, &q->requeue);
} else {
skb = NULL; skb = NULL;
}
} else { } else {
skb = q->dequeue(q); skb = q->dequeue(q);
} }
@ -548,6 +559,7 @@ void qdisc_destroy(struct Qdisc *qdisc)
module_put(ops->owner); module_put(ops->owner);
dev_put(qdisc_dev(qdisc)); dev_put(qdisc_dev(qdisc));
kfree_skb(qdisc->gso_skb);
__skb_queue_purge(&qdisc->requeue); __skb_queue_purge(&qdisc->requeue);
kfree((char *) qdisc - qdisc->padded); kfree((char *) qdisc - qdisc->padded);