Skip to contentSkip to conversation

libata: fix locking around blk_abort_request()

PATCH Applied Tejun Heo 2 participants 2 messages Apr 14, 2010 – Apr 23, 2010 libata

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 libata: fix locking around blk_abort_request()

blk_abort_request() expectes queue lock to be held by the caller. Grab it before calling the function.

Lack of this synchronization led to infinite loop on corrupt q->timeout_list.

Signed-off-by Tejun Heo <[email protected]>
Cc Jens Axboe <[email protected]>
Cc [email protected]
---
 drivers/ata/libata-eh.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/ata/libata-eh.c +4 -0
index 9f6cfac..9e18cc9 100644
@@ -879,6 +879,8 @@ static void ata_eh_set_pending(struct ata_port *ap, int fastdrain)
 void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
+	struct request_queue *q = qc->scsicmd->device->request_queue;
+	unsigned long flags;
 
 	WARN_ON(!ap->ops->error_handler);
 

@@ -890,7 +892,9 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)
 	 * Note that ATA_QCFLAG_FAILED is unconditionally set after
 	 * this function completes.
 	 */
+	spin_lock_irqsave(q->queue_lock, flags);
 	blk_abort_request(qc->scsicmd->request);
+	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
 /**
Applied
#1 lore raw
Quoted 6 lines · Tejun Heo

blk_abort_request() expectes queue lock to be held by the caller. Grab it before calling the function.

Lack of this synchronization led to infinite loop on corrupt q->timeout_list.

Quoted 6 lines
Signed-off-by Tejun Heo<[email protected]>
Cc Jens Axboe<[email protected]>
Cc [email protected]
---
  drivers/ata/libata-eh.c |    4 ++++
  1 file changed, 4 insertions(+)

applied