: aoe: Use SKB interfaces for list management instead of home-grown stuff.
Subsystems (4)
David Miller
maintainerPATCH 4/7 : aoe: Use SKB interfaces for list management instead of home-grown stuff.
aoe: Use SKB interfaces for list management instead of home-grown stuff.
Signed-off-by David S. Miller <[email protected]>
--- drivers/block/aoe/aoe.h | 9 ++--- drivers/block/aoe/aoeblk.c | 8 ++-- drivers/block/aoe/aoechr.c | 8 ++++- drivers/block/aoe/aoecmd.c | 85 ++++++++++++++++--------------------------- drivers/block/aoe/aoedev.c | 12 +++--- drivers/block/aoe/aoemain.c | 1 + drivers/block/aoe/aoenet.c | 9 ++--- 7 files changed, 56 insertions(+), 76 deletions(-)
drivers/block/aoe/aoe.h +3 -6
@@ -159,11 +159,8 @@ struct aoedev {sector_t ssize;struct timer_list timer;spinlock_t lock; -struct sk_buff *sendq_hd;/* packets needing to be sent, list head */ -struct sk_buff *sendq_tl; -struct sk_buff *skbpool_hd; -struct sk_buff *skbpool_tl; -int nskbpool; +struct sk_buff_head sendq; +struct sk_buff_head skbpool;mempool_t *bufpool;/* for deadlock-free Buf allocation */ struct list_head bufq;/* queue of bios to work on */ struct buf *inprocess;/* the one we're currently working on */
@@ -199,7 +196,7 @@ int aoedev_flush(const char __user *str, size_t size);int aoenet_init (void );void aoenet_exit (void ); -void aoenet_xmit (struct sk_buff *); +void aoenet_xmit (struct sk_buff_head *);int is_aoe_netif (struct net_device *ifp);int set_aoe_iflist (const char __user *str,size_t size);
drivers/block/aoe/aoeblk.c +4 -4
@@ -158,9 +158,9 @@ aoeblk_release(struct inode *inode, struct file *filp)static int aoeblk_make_request (struct request_queue *q,struct bio *bio) { +struct sk_buff_head queue;struct aoedev *d;struct buf *buf; -struct sk_buff *sl;ulong flags;blk_queue_bounce (q, &bio);
@@ -213,11 +213,11 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)list_add_tail (&buf->bufs, &d->bufq);aoecmd_work (d); - sl = d->sendq_hd; - d->sendq_hd = d->sendq_tl =NULL ; +__skb_queue_head_init (&queue); +skb_queue_splice_init (&d->sendq, &queue);spin_unlock_irqrestore (&d->lock, flags); -aoenet_xmit (sl); +aoenet_xmit (&queue);return 0 ; }
drivers/block/aoe/aoechr.c +7 -1
@@ -9,6 +9,7 @@#include <linux/completion.h> #include <linux/delay.h> #include <linux/smp_lock.h> +#include <linux/skbuff.h> #include "aoe.h" enum {
@@ -103,7 +104,12 @@ loop:spin_lock_irqsave (&d->lock, flags); goto loop; } -aoenet_xmit (skb); +if (skb) { +struct sk_buff_head queue; +__skb_queue_head_init (&queue); +__skb_queue_tail (&queue, skb); +aoenet_xmit (&queue); + }aoecmd_cfg (major, minor);return 0 ; }
drivers/block/aoe/aoecmd.c +32 -53
203 lines not on this page · raw message
drivers/block/aoe/aoedev.c +6 -6
@@ -188,14 +188,12 @@ skbfree(struct sk_buff *skb)static void skbpoolfree (struct aoedev *d) { -struct sk_buff *skb; +struct sk_buff *skb, *tmp; -while ((skb = d->skbpool_hd)) { - d->skbpool_hd = skb->next; - skb->next =NULL ; + skb_queue_walk_safe(&d->skbpool, skb, tmp)skbfree (skb); - } - d->skbpool_tl =NULL ; + +__skb_queue_head_init (&d->skbpool); }/* find it or malloc it */
@@ -217,6 +215,8 @@ aoedev_by_sysminor_m(ulong sysminor) goto out;INIT_WORK (&d->work, aoecmd_sleepwork);spin_lock_init (&d->lock); +skb_queue_head_init (&d->sendq); +skb_queue_head_init (&d->skbpool);init_timer (&d->timer); d->timer.data = (ulong ) d; d->timer.function = dummy_timer;
drivers/block/aoe/aoemain.c +1 -0
@@ -7,6 +7,7 @@#include <linux/hdreg.h> #include <linux/blkdev.h> #include <linux/module.h> +#include <linux/skbuff.h> #include "aoe.h" MODULE_LICENSE ("GPL" );
drivers/block/aoe/aoenet.c +3 -6
@@ -95,15 +95,12 @@ mac_addr(char addr[6]) }void -aoenet_xmit (struct sk_buff *sl) +aoenet_xmit (struct sk_buff_head *queue) { -struct sk_buff *skb; +struct sk_buff *skb, *tmp; -while ((skb = sl)) { - sl = sl->next; - skb->next = skb->prev =NULL ; + skb_queue_walk_safe(queue, skb, tmp)dev_queue_xmit (skb); - } }/*
Signature · 1 line
1.5.6.5