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

netdev: Move gso_skb into netdev_queue. 

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-07-08 23:10:33 -07:00
parent c2aa288548
commit 970565bbad
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/netdevice.h
View File

@ -452,6 +452,7 @@ struct netdev_queue {
spinlock_t lock; spinlock_t lock;
struct net_device *dev; struct net_device *dev;
struct Qdisc *qdisc; struct Qdisc *qdisc;
struct sk_buff *gso_skb;
struct Qdisc *qdisc_sleeping; struct Qdisc *qdisc_sleeping;
struct list_head qdisc_list; struct list_head qdisc_list;
struct netdev_queue *next_sched; struct netdev_queue *next_sched;
@ -635,9 +636,6 @@ struct net_device
struct netdev_queue tx_queue ____cacheline_aligned_in_smp; struct netdev_queue tx_queue ____cacheline_aligned_in_smp;
unsigned long tx_queue_len; /* Max frames per queue allowed */ unsigned long tx_queue_len; /* Max frames per queue allowed */
/* Partially transmitted GSO packet. */
struct sk_buff *gso_skb;
/* /*
* One part is mostly used on xmit path (device) * One part is mostly used on xmit path (device)
*/ */

42
net/sched/sch_generic.c
View File

@ -63,10 +63,11 @@ static inline int qdisc_qlen(struct Qdisc *q)
} }
static inline int dev_requeue_skb(struct sk_buff *skb, struct net_device *dev, static inline int dev_requeue_skb(struct sk_buff *skb, struct net_device *dev,
struct netdev_queue *dev_queue,
struct Qdisc *q) struct Qdisc *q)
{ {
if (unlikely(skb->next)) if (unlikely(skb->next))
dev->gso_skb = skb; dev_queue->gso_skb = skb;
else else
q->ops->requeue(skb, q); q->ops->requeue(skb, q);
@ -75,12 +76,13 @@ static inline int dev_requeue_skb(struct sk_buff *skb, struct net_device *dev,
} }
static inline struct sk_buff *dev_dequeue_skb(struct net_device *dev, static inline struct sk_buff *dev_dequeue_skb(struct net_device *dev,
struct netdev_queue *dev_queue,
struct Qdisc *q) struct Qdisc *q)
{ {
struct sk_buff *skb; struct sk_buff *skb;
if ((skb = dev->gso_skb)) if ((skb = dev_queue->gso_skb))
dev->gso_skb = NULL; dev_queue->gso_skb = NULL;
else else
skb = q->dequeue(q); skb = q->dequeue(q);
@ -89,6 +91,7 @@ static inline struct sk_buff *dev_dequeue_skb(struct net_device *dev,
static inline int handle_dev_cpu_collision(struct sk_buff *skb, static inline int handle_dev_cpu_collision(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct netdev_queue *dev_queue,
struct Qdisc *q) struct Qdisc *q)
{ {
int ret; int ret;
@ -111,7 +114,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
* some time. * some time.
*/ */
__get_cpu_var(netdev_rx_stat).cpu_collision++; __get_cpu_var(netdev_rx_stat).cpu_collision++;
ret = dev_requeue_skb(skb, dev, q); ret = dev_requeue_skb(skb, dev, dev_queue, q);
} }
return ret; return ret;
@ -144,7 +147,7 @@ static inline int qdisc_restart(struct net_device *dev)
int ret = NETDEV_TX_BUSY; int ret = NETDEV_TX_BUSY;
/* Dequeue packet */ /* Dequeue packet */
if (unlikely((skb = dev_dequeue_skb(dev, q)) == NULL)) if (unlikely((skb = dev_dequeue_skb(dev, txq, q)) == NULL))
return 0; return 0;
@ -167,7 +170,7 @@ static inline int qdisc_restart(struct net_device *dev)
case NETDEV_TX_LOCKED: case NETDEV_TX_LOCKED:
/* Driver try lock failed */ /* Driver try lock failed */
ret = handle_dev_cpu_collision(skb, dev, q); ret = handle_dev_cpu_collision(skb, dev, txq, q);
break; break;
default: default:
@ -176,7 +179,7 @@ static inline int qdisc_restart(struct net_device *dev)
printk(KERN_WARNING "BUG %s code %d qlen %d\n", printk(KERN_WARNING "BUG %s code %d qlen %d\n",
dev->name, ret, q->q.qlen); dev->name, ret, q->q.qlen);
ret = dev_requeue_skb(skb, dev, q); ret = dev_requeue_skb(skb, dev, txq, q);
break; break;
} }
@ -578,31 +581,32 @@ void dev_activate(struct net_device *dev)
spin_unlock_bh(&txq->lock); spin_unlock_bh(&txq->lock);
} }
static void dev_deactivate_queue(struct net_device *dev, static void dev_deactivate_queue(struct netdev_queue *dev_queue,
struct netdev_queue *dev_queue,
struct Qdisc *qdisc_default) struct Qdisc *qdisc_default)
{ {
struct Qdisc *qdisc = dev_queue->qdisc; struct Qdisc *qdisc;
struct sk_buff *skb;
spin_lock_bh(&dev_queue->lock);
qdisc = dev_queue->qdisc;
if (qdisc) { if (qdisc) {
dev_queue->qdisc = qdisc_default; dev_queue->qdisc = qdisc_default;
qdisc_reset(qdisc); qdisc_reset(qdisc);
} }
skb = dev_queue->gso_skb;
dev_queue->gso_skb = NULL;
spin_unlock_bh(&dev_queue->lock);
kfree_skb(skb);
} }
void dev_deactivate(struct net_device *dev) void dev_deactivate(struct net_device *dev)
{ {
struct sk_buff *skb;
int running; int running;
spin_lock_bh(&dev->tx_queue.lock); dev_deactivate_queue(&dev->tx_queue, &noop_qdisc);
dev_deactivate_queue(dev, &dev->tx_queue, &noop_qdisc);
skb = dev->gso_skb;
dev->gso_skb = NULL;
spin_unlock_bh(&dev->tx_queue.lock);
kfree_skb(skb);
dev_watchdog_down(dev); dev_watchdog_down(dev);