lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: clear ap->active_tag atomically w.r.t. command completion

Browse Source 
ap->active_tag was cleared in ata_qc_free().  This left ap->active_tag
dangling after ata_qc_complete().  Spurious interrupts inbetween could
incorrectly access the qc.  Clear active_tag in ata_qc_complete().
This change is necessary for later EH changes.

Signed-off-by: Tejun Heo <htejun@gmail.com>
This commit is contained in:
Tejun Heo
2006-05-15 20:57:32 +09:00
parent f8c2c4202d
commit 7401abf2f4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/libata-core.c
View File

@@ -4083,8 +4083,6 @@ void ata_qc_free(struct ata_queued_cmd *qc)
qc->flags = 0; qc->flags = 0;
tag = qc->tag; tag = qc->tag;
if (likely(ata_tag_valid(tag))) { if (likely(ata_tag_valid(tag))) {
if (tag == ap->active_tag)
ap->active_tag = ATA_TAG_POISON;
qc->tag = ATA_TAG_POISON; qc->tag = ATA_TAG_POISON;
clear_bit(tag, &ap->qactive); clear_bit(tag, &ap->qactive);
} }
@@ -4098,6 +4096,9 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
if (likely(qc->flags & ATA_QCFLAG_DMAMAP)) if (likely(qc->flags & ATA_QCFLAG_DMAMAP))
ata_sg_clean(qc); ata_sg_clean(qc);
/* command should be marked inactive atomically with qc completion */
qc->ap->active_tag = ATA_TAG_POISON;
/* atapi: mark qc as inactive to prevent the interrupt handler /* atapi: mark qc as inactive to prevent the interrupt handler
* from completing the command twice later, before the error handler * from completing the command twice later, before the error handler
* is called. (when rc != 0 and atapi request sense is needed) * is called. (when rc != 0 and atapi request sense is needed)