Commit 896831f5 authored by Ed Cashin's avatar Ed Cashin Committed by Linus Torvalds
Browse files

aoe: kernel thread handles I/O completions for simple locking 



Make the frames the aoe driver uses to track the relationship between bios
and packets more flexible and detached, so that they can be passed to an
"aoe_ktio" thread for completion of I/O.

The frames are handled much like skbs, with a capped amount of
preallocation so that real-world use cases are likely to run smoothly and
degenerate gracefully even under memory pressure.

Decoupling I/O completion from the receive path and serializing it in a
process makes it easier to think about the correctness of the locking in
the driver, especially in the case of a remote MAC address becoming
unusable.

[dan.carpenter@oracle.com: cleanup an allocation a bit]
Signed-off-by: default avatarEd Cashin <ecashin@coraid.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d5b0605

drivers/block/aoe/aoe.h

+27 −6
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ enum { 
	NTARGETS = 8,

	NAOEIFS = 8,

	NSKBPOOLMAX = 128,

	NFACTIVE = 17,



	TIMERTICK = HZ / 10,

	MINTIMER = HZ >> 2,
@@ -112,13 +113,16 @@ struct buf { 
};



struct frame {

	int tag;

	struct list_head head;

	u32 tag;

	ulong waited;

	struct buf *buf;

	struct aoetgt *t;		/* parent target I belong to */

	char *bufaddr;

	ulong bcnt;

	sector_t lba;

	struct sk_buff *skb;

	struct sk_buff *skb;		/* command skb freed on module exit */

	struct sk_buff *r_skb;		/* response skb for async processing */

	struct bio_vec *bv;

	ulong bv_off;

};
@@ -133,16 +137,18 @@ struct aoeif { 
struct aoetgt {

	unsigned char addr[6];

	ushort nframes;

	struct frame *frames;

	struct aoedev *d;			/* parent device I belong to */

	struct list_head factive[NFACTIVE];	/* hash of active frames */

	struct list_head ffree;			/* list of free frames */

	struct aoeif ifs[NAOEIFS];

	struct aoeif *ifp;	/* current aoeif in use */

	ushort nout;

	ushort maxout;

	u16 lasttag;		/* last tag sent */

	u16 useme;

	ulong falloc;

	ulong lastwadj;		/* last window adjustment */

	int wpkts, rpkts;

	int dataref;

};



struct aoedev {
@@ -169,9 +175,20 @@ struct aoedev { 
	struct buf *inprocess;	/* the one we're currently working on */

	struct aoetgt *targets[NTARGETS];

	struct aoetgt **tgt;	/* target in use when working */

	struct aoetgt **htgt;	/* target needing rexmit assistance */

	struct aoetgt *htgt;	/* target needing rexmit assistance */

	ulong ntargets;

	ulong kicked;

};



/* kthread tracking */

struct ktstate {

	struct completion rendez;

	struct task_struct *task;

	wait_queue_head_t *waitq;

	int (*fn) (void);

	char *name;

	spinlock_t *lock;

};



int aoeblk_init(void);

void aoeblk_exit(void);
@@ -184,11 +201,14 @@ void aoechr_error(char *); 


void aoecmd_work(struct aoedev *d);

void aoecmd_cfg(ushort aoemajor, unsigned char aoeminor);

void aoecmd_ata_rsp(struct sk_buff *);

struct sk_buff *aoecmd_ata_rsp(struct sk_buff *);

void aoecmd_cfg_rsp(struct sk_buff *);

void aoecmd_sleepwork(struct work_struct *);

void aoecmd_cleanslate(struct aoedev *);

void aoecmd_exit(void);

int aoecmd_init(void);

struct sk_buff *aoecmd_ata_id(struct aoedev *);

void aoe_freetframe(struct frame *);



int aoedev_init(void);

void aoedev_exit(void);
@@ -196,6 +216,7 @@ struct aoedev *aoedev_by_aoeaddr(int maj, int min); 
struct aoedev *aoedev_by_sysminor_m(ulong sysminor);

void aoedev_downdev(struct aoedev *d);

int aoedev_flush(const char __user *str, size_t size);

void aoe_failbuf(struct aoedev *d, struct buf *buf);



int aoenet_init(void);

void aoenet_exit(void);

drivers/block/aoe/aoechr.c

+1 −2
Original line number Diff line number Diff line
@@ -86,10 +86,9 @@ revalidate(const char __user *str, size_t size) 
	if (copy_from_user(buf, str, size))

		return -EFAULT;



	/* should be e%d.%d format */

	n = sscanf(buf, "e%d.%d", &major, &minor);

	if (n != 2) {

		printk(KERN_ERR "aoe: invalid device specification\n");

		pr_err("aoe: invalid device specification %s\n", buf);

		return -EINVAL;

	}

	d = aoedev_by_aoeaddr(major, minor);

drivers/block/aoe/aoecmd.c

+471 −261

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/aoe/aoedev.c

+50 −34
Original line number Diff line number Diff line
@@ -48,47 +48,60 @@ dummy_timer(ulong vp) 
}



void

aoedev_downdev(struct aoedev *d)

aoe_failbuf(struct aoedev *d, struct buf *buf)

{

	struct aoetgt **t, **te;

	struct frame *f, *e;

	struct buf *buf;

	struct bio *bio;



	t = d->targets;

	te = t + NTARGETS;

	for (; t < te && *t; t++) {

		f = (*t)->frames;

		e = f + (*t)->nframes;

		for (; f < e; f->tag = FREETAG, f->buf = NULL, f++) {

			if (f->tag == FREETAG || f->buf == NULL)

				continue;

			buf = f->buf;

	if (buf == NULL)

		return;

	buf->flags |= BUFFL_FAIL;

	if (buf->nframesout == 0) {

		if (buf == d->inprocess) /* ensure we only process this once */

			d->inprocess = NULL;

		bio = buf->bio;

			if (--buf->nframesout == 0

			&& buf != d->inprocess) {

		mempool_free(buf, d->bufpool);

		bio_endio(bio, -EIO);

	}

}

		(*t)->maxout = (*t)->nframes;

		(*t)->nout = 0;



void

aoedev_downdev(struct aoedev *d)

{

	struct aoetgt *t, **tt, **te;

	struct frame *f;

	struct list_head *head, *pos, *nx;

	int i;



	/* clean out active buffers on all targets */

	tt = d->targets;

	te = tt + NTARGETS;

	for (; tt < te && (t = *tt); tt++) {

		for (i = 0; i < NFACTIVE; i++) {

			head = &t->factive[i];

			list_for_each_safe(pos, nx, head) {

				list_del(pos);

				f = list_entry(pos, struct frame, head);

				if (f->buf) {

					f->buf->nframesout--;

					aoe_failbuf(d, f->buf);

				}

				aoe_freetframe(f);

			}

	buf = d->inprocess;

	if (buf) {

		bio = buf->bio;

		mempool_free(buf, d->bufpool);

		bio_endio(bio, -EIO);

		}

		t->maxout = t->nframes;

		t->nout = 0;

	}



	/* clean out the in-process buffer (if any) */

	aoe_failbuf(d, d->inprocess);

	d->inprocess = NULL;

	d->htgt = NULL;



	/* clean out all pending I/O */

	while (!list_empty(&d->bufq)) {

		buf = container_of(d->bufq.next, struct buf, bufs);

		struct buf *buf = container_of(d->bufq.next, struct buf, bufs);

		list_del(d->bufq.next);

		bio = buf->bio;

		mempool_free(buf, d->bufpool);

		bio_endio(bio, -EIO);

		aoe_failbuf(d, buf);

	}



	if (d->gd)
@@ -242,13 +255,16 @@ aoedev_by_sysminor_m(ulong sysminor) 
static void

freetgt(struct aoedev *d, struct aoetgt *t)

{

	struct frame *f, *e;

	struct frame *f;

	struct list_head *pos, *nx, *head;



	f = t->frames;

	e = f + t->nframes;

	for (; f < e; f++)

	head = &t->ffree;

	list_for_each_safe(pos, nx, head) {

		list_del(pos);

		f = list_entry(pos, struct frame, head);

		skbfree(f->skb);

	kfree(t->frames);

		kfree(f);

	}

	kfree(t);

}

drivers/block/aoe/aoemain.c

+6 −2

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE