diff options
| author | Narsimhulu Musini <nmusini@cisco.com> | 2016-03-17 03:51:15 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-04-11 16:57:09 -0400 |
| commit | 0da8519b2b1f08113cda65af88a4c9e35157dd53 (patch) | |
| tree | d5f7c8416191b86837c800460e4972a3e5d28a72 | |
| parent | c9747821f9bbff6c07fa36087b003d89d05245c8 (diff) | |
snic: Fixing race in the hba reset and IO/TM completion
While HBA reset is in progress, if IO/TM completion is received for the
same IO then IO/TM completion path releases the driver private resources
associated with IO. This fix prevents releasing the resources in
IO and TM completion path if HBA reset is in progress.
Signed-off-by: Narsimhulu Musini <nmusini@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/snic/snic.h | 5 | ||||
| -rw-r--r-- | drivers/scsi/snic/snic_scsi.c | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/scsi/snic/snic.h b/drivers/scsi/snic/snic.h index d7f5ba6ba84c..8ed778d4dbb9 100644 --- a/drivers/scsi/snic/snic.h +++ b/drivers/scsi/snic/snic.h | |||
| @@ -95,6 +95,8 @@ | |||
| 95 | #define SNIC_DEV_RST_NOTSUP BIT(25) | 95 | #define SNIC_DEV_RST_NOTSUP BIT(25) |
| 96 | #define SNIC_SCSI_CLEANUP BIT(26) | 96 | #define SNIC_SCSI_CLEANUP BIT(26) |
| 97 | #define SNIC_HOST_RESET_ISSUED BIT(27) | 97 | #define SNIC_HOST_RESET_ISSUED BIT(27) |
| 98 | #define SNIC_HOST_RESET_CMD_TERM \ | ||
| 99 | (SNIC_DEV_RST_NOTSUP | SNIC_SCSI_CLEANUP | SNIC_HOST_RESET_ISSUED) | ||
| 98 | 100 | ||
| 99 | #define SNIC_ABTS_TIMEOUT 30000 /* msec */ | 101 | #define SNIC_ABTS_TIMEOUT 30000 /* msec */ |
| 100 | #define SNIC_LUN_RESET_TIMEOUT 30000 /* msec */ | 102 | #define SNIC_LUN_RESET_TIMEOUT 30000 /* msec */ |
| @@ -216,9 +218,10 @@ enum snic_msix_intr_index { | |||
| 216 | SNIC_MSIX_INTR_MAX, | 218 | SNIC_MSIX_INTR_MAX, |
| 217 | }; | 219 | }; |
| 218 | 220 | ||
| 221 | #define SNIC_INTRHDLR_NAMSZ (2 * IFNAMSIZ) | ||
| 219 | struct snic_msix_entry { | 222 | struct snic_msix_entry { |
| 220 | int requested; | 223 | int requested; |
| 221 | char devname[IFNAMSIZ]; | 224 | char devname[SNIC_INTRHDLR_NAMSZ]; |
| 222 | irqreturn_t (*isr)(int, void *); | 225 | irqreturn_t (*isr)(int, void *); |
| 223 | void *devid; | 226 | void *devid; |
| 224 | }; | 227 | }; |
diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c index 5a709ebdb282..abada16b375b 100644 --- a/drivers/scsi/snic/snic_scsi.c +++ b/drivers/scsi/snic/snic_scsi.c | |||
| @@ -601,6 +601,12 @@ snic_icmnd_cmpl_handler(struct snic *snic, struct snic_fw_req *fwreq) | |||
| 601 | sc->device->lun, sc, sc->cmnd[0], snic_cmd_tag(sc), | 601 | sc->device->lun, sc, sc->cmnd[0], snic_cmd_tag(sc), |
| 602 | CMD_FLAGS(sc), rqi); | 602 | CMD_FLAGS(sc), rqi); |
| 603 | 603 | ||
| 604 | if (CMD_FLAGS(sc) & SNIC_HOST_RESET_CMD_TERM) { | ||
| 605 | spin_unlock_irqrestore(io_lock, flags); | ||
| 606 | |||
| 607 | return; | ||
| 608 | } | ||
| 609 | |||
| 604 | SNIC_BUG_ON(rqi != (struct snic_req_info *)ctx); | 610 | SNIC_BUG_ON(rqi != (struct snic_req_info *)ctx); |
| 605 | WARN_ON_ONCE(req); | 611 | WARN_ON_ONCE(req); |
| 606 | if (!rqi) { | 612 | if (!rqi) { |
| @@ -782,6 +788,11 @@ snic_process_itmf_cmpl(struct snic *snic, | |||
| 782 | 788 | ||
| 783 | io_lock = snic_io_lock_hash(snic, sc); | 789 | io_lock = snic_io_lock_hash(snic, sc); |
| 784 | spin_lock_irqsave(io_lock, flags); | 790 | spin_lock_irqsave(io_lock, flags); |
| 791 | if (CMD_FLAGS(sc) & SNIC_HOST_RESET_CMD_TERM) { | ||
| 792 | spin_unlock_irqrestore(io_lock, flags); | ||
| 793 | |||
| 794 | return ret; | ||
| 795 | } | ||
| 785 | rqi = (struct snic_req_info *) CMD_SP(sc); | 796 | rqi = (struct snic_req_info *) CMD_SP(sc); |
| 786 | WARN_ON_ONCE(!rqi); | 797 | WARN_ON_ONCE(!rqi); |
| 787 | 798 | ||