On Wed, 07 May 2008 17:40:26 -0500
James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> wrote:
> On Fri, 2008-05-02 at 11:17 +0900, FUJITA Tomonori wrote:
> > On Fri, 2 May 2008 00:43:30 +0200 (CEST)
> > Jesper Juhl <jesper.juhl@xxxxxxxxx> wrote:
> >
> > > Hi,
> > >
> > > For your information;
> > >
> > > I just build and booted the tip of Linus' git tree (HEAD at
> > > 886c35fbcf6fb2eee15687efc2d64d99b6ad9a4a) and got this in dmesg during
> > > bootup :
> > >
> > > ------------[ cut here ]------------
> > > WARNING: at include/linux/blkdev.h:431 blk_queue_init_tags+0x107/0x120()
> > > Modules linked in:
> > > Pid: 432, comm: scsi_scan_0 Not tainted 2.6.25-07351-g886c35f #1
> > > [<c0129684>] warn_on_slowpath+0x54/0x70
> > > [<c017a7c3>] ? check_object+0xe3/0x1f0
> > > [<c0200ae9>] ? init_tag_map+0x59/0xb0
> > > [<c014b1e7>] ? mark_held_locks+0x47/0x80
> > > [<c017cbeb>] ? __kmalloc+0x6b/0x100
> > > [<c014b379>] ? trace_hardirqs_on+0xb9/0x150
> > > [<c0200ae9>] ? init_tag_map+0x59/0xb0
> > > [<c0200ae9>] ? init_tag_map+0x59/0xb0
> > > [<c0200ae9>] ? init_tag_map+0x59/0xb0
> > > [<c0200c34>] ? __blk_queue_init_tags+0x24/0x70
> > > [<c0200c45>] ? __blk_queue_init_tags+0x35/0x70
> > > [<c0200e57>] blk_queue_init_tags+0x107/0x120
> > > [<c02b5a91>] ahc_platform_set_tags+0x191/0x1d0
> > > [<c02b5bd3>] ahc_linux_slave_configure+0x103/0x170
> > > [<c02a1f65>] scsi_probe_and_add_lun+0x6e5/0x920
> > > [<c02a2468>] __scsi_scan_target+0xe8/0x5d0
> > > [<c0108e17>] ? native_sched_clock+0x87/0xd0
> > > [<c0148c89>] ? get_lock_stats+0x29/0x50
> > > [<c0148cbd>] ? put_lock_stats+0xd/0x30
> > > [<c014b1e7>] ? mark_held_locks+0x47/0x80
> > > [<c035e247>] ? mutex_lock_nested+0x1b7/0x2a0
> > > [<c014b379>] ? trace_hardirqs_on+0xb9/0x150
> > > [<c035e23a>] ? mutex_lock_nested+0x1aa/0x2a0
> > > [<c02a2a1a>] ? scsi_scan_host_selected+0x3a/0xf0
> > > [<c02a29c0>] scsi_scan_channel+0x70/0x90
> > > [<c02a2a9d>] scsi_scan_host_selected+0xbd/0xf0
> > > [<c02a2b50>] ? do_scan_async+0x0/0x140
> > > [<c02a2b48>] do_scsi_scan_host+0x78/0x80
> > > [<c02a2b64>] do_scan_async+0x14/0x140
> > > [<c011f6e8>] ? complete+0x48/0x60
> > > [<c02a2b50>] ? do_scan_async+0x0/0x140
> > > [<c013c8d2>] kthread+0x42/0x70
> > > [<c013c890>] ? kthread+0x0/0x70
> > > [<c0103ceb>] kernel_thread_helper+0x7/0x1c
> >
> > The problem is that the commit 75ad23b expects that we hold the queue
> > lock for __blk_queue_free_tags, blk_queue_free_tags and
> > blk_queue_init_tags but we haven't.
> >
> > The simple fix is using queue_flag_set/clear_unlocked for them, then
> > it should work as before. However, it would be better to hold the
> > queue lock for blk_queue_free_tags and blk_queue_init_tags (we can
> > hold the queue lock in scsi_activate_tcq and scsi_deactivate_tcq).
>
> So is this the fix that everyone agrees on? And if so, whose tree is it
> going through (I tend to think block, since the original breakage came
> from the block tree).
The patch is fine from the perspective of the SCSI mid-layer. But it
would be not from the perspective of the block layer. For example,
blk_queue_init_tags is expected to be called with holding the queue
lock (since it could call blk_queue_resize_tags internally) though
only the SCSI mid-layer uses those APIs for now.
Jens, what do you think?
For your convenience, here's the same patch with a proper description
and my signed-off.
==
From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Subject: [PATCH] block: fix the queue locking test on tag APIs
The commit 75ad23bc0fcb4f992a5d06982bf0857ab1738e9e expects that
__blk_queue_free_tags, blk_queue_free_tags and blk_queue_init_tags
are called with holding the queue lock but the SCSI mid-layer has not
(and only the SCSI mid-layer uses them).
This changes them to use queue_flag_set/clear_unlocked. It should work
as before.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
---
block/blk-tag.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/blk-tag.c b/block/blk-tag.c
index de64e04..d4e21cd 100644
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
@@ -70,7 +70,7 @@ void __blk_queue_free_tags(struct request_queue *q)
__blk_free_tags(bqt);
q->queue_tags = NULL;
- queue_flag_clear(QUEUE_FLAG_QUEUED, q);
+ queue_flag_clear_unlocked(QUEUE_FLAG_QUEUED, q);
}
/**
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(blk_free_tags);
**/
void blk_queue_free_tags(struct request_queue *q)
{
- queue_flag_clear(QUEUE_FLAG_QUEUED, q);
+ queue_flag_clear_unlocked(QUEUE_FLAG_QUEUED, q);
}
EXPORT_SYMBOL(blk_queue_free_tags);
@@ -197,7 +197,7 @@ int blk_queue_init_tags(struct request_queue *q, int depth,
* assign it, all done
*/
q->queue_tags = tags;
- queue_flag_set(QUEUE_FLAG_QUEUED, q);
+ queue_flag_set_unlocked(QUEUE_FLAG_QUEUED, q);
INIT_LIST_HEAD(&q->tag_busy_list);
return 0;
fail:
--
1.5.3.6
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
