SCSI fixes for 5.8-rc2
Subsystems (7)
James Bottomley
maintainerSix small fixes, five in drivers and one to correct another minor regression from cc97923a5bcc ("block: move dma drain handling to scsi") where we still need the drain stub to be built in to the kernel for the modular libata, non-modular SAS driver case.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Christoph Hellwig (1):
scsi: libata: Fix the ata_scsi_dma_need_drain stub
Daniel Wagner (1):
scsi: qla2xxx: Set NVMe status code for failed NVMe FCP request
Roman Bolshakov (1):
scsi: qla2xxx: Keep initiator ports after RSCN
SeongJae Park (1):
scsi: lpfc: Avoid another null dereference in lpfc_sli4_hba_unset()
Steffen Maier (1):
scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action
Tomas Henzl (1):
scsi: mptscsih: Fix read sense data size
And the diffstat:
drivers/message/fusion/mptscsih.c | 4 +--- drivers/s390/scsi/zfcp_erp.c | 13 +++++++++++-- drivers/scsi/lpfc/lpfc_init.c | 3 ++- drivers/scsi/qla2xxx/qla_gs.c | 4 +++- drivers/scsi/qla2xxx/qla_nvme.c | 3 ++- include/linux/libata.h | 2 +- 6 files changed, 20 insertions(+), 9 deletions(-)
With full diff below.
James
---
drivers/message/fusion/mptscsih.c +1 -3
@@ -118,8 +118,6 @@ int mptscsih_suspend(struct pci_dev *pdev, pm_message_t state);int mptscsih_resume (struct pci_dev *pdev);#endif -#define SNS_LEN (scp) SCSI_SENSE_BUFFERSIZE -/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /*
@@ -2422,7 +2420,7 @@ mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR/* Copy the sense received into the scsi command block. */ req_index =le16_to_cpu (mf->u.frame.hwhdr.msgctxu.fld.req_idx); sense_data = ((u8 *)ioc->sense_buf_pool + (req_index *MPT_SENSE_BUFFER_ALLOC )); -memcpy (sc->sense_buffer, sense_data,SNS_LEN (sc)); +memcpy (sc->sense_buffer, sense_data,MPT_SENSE_BUFFER_ALLOC );/* Log SMART data (asc = 0x5D, non-IM case only) if required. */
drivers/s390/scsi/zfcp_erp.c +11 -2
@@ -577,7 +577,10 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) ZFCP_STATUS_ERP_TIMEDOUT)) { req->status |=ZFCP_STATUS_FSFREQ_DISMISSED ;zfcp_dbf_rec_run ("erscf_1" , act); - req->erp_action =NULL ; +/* lock-free concurrent access with +* zfcp_erp_timeout_handler() +*/ +WRITE_ONCE (req->erp_action,NULL ); }if (act->status &ZFCP_STATUS_ERP_TIMEDOUT )zfcp_dbf_rec_run ("erscf_2" , act);
@@ -613,8 +616,14 @@ void zfcp_erp_notify(struct zfcp_erp_action *erp_action, unsigned long set_mask)void zfcp_erp_timeout_handler (struct timer_list *t) {struct zfcp_fsf_req *fsf_req =from_timer (fsf_req, t, timer); -struct zfcp_erp_action *act = fsf_req->erp_action; +struct zfcp_erp_action *act; +if (fsf_req->status &ZFCP_STATUS_FSFREQ_DISMISSED ) +return ; +/* lock-free concurrent access with zfcp_erp_strategy_check_fsfreq() */ + act =READ_ONCE (fsf_req->erp_action); +if (!act) +return ;zfcp_erp_notify (act,ZFCP_STATUS_ERP_TIMEDOUT ); }
drivers/scsi/lpfc/lpfc_init.c +2 -1
@@ -11878,7 +11878,8 @@ lpfc_sli4_hba_unset(struct lpfc_hba *phba)lpfc_sli4_xri_exchange_busy_wait (phba);/* per-phba callback de-registration for hotplug event */ -lpfc_cpuhp_remove (phba); +if (phba->pport) +lpfc_cpuhp_remove (phba);/* Disable PCI subsystem interrupt */ lpfc_sli4_disable_intr (phba);
drivers/scsi/qla2xxx/qla_gs.c +3 -1
@@ -3496,7 +3496,9 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)qla2x00_clear_loop_id (fcport); fcport->flags |=FCF_FABRIC_DEVICE ; }else if (fcport->d_id.b24 != rp->id.b24 || - fcport->scan_needed) { + (fcport->scan_needed && + fcport->port_type !=FCT_INITIATOR && + fcport->port_type !=FCT_NVME_INITIATOR )) {qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24;
drivers/scsi/qla2xxx/qla_nvme.c +2 -1
@@ -139,11 +139,12 @@ static void qla_nvme_release_fcp_cmd_kref(struct kref *kref) sp->priv =NULL ;if (priv->comp_status ==QLA_SUCCESS ) { fd->rcv_rsplen =le16_to_cpu (nvme->u.nvme.rsp_pyld_len); + fd->status =NVME_SC_SUCCESS ; }else { fd->rcv_rsplen =0 ; fd->transferred_length =0 ; + fd->status =NVME_SC_INTERNAL ; } - fd->status =0 ;spin_unlock_irqrestore (&priv->cmd_lock, flags); fd->done (fd);
include/linux/libata.h +1 -1
@@ -1092,7 +1092,7 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd,#define ATA_SCSI_COMPAT_IOCTL /* empty */ #endif extern int ata_scsi_queuecmd (struct Scsi_Host *h,struct scsi_cmnd *cmd); -#if IS_ENABLED (CONFIG_ATA ) +#if IS_REACHABLE (CONFIG_ATA )bool ata_scsi_dma_need_drain (struct request *rq);#else #define ata_scsi_dma_need_drain NULL
The pull request you sent on Sat, 27 Jun 2020 10:35:24 -0700:
The pull request you sent on Sat, 27 Jun 2020 10:35:24 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3cd1c5d582f42fead949947a6e3c8f51797580c9
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker