aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-06-15 07:24:28 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 19:12:20 -0400
commitbc90ba093af2e5022b9d055a2148b54a6aa35bc9 (patch)
treed426fe3c3ef027ba4b159a4c15b5df6ba7700dce /block
parente126c7b6bbb0c5b5fc3ecf2fd1ae67c803b747cc (diff)
block: always requeue !fs requests at the front
SCSI marks internal commands with REQ_PREEMPT and push it at the front of the request queue using blk_execute_rq(). When entering suspended or frozen state, SCSI devices are quiesced using scsi_device_quiesce(). In quiesced state, only REQ_PREEMPT requests are processed. This is how SCSI blocks other requests out while suspending and resuming. As all internal commands are pushed at the front of the queue, this usually works. Unfortunately, this interacts badly with ordered requeueing. To preserve request order on requeueing (due to busy device, active EH or other failures), requests are sorted according to ordered sequence on requeue if IO barrier is in progress. The following sequence deadlocks. 1. IO barrier sequence issues. 2. Suspend requested. Queue is quiesced with part or all of IO barrier sequence at the front. 3. During suspending or resuming, SCSI issues internal command which gets deferred and requeued for some reason. As the command is issued after the IO barrier in #1, ordered requeueing code puts the request after IO barrier sequence. 4. The device is ready to process requests again but still is in quiesced state and the first request of the queue isn't REQ_PREEMPT, so command processing is deadlocked - suspending/resuming waits for the issued request to complete while the request can't be processed till device is put back into running state by resuming. This can be fixed by always putting !fs requests at the front when requeueing. The following thread reports this deadlock. http://thread.gmane.org/gmane.linux.kernel/537473 Signed-off-by: Tejun Heo <htejun@gmail.com> Acked-by: David Greaves <david@dgreaves.com> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/ll_rw_blk.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 6b5173ac8131..c99b46354859 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -340,6 +340,15 @@ unsigned blk_ordered_req_seq(struct request *rq)
340 if (rq == &q->post_flush_rq) 340 if (rq == &q->post_flush_rq)
341 return QUEUE_ORDSEQ_POSTFLUSH; 341 return QUEUE_ORDSEQ_POSTFLUSH;
342 342
343 /*
344 * !fs requests don't need to follow barrier ordering. Always
345 * put them at the front. This fixes the following deadlock.
346 *
347 * http://thread.gmane.org/gmane.linux.kernel/537473
348 */
349 if (!blk_fs_request(rq))
350 return QUEUE_ORDSEQ_DRAIN;
351
343 if ((rq->cmd_flags & REQ_ORDERED_COLOR) == 352 if ((rq->cmd_flags & REQ_ORDERED_COLOR) ==
344 (q->orig_bar_rq->cmd_flags & REQ_ORDERED_COLOR)) 353 (q->orig_bar_rq->cmd_flags & REQ_ORDERED_COLOR))
345 return QUEUE_ORDSEQ_DRAIN; 354 return QUEUE_ORDSEQ_DRAIN;