| From 36b8e180e1e929e00b351c3b72aab3147fc14116 Mon Sep 17 00:00:00 2001 |
| From: Brian King <brking@linux.vnet.ibm.com> |
| Date: Tue, 14 Jul 2015 11:41:29 -0500 |
| Subject: ipr: Fix locking for unit attention handling |
| |
| From: Brian King <brking@linux.vnet.ibm.com> |
| |
| commit 36b8e180e1e929e00b351c3b72aab3147fc14116 upstream. |
| |
| Make sure we have the host lock held when calling scsi_report_bus_reset. Fixes |
| a crash seen as the __devices list in the scsi host was changing as we were |
| iterating through it. |
| |
| Reviewed-by: Wen Xiong <wenxiong@linux.vnet.ibm.com> |
| Reviewed-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> |
| Signed-off-by: Brian King <brking@linux.vnet.ibm.com> |
| Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: James Bottomley <JBottomley@Odin.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/scsi/ipr.c | 12 +++++++----- |
| 1 file changed, 7 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/scsi/ipr.c |
| +++ b/drivers/scsi/ipr.c |
| @@ -6179,21 +6179,23 @@ static void ipr_scsi_done(struct ipr_cmn |
| struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; |
| struct scsi_cmnd *scsi_cmd = ipr_cmd->scsi_cmd; |
| u32 ioasc = be32_to_cpu(ipr_cmd->s.ioasa.hdr.ioasc); |
| - unsigned long hrrq_flags; |
| + unsigned long lock_flags; |
| |
| scsi_set_resid(scsi_cmd, be32_to_cpu(ipr_cmd->s.ioasa.hdr.residual_data_len)); |
| |
| if (likely(IPR_IOASC_SENSE_KEY(ioasc) == 0)) { |
| scsi_dma_unmap(scsi_cmd); |
| |
| - spin_lock_irqsave(ipr_cmd->hrrq->lock, hrrq_flags); |
| + spin_lock_irqsave(ipr_cmd->hrrq->lock, lock_flags); |
| list_add_tail(&ipr_cmd->queue, &ipr_cmd->hrrq->hrrq_free_q); |
| scsi_cmd->scsi_done(scsi_cmd); |
| - spin_unlock_irqrestore(ipr_cmd->hrrq->lock, hrrq_flags); |
| + spin_unlock_irqrestore(ipr_cmd->hrrq->lock, lock_flags); |
| } else { |
| - spin_lock_irqsave(ipr_cmd->hrrq->lock, hrrq_flags); |
| + spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags); |
| + spin_lock(&ipr_cmd->hrrq->_lock); |
| ipr_erp_start(ioa_cfg, ipr_cmd); |
| - spin_unlock_irqrestore(ipr_cmd->hrrq->lock, hrrq_flags); |
| + spin_unlock(&ipr_cmd->hrrq->_lock); |
| + spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags); |
| } |
| } |
| |
