+ aoe-ensure-we-initialise-the-request_queue-correctly.patch added to -mm tree
Subsystems (2)
[email protected]
tree noticeThe patch titled
aoe: ensure we initialise the request_queue correctly
has been added to the -mm tree. Its filename is
aoe-ensure-we-initialise-the-request_queue-correctly.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: aoe: ensure we initialise the request_queue correctly
From: Andy Whitcroft <[email protected]>
When using the aoe driver we see an oops triggered by use of an incorrectly initialised request_queue object:
[ 2645.959090] kobject '<NULL>' (ffff880059ca22c0): tried to add an uninitialized object, something is seriously wrong. [ 2645.959104] Pid: 6, comm: events/0 Not tainted 2.6.31-5-generic #24-Ubuntu [ 2645.959107] Call Trace: [ 2645.959139] [<ffffffff8126ca2f>] kobject_add+0x5f/0x70 [ 2645.959151] [<ffffffff8125b4ab>] blk_register_queue+0x8b/0xf0 [ 2645.959155] [<ffffffff8126043f>] add_disk+0x8f/0x160 [ 2645.959161] [<ffffffffa01673c4>] aoeblk_gdalloc+0x164/0x1c0 [aoe]
It seems this driver mearly embeds a request_queue object in its main control structure and does not attempt to initialise it. Pull this out and use blk_init_queue/blk_cleanup_queue to handle initialisation and teardown of this object.
Bruno bisected this regression down to
cd43e26f071524647e660706b784ebcbefbd2e44
block: Expose stacked device queues in sysfs
"This seems to generate /sys/block/$device/queue and its contents for
everyone who is using queues, not just for those queues that have a non-NULL queue->request_fn."
Addresses http://bugs.launchpad.net/bugs/410198
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13942
---
drivers/block/aoe/aoe.h | 2 +- drivers/block/aoe/aoeblk.c | 6 +++--- drivers/block/aoe/aoedev.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 5 deletions(-)
drivers/block/aoe/aoe.h renamed from drivers/block/aoe/aoe.h~aoe-ensure-we-initialise-the-request_queue-correctly +1 -1
@@ -155,7 +155,7 @@ struct aoedev {u16 fw_ver;/* version of blade's firmware */ struct work_struct work;/* disk create work struct */ struct gendisk *gd; -struct request_queue blkq; +struct request_queue *blkq;struct hd_geometry geo;sector_t ssize;struct timer_list timer;
drivers/block/aoe/aoeblk.c renamed from drivers/block/aoe/aoeblk.c~aoe-ensure-we-initialise-the-request_queue-correctly +3 -3
@@ -264,8 +264,8 @@ aoeblk_gdalloc(void *vp) goto err_disk; } -blk_queue_make_request (&d->blkq, aoeblk_make_request); -if (bdi_init (&d->blkq.backing_dev_info)) +blk_queue_make_request (d->blkq, aoeblk_make_request); +if (bdi_init (&d->blkq->backing_dev_info)) goto err_mempool;spin_lock_irqsave (&d->lock, flags); gd->major =AOE_MAJOR ;
@@ -276,7 +276,7 @@ aoeblk_gdalloc(void *vp)snprintf (gd->disk_name,sizeof gd->disk_name,"etherd/e%ld.%d" , d->aoemajor, d->aoeminor); - gd->queue = &d->blkq; + gd->queue = d->blkq; d->gd = gd; d->flags &= ~DEVFL_GDALLOC ; d->flags |=DEVFL_UP ;
drivers/block/aoe/aoedev.c renamed from drivers/block/aoe/aoedev.c~aoe-ensure-we-initialise-the-request_queue-correctly +10 -1
@@ -113,6 +113,7 @@ aoedev_freedev(struct aoedev *d)if (d->bufpool)mempool_destroy (d->bufpool);skbpoolfree (d); +blk_cleanup_queue (d->blkq);kfree (d); }
@@ -202,6 +203,7 @@ aoedev_by_sysminor_m(ulong sysminor) {struct aoedev *d;ulong flags; +struct request_queue *rq;spin_lock_irqsave (&devlist_lock, flags);
@@ -210,9 +212,13 @@ aoedev_by_sysminor_m(ulong sysminor)break ;if (d) goto out; + rq =blk_init_queue (NULL ,NULL ); +if (!rq) + goto out; d =kcalloc (1 ,sizeof *d,GFP_ATOMIC );if (!d) - goto out; + goto out_rq; + d->blkq = rq;INIT_WORK (&d->work, aoecmd_sleepwork);spin_lock_init (&d->lock);skb_queue_head_init (&d->sendq);
@@ -234,6 +240,9 @@ aoedev_by_sysminor_m(ulong sysminor) out:spin_unlock_irqrestore (&devlist_lock, flags);return d; + out_rq: +blk_cleanup_queue (rq); + goto out; } static void
_
Patches currently in -mm which might be from [email protected] are
aoe-ensure-we-initialise-the-request_queue-correctly.patch hugetlb-balance-freeing-of-huge-pages-across-nodes.patch hugetlb-use-free_pool_huge_page-to-return-unused-surplus-pages.patch hugetlb-use-free_pool_huge_page-to-return-unused-surplus-pages-fix.patch hugetlb-clean-up-and-update-huge-pages-documentation.patch hugetlb-restore-interleaving-of-bootmem-huge-pages.patch checkpatch-possible-types-else-cannot-start-a-type.patch checkpatch-handle-c99-comments-correctly-performance-issue.patch checkpatch-indent-checks-stop-when-we-run-out-of-continuation-lines.patch checkpatch-make-f-alias-file-add-help-more-verbose-help-message.patch checkpatch-format-strings-should-not-have-brackets-in-macros.patch checkpatch-limit-sn-un-matches-to-actual-bit-sizes.patch checkpatch-version-029.patch
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 aoe: end barrier bios with EOPNOTSUPP
Bruno Premont noticed that aoe throws a BUG during umount of an XFS in 2.6.31:
[ 5259.349897] aoe: bi_io_vec is NULL [ 5259.349940] ------------[ cut here ]------------ [ 5259.349958] kernel BUG at /usr/src/linux-2.6/drivers/block/aoe/aoeblk.c:177! [ 5259.349990] invalid opcode: 0000 [#1]
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with -EOPNOTSUPP by any driver that provides its own ->make_request_fn handler and does not handle barriers.
In testing the changes below eliminate the BUG.
---
After this patch has been reviewed I plan to add this patch to the aoe quilt tree for linux-next.
drivers/block/aoe/aoeblk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/block/aoe/aoeblk.c +3 -0
@@ -172,6 +172,9 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)BUG ();bio_endio (bio, -ENXIO );return 0 ; + }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );BUG ();
Signature · 7 lines
1.5.6.5 -- Ed Cashin http://noserose.net/e/ http://www.coraid.com/
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
On Wed Sep 9 12:45:17 EDT 2009, [email protected] wrote:
...
drivers/block/aoe/aoeblk.c aoeblk_make_request(struct request_queue *q, struct bio *bio) · line 180
Quoted 6 lines
drivers/block/aoe/aoeblk.c +3
-0+ }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );BUG ();
Bah. I should have run checkpatch.pl. I will re-do this patch using real tabs.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
aoe: end barrier bios with EOPNOTSUPP
Bruno Premont noticed that aoe throws a BUG during umount of an XFS in 2.6.31:
[ 5259.349897] aoe: bi_io_vec is NULL [ 5259.349940] ------------[ cut here ]------------ [ 5259.349958] kernel BUG at /usr/src/linux-2.6/drivers/block/aoe/aoeblk.c:177! [ 5259.349990] invalid opcode: 0000 [#1]
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with -EOPNOTSUPP by any driver that provides its own ->make_request_fn handler and does not handle barriers.
In testing the changes below eliminate the BUG.
---
After this patch has been reviewed I plan to add this patch to the aoe quilt tree for linux-next.
drivers/block/aoe/aoeblk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/block/aoe/aoeblk.c +3 -0
@@ -172,6 +172,9 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)BUG ();bio_endio (bio, -ENXIO );return 0 ; + }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );BUG ();
Signature · 7 lines
1.5.6.5 -- Ed Cashin <[email protected]> http://noserose.net/e/ http://www.coraid.com/
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
In reply to Ed CashinQuoted 12 lines · Ed Cashin
drivers/block/aoe/aoeblk.c +3
-0@@ -172,6 +172,9 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)BUG ();bio_endio (bio, -ENXIO );return 0 ; + }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );
Quoted 1 line
BUG();
Could you run this through script/checkpatch.pl and fix any errors you find.. It looks like your not indenting properly ..
Daniel
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
In reply to Ed CashinQuoted 6 lines
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with
-EOPNOTSUPPby any driver that provides its own ->make_request_fn handler and does not handle barriers.In testing the changes below eliminate the BUG.
Presumably AoE should actually issue an ATA cache flush for this case ?
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 8 lines · On Wed Sep 9 13:06:42 EDT 2009, [email protected] wrote:
Quoted 6 lines
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with
-EOPNOTSUPPby any driver that provides its own ->make_request_fn handler and does not handle barriers.In testing the changes below eliminate the BUG.
Presumably AoE should actually issue an ATA cache flush for this case ?
Yes. The aoe driver juggles a set of in-process I/O operations that have been sent to the AoE target but have not yet received responses.
To implement the barrier, it would stop generating new AoE write commands, wait for AoE write responses for all the outstanding write commands, issue the ATA cache flush command, wait for the response to the flush, and then resume normal activity.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 10 lines · Ed Cashin
Quoted 8 lines · On Wed Sep 9 13:06:42 EDT 2009, [email protected] wrote:
Quoted 6 lines
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with
-EOPNOTSUPPby any driver that provides its own ->make_request_fn handler and does not handle barriers.In testing the changes below eliminate the BUG.
Presumably AoE should actually issue an ATA cache flush for this case ?
Quoted 7 lines
Yes. The aoe driver juggles a set of in-process I/O operations that have been sent to the AoE target but have not yet received responses.
To implement the barrier, it would stop generating new AoE write commands, wait for AoE write responses for all the outstanding write commands, issue the ATA cache flush command, wait for the response to the flush, and then resume normal activity.
That's how barriers work with sata to begin with, so I'd very much recommend that you do the same in aoe instead of just not supporting it.
Signature · 1 line
Jens Axboe
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 1 line · On Wed Sep 9 16:59:30 EDT 2009, [email protected] wrote:
On Wed, Sep 09 2009, Ed Cashin wrote:
...
Quoted 7 lines
Quoted 4 lines
To implement the barrier, [aoe] would stop generating new AoE write commands, wait for AoE write responses for all the outstanding write commands, issue the ATA cache flush command, wait for the response to the flush, and then resume normal activity.
That's how barriers work with sata to begin with, so I'd very much recommend that you do the same in aoe instead of just not supporting it.
This patch with EOPNOTSUPP just fixes the regression in 2.6.31-rc9.
A patch adding support for barriers would be nice. Since I have limited time I tried to motivate that work by using the torture tests that Chris Mason (I believe it was) posted a while ago, but I could not get any problems to manifest using that torture test.
If I had a reproducable problem case that the barrier implementation could fix, it would be very helpful.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 13 lines · Ed Cashin
Quoted 1 line · On Wed Sep 9 16:59:30 EDT 2009, [email protected] wrote:
On Wed, Sep 09 2009, Ed Cashin wrote:
...
Quoted 7 lines
Quoted 4 lines
To implement the barrier, [aoe] would stop generating new AoE write commands, wait for AoE write responses for all the outstanding write commands, issue the ATA cache flush command, wait for the response to the flush, and then resume normal activity.
That's how barriers work with sata to begin with, so I'd very much recommend that you do the same in aoe instead of just not supporting it.
This patch with EOPNOTSUPP just fixes the regression in 2.6.31-rc9.
Quoted 7 lines
A patch adding support for barriers would be nice. Since I have limited time I tried to motivate that work by using the torture tests that Chris Mason (I believe it was) posted a while ago, but I could not get any problems to manifest using that torture test.
If I had a reproducable problem case that the barrier implementation could fix, it would be very helpful.
Depending on timing and the other end, it may not be easy to reproduce. But the problem is indeed real, so I think you should just add the proper barrier implementation instead of spending too much time trying to create a reproducable problem. By the time you get there, you could have fixed it many times over :-)
Signature · 1 line
Jens Axboe
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 1 line · On Thu Sep 10 03:48:22 EDT 2009, [email protected] wrote:
On Wed, Sep 09 2009, Ed Cashin wrote:
...
Quoted 8 lines
Quoted 2 lines
If I had a reproducable problem case that the barrier implementation could fix, it would be very helpful.
Depending on timing and the other end, it may not be easy to reproduce. But the problem is indeed real, so I think you should just add the proper barrier implementation instead of spending too much time trying to create a reproducable problem. By the time you get there, you could have fixed it many times over :-)
OK. I will start work on it. But if anybody can give me a torture test that works on aoe devices, I'll be grateful.
I think the EOPNOTSUPP patch is good for the for-next aoe quilt tree, while the new barrier support will be good for 2.6.32.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 12 lines · Ed Cashin
Quoted 1 line · On Thu Sep 10 03:48:22 EDT 2009, [email protected] wrote:
On Wed, Sep 09 2009, Ed Cashin wrote:
...
Quoted 8 lines
Quoted 2 lines
If I had a reproducable problem case that the barrier implementation could fix, it would be very helpful.
Depending on timing and the other end, it may not be easy to reproduce. But the problem is indeed real, so I think you should just add the proper barrier implementation instead of spending too much time trying to create a reproducable problem. By the time you get there, you could have fixed it many times over :-)
Quoted 5 lines
OK. I will start work on it. But if anybody can give me a torture test that works on aoe devices, I'll be grateful.
I think the EOPNOTSUPP patch is good for the for-next aoe quilt tree, while the new barrier support will be good for 2.6.32.
.31 is already out, so there's plenty of time to fix it for .32 for real. I don't mind putting in the temporary fix in the mean time, though.
Signature · 1 line
Jens Axboe
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 1 line · On Thu Sep 10 15:50:23 EDT 2009, [email protected] wrote:
On Thu, Sep 10 2009, Ed Cashin wrote:
...
Quoted 6 lines
Quoted 2 lines
I think the EOPNOTSUPP patch is good for the for-next aoe quilt tree, while the new barrier support will be good for 2.6.32.
.31 is already out, so there's plenty of time to fix it for .32 for real. I don't mind putting in the temporary fix in the mean time, though.
I missed that. It was still rc9 when I pulled earlier today, so I put the temporary fix into the aoe quilt tree for linux-next.
Now that 2.6.31 is out, I suppose this patch should be taken out of the aoe quilt tree for linux-next and submitted for inclusion in 2.6.31.1.
So, yes, if you don't mind pushing the patch to the appropriate place, that would be great.
Now I have to figure out why the other patch in aoe's quilt tree for linux-next never made it to 2.6.31.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 13 lines · Ed Cashin
Quoted 1 line · On Thu Sep 10 15:50:23 EDT 2009, [email protected] wrote:
On Thu, Sep 10 2009, Ed Cashin wrote:
...
Quoted 6 lines
Quoted 2 lines
I think the EOPNOTSUPP patch is good for the for-next aoe quilt tree, while the new barrier support will be good for 2.6.32.
.31 is already out, so there's plenty of time to fix it for .32 for real. I don't mind putting in the temporary fix in the mean time, though.
I missed that. It was still rc9 when I pulled earlier today, so I put the temporary fix into the aoe quilt tree for linux-next.
Quoted 6 lines
Now that 2.6.31 is out, I suppose this patch should be taken out of the aoe quilt tree for linux-next and submitted for inclusion in 2.6.31.1.
So, yes, if you don't mind pushing the patch to the appropriate place, that would be great.
Did you repost a non-whitespace damaged version?
Quoted 2 lines
Now I have to figure out why the other patch in aoe's quilt tree for linux-next never made it to 2.6.31.
Things don't go from -next to mainstream automatically, -next is just a testing base. You have to submit it explicitly, eg send it to me.
Signature · 1 line
Jens Axboe
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 1 line · On Thu Sep 10 16:07:37 EDT 2009, [email protected] wrote:
On Thu, Sep 10 2009, Ed Cashin wrote:
...
Quoted 4 lines
Quoted 2 lines
So, yes, if you don't mind pushing the patch to the appropriate place, that would be great.
Did you repost a non-whitespace damaged version?
Yes. I'll post it again as a response to this email.
Quoted 5 lines
Quoted 2 lines
Now I have to figure out why the other patch in aoe's quilt tree for linux-next never made it to 2.6.31.
Things don't go from -next to mainstream automatically, -next is just a testing base. You have to submit it explicitly, eg send it to me.
Ah. Thanks.
Signature · 1 line
Ed
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
aoe: end barrier bios with EOPNOTSUPP
Bruno Premont noticed that aoe throws a BUG during umount of an XFS in 2.6.31:
[ 5259.349897] aoe: bi_io_vec is NULL [ 5259.349940] ------------[ cut here ]------------ [ 5259.349958] kernel BUG at /usr/src/linux-2.6/drivers/block/aoe/aoeblk.c:177! [ 5259.349990] invalid opcode: 0000 [#1]
The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with -EOPNOTSUPP by any driver that provides its own ->make_request_fn handler and does not handle barriers.
In testing the changes below eliminate the BUG.
--- drivers/block/aoe/aoeblk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/block/aoe/aoeblk.c +3 -0
@@ -172,6 +172,9 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)BUG ();bio_endio (bio, -ENXIO );return 0 ; + }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );BUG ();
Signature · 7 lines
1.5.6.5 -- Ed Cashin <[email protected]> http://noserose.net/e/ http://www.coraid.com/
Re: [PATCH] aoe: end barrier bios with EOPNOTSUPP
Quoted 40 lines · Ed Cashin
aoe: end barrier bios with EOPNOTSUPP
Bruno Premont noticed that aoe throws a BUG during umount of an XFS in 2.6.31:
[ 5259.349897] aoe: bi_io_vec is NULL [ 5259.349940] ------------[ cut here ]------------ [ 5259.349958] kernel BUG at /usr/src/linux-2.6/drivers/block/aoe/aoeblk.c:177! [ 5259.349990] invalid opcode: 0000 [#1]The bio in question is a barrier. Jens Axboe suggested that such bios need to be recognized and ended with
-EOPNOTSUPPby any driver that provides its own ->make_request_fn handler and does not handle barriers.In testing the changes below eliminate the BUG.
Signed-off-by Ed L. Cashin <[email protected]>--- drivers/block/aoe/aoeblk.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)drivers/block/aoe/aoeblk.c +3
-0@@ -172,6 +172,9 @@ aoeblk_make_request(struct request_queue *q, struct bio *bio)BUG ();bio_endio (bio, -ENXIO );return 0 ; + }else if (bio_barrier (bio)) { +bio_endio (bio, -EOPNOTSUPP ); +return 0 ; }else if (bio->bi_io_vec ==NULL ) {printk (KERN_ERR "aoe: bi_io_vec is NULL\n" );BUG ();Signature · 1 line
1.5.6.5
I have applied this with a note that proper barrier support is coming.
Signature · 1 line
Jens Axboe