SCSI fixes for 4.16-rc2
Subsystems (12)
James Bottomley
maintainerThese are mostly fixes for problems with merge window code. In addition we have one doc update (alua) and two dead code removals (aiclib and octogon) a spurious assignment removal (csiostor) and a performance improvement for storvsc involving better interrupt spreading and increasing the command per lun handling.
[fixup over previous pull to drop one of the storvsc patches]
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Andrew Vasquez (1):
scsi: qedi: Fix truncation of CHAP name and secret
Bart Van Assche (3):
scsi: qla2xxx: Fix a locking imbalance in qlt_24xx_handle_els()
scsi: scsi_dh: Document alua_rtpg_queue() arguments
scsi: qla2xxx: Avoid triggering undefined behavior in qla2x00_mbx_completion()
Chad Dupuis (1):
scsi: bnx2fc: Fix check in SCSI completion handler for timed out request
Colin Ian King (1):
scsi: csiostor: remove redundant assignment to pointer 'ln'
Corentin Labbe (2):
scsi: Remove Makefile entry for oktagon files
scsi: aic7xxx: remove aiclib.c
Dan Carpenter (2):
scsi: mptfusion: Add bounds check in mptctl_hp_targetinfo()
scsi: sym53c8xx_2: iterator underflow in sym_getsync()
Himanshu Madhani (1):
scsi: qla2xxx: Fix incorrect handle for abort IOCB
Manish Rangankar (1):
scsi: qla4xxx: skip error recovery in case of register disconnect.
Meelis Roos (1):
scsi: aacraid: fix shutdown crash when init fails
Michael Kelley (EOSG) (1):
scsi: storvsc: Increase cmd_per_lun for higher speed devices
Nilesh Javali (1):
scsi: qedi: Cleanup local str variable
Quinn Tran (2):
scsi: qla2xxx: Fix double free bug after firmware timeout
scsi: qla2xxx: Fix memory corruption during hba reset test
Sujit Reddy Thumma (1):
scsi: ufs: Enable quirk to ignore sending WRITE_SAME command
Tomas Henzl (1):
scsi: mpt3sas: fix an out of bound write
Tyrel Datwyler (1):
scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
And the diffstat:
drivers/message/fusion/mptctl.c | 2 ++ drivers/scsi/Makefile | 1 - drivers/scsi/aacraid/linit.c | 4 ++- drivers/scsi/aic7xxx/aiclib.c | 34 ------------------ drivers/scsi/bnx2fc/bnx2fc_io.c | 1 + drivers/scsi/csiostor/csio_lnode.c | 2 +- drivers/scsi/device_handler/scsi_dh_alua.c | 5 +++ drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ++- drivers/scsi/qedi/qedi_main.c | 55 ++++++++++++++---------------- drivers/scsi/qla2xxx/qla_init.c | 23 ++----------- drivers/scsi/qla2xxx/qla_iocb.c | 7 ++-- drivers/scsi/qla2xxx/qla_isr.c | 6 ++-- drivers/scsi/qla2xxx/qla_os.c | 2 ++ drivers/scsi/qla2xxx/qla_target.c | 2 -- drivers/scsi/qla4xxx/ql4_def.h | 2 ++ drivers/scsi/qla4xxx/ql4_os.c | 46 +++++++++++++++++++++++++ drivers/scsi/storvsc_drv.c | 2 +- drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- drivers/scsi/ufs/ufshcd.c | 2 ++ 20 files changed, 107 insertions(+), 98 deletions(-) delete mode 100644 drivers/scsi/aic7xxx/aiclib.c
With full diff below.
James
---
drivers/message/fusion/mptctl.c +2 -0
@@ -2687,6 +2687,8 @@ mptctl_hp_targetinfo(unsigned long arg) __FILE__, __LINE__, iocnum);return -ENODEV ; } +if (karg.hdr.id >=MPT_MAX_FC_DEVICES ) +return -EINVAL ;dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_hp_targetinfo called.\n" , ioc->name));
drivers/scsi/Makefile +0 -1
@@ -185,7 +185,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) zalon7xx-objs := zalon.o ncr53c8xx.o NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o -oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o # Files generated that shall be removed upon make clean clean-files := 53c700_d.h 53c700_u.h
drivers/scsi/aacraid/linit.c +3 -1
@@ -1690,8 +1690,10 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)* Map in the registers from the adapter. */ aac->base_size =AAC_MIN_FOOTPRINT_SIZE ; -if ((*aac_drivers[index].init)(aac)) +if ((*aac_drivers[index].init)(aac)) { + error = -ENODEV ; goto out_unmap; + }if (aac->sync_mode) {if (aac_sync_mode)
drivers/scsi/aic7xxx/aiclib.c deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* Implementation of Utility functions for all SCSI device types. -* -* Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. -* Copyright (c) 1997, 1998 Kenneth D. Merry. -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions, and the following disclaimer, -* without modification, immediately at the beginning of the file. -* 2. The name of the author may not be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR -* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* -* $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.38 2002/09/23 04:56:35 mjacob Exp $ -* $Id$ -*/ - -#include "aiclib.h" -
drivers/scsi/bnx2fc/bnx2fc_io.c +1 -0
@@ -1889,6 +1889,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,/* we will not receive ABTS response for this IO */ BNX2FC_IO_DBG (io_req,"Timer context finished processing " "this scsi cmd\n" ); +return ; }/* Cancel the timeout_work, as we received IO completion */
drivers/scsi/csiostor/csio_lnode.c +1 -1
@@ -114,7 +114,7 @@ static enum csio_ln_ev fwevt_to_lnevt[] = {static struct csio_lnode *csio_ln_lookup_by_portid (struct csio_hw *hw,uint8_t portid) { -struct csio_lnode *ln = hw->rln; +struct csio_lnode *ln;struct list_head *tmp;/* Match siblings lnode with portid */
drivers/scsi/device_handler/scsi_dh_alua.c +5 -0
@@ -876,6 +876,11 @@ static void alua_rtpg_work(struct work_struct *work)/** * alua_rtpg_queue() - cause RTPG to be submitted asynchronously +* @pg: ALUA port group associated with @sdev. +* @sdev: SCSI device for which to submit an RTPG. +* @qdata: Information about the callback to invoke after the RTPG. +* @force: Whether or not to submit an RTPG if a work item that will submit an +* RTPG already has been scheduled. * * Returns true if and only if alua_rtpg_work() will be called asynchronously. * That function is responsible for calling @qdata->fn().
drivers/scsi/ibmvscsi/ibmvfc.h +1 -1
@@ -367,7 +367,7 @@ enum ibmvfc_fcp_rsp_info_codes { };struct ibmvfc_fcp_rsp_info { -__be16 reserved; +u8 reserved[3 ];u8 rsp_code;u8 reserved2[4 ]; }__attribute__((packed,aligned (2 )));
drivers/scsi/mpt3sas/mpt3sas_base.c +4 -1
@@ -2410,8 +2410,11 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)continue ; } -for_each_cpu (cpu, mask) +for_each_cpu_and (cpu, mask, cpu_online_mask) { +if (cpu >= ioc->cpu_msix_table_sz) +break ; ioc->cpu_msix_table[cpu] = reply_q->msix_index; + } }return ; }
drivers/scsi/qedi/qedi_main.c +26 -29
135 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +3 -20
@@ -59,8 +59,6 @@ qla2x00_sp_timeout(struct timer_list *t) req->outstanding_cmds[sp->handle] =NULL ; iocb = &sp->u.iocb_cmd; iocb->timeout (sp); -if (sp->type !=SRB_ELS_DCMD ) - sp->free (sp);spin_unlock_irqrestore (&vha->hw->hardware_lock, flags); }
@@ -102,7 +100,6 @@ qla2x00_async_iocb_timeout(void *data)srb_t *sp = data;fc_port_t *fcport = sp->fcport;struct srb_iocb *lio = &sp->u.iocb_cmd; -struct event_arg ea;if (fcport) { ql_dbg(ql_dbg_disc, fcport->vha, 0x2071,
@@ -117,25 +114,13 @@ qla2x00_async_iocb_timeout(void *data)switch (sp->type) {case SRB_LOGIN_CMD : -if (!fcport) -break ;/* Retry as needed. */ lio->u.logio.data[0 ] =MBS_COMMAND_ERROR ; lio->u.logio.data[1 ] = lio->u.logio.flags &SRB_LOGIN_RETRIED ?QLA_LOGIO_LOGIN_RETRIED :0 ; -memset (&ea,0 ,sizeof (ea)); - ea.event =FCME_PLOGI_DONE ; - ea.fcport = sp->fcport; - ea.data[0 ] = lio->u.logio.data[0 ]; - ea.data[1 ] = lio->u.logio.data[1 ]; - ea.sp = sp; -qla24xx_handle_plogi_done_event (fcport->vha, &ea); + sp->done (sp,QLA_FUNCTION_TIMEOUT );break ;case SRB_LOGOUT_CMD : -if (!fcport) -break ; -qlt_logo_completion_handler (fcport,QLA_FUNCTION_TIMEOUT ); -break ;case SRB_CT_PTHRU_CMD :case SRB_MB_IOCB :case SRB_NACK_PLOGI :
@@ -235,12 +220,10 @@ static void qla2x00_async_logout_sp_done(void *ptr, int res) {srb_t *sp = ptr; -struct srb_iocb *lio = &sp->u.iocb_cmd; sp->fcport->flags &= ~(FCF_ASYNC_SENT |FCF_ASYNC_ACTIVE ); -if (!test_bit (UNLOADING , &sp->vha->dpc_flags)) -qla2x00_post_async_logout_done_work (sp->vha, sp->fcport, - lio->u.logio.data); + sp->fcport->login_gen++; +qlt_logo_completion_handler (sp->fcport, res); sp->free (sp); }
drivers/scsi/qla2xxx/qla_iocb.c +3 -4
@@ -3275,12 +3275,11 @@ qla24xx_abort_iocb(srb_t *sp, struct abort_entry_24xx *abt_iocb)memset (abt_iocb,0 ,sizeof (struct abort_entry_24xx )); abt_iocb->entry_type =ABORT_IOCB_TYPE ; abt_iocb->entry_count =1 ; - abt_iocb->handle = -cpu_to_le32 (MAKE_HANDLE (aio->u.abt.req_que_no, - aio->u.abt.cmd_hndl)); + abt_iocb->handle =cpu_to_le32 (MAKE_HANDLE (req->id, sp->handle)); abt_iocb->nport_handle =cpu_to_le16 (sp->fcport->loop_id); abt_iocb->handle_to_abort = -cpu_to_le32 (MAKE_HANDLE (req->id, aio->u.abt.cmd_hndl)); +cpu_to_le32 (MAKE_HANDLE (aio->u.abt.req_que_no, + aio->u.abt.cmd_hndl)); abt_iocb->port_id[0 ] = sp->fcport->d_id.b.al_pa; abt_iocb->port_id[1 ] = sp->fcport->d_id.b.area; abt_iocb->port_id[2 ] = sp->fcport->d_id.b.domain;
drivers/scsi/qla2xxx/qla_isr.c +4 -2
@@ -272,7 +272,8 @@ qla2x00_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;/* Read all mbox registers? */ - mboxes = (1 << ha->mbx_count) -1 ; +WARN_ON_ONCE (ha->mbx_count >32 ); + mboxes = (1ULL << ha->mbx_count) -1 ;if (!ha->mcp)ql_dbg (ql_dbg_async, vha,0x5001 ,"MBX pointer ERROR.\n" );else
@@ -2880,7 +2881,8 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;/* Read all mbox registers? */ - mboxes = (1 << ha->mbx_count) -1 ; +WARN_ON_ONCE (ha->mbx_count >32 ); + mboxes = (1ULL << ha->mbx_count) -1 ;if (!ha->mcp)ql_dbg (ql_dbg_async, vha,0x504e ,"MBX pointer ERROR.\n" );else
drivers/scsi/qla2xxx/qla_os.c +2 -0
@@ -3625,6 +3625,8 @@ qla2x00_remove_one(struct pci_dev *pdev) }qla2x00_wait_for_hba_ready (base_vha); +qla2x00_wait_for_sess_deletion (base_vha); +/* * if UNLOAD flag is already set, then continue unload, * where it was set first.
drivers/scsi/qla2xxx/qla_target.c +0 -2
@@ -4871,8 +4871,6 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, sess);qlt_send_term_imm_notif (vha, iocb,1 ); res =0 ; -spin_lock_irqsave (&tgt->ha->tgt.sess_lock, - flags);break ; }
drivers/scsi/qla4xxx/ql4_def.h +2 -0
@@ -168,6 +168,8 @@#define DEV_DB_NON_PERSISTENT 0#define DEV_DB_PERSISTENT 1 +#define QL4_ISP_REG_DISCONNECT 0xffffffffU +#define COPY_ISID (dst_isid, src_isid) { \ int i, j; \ for (i = 0, j = ISID_SIZE - 1; i < ISID_SIZE;) \
drivers/scsi/qla4xxx/ql4_os.c +46 -0
95 lines not on this page · raw message
drivers/scsi/storvsc_drv.c +1 -1
@@ -1656,7 +1656,7 @@ static struct scsi_host_template scsi_driver = { .eh_timed_out = storvsc_eh_timed_out, .slave_alloc = storvsc_device_alloc, .slave_configure = storvsc_device_configure, - .cmd_per_lun = 255, + .cmd_per_lun = 2048, .this_id = -1, .use_clustering = ENABLE_CLUSTERING,/* Make sure we dont get a sg segment crosses a page boundary */
drivers/scsi/sym53c8xx_2/sym_hipd.c +1 -1
@@ -536,7 +536,7 @@ sym_getsync(struct sym_hcb *np, u_char dt, u_char sfac, u_char *divp, u_char *fa* Look for the greatest clock divisor that allows an * input speed faster than the period. */ -while (div-- >0 ) +while (--div >0 )if (kpc >= (div_10M[div] <<2 ))break ;/*
drivers/scsi/ufs/ufshcd.c +2 -0
@@ -4352,6 +4352,8 @@ static int ufshcd_slave_alloc(struct scsi_device *sdev)/* REPORT SUPPORTED OPERATION CODES is not supported */ sdev->no_report_opcodes =1 ; +/* WRITE_SAME command is not supported */ + sdev->no_write_same =1 ;ufshcd_set_queue_depth (sdev);
Quoted 2 lines · James Bottomley
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
When I pull that, I get something completely different from what you claim I should get. Much bigger, and a lot more commits.
Hmm?
Dropped.
Linus
James Bottomley
maintainerQuoted 7 lines · Linus Torvalds
Quoted 4 lines · James Bottomley
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi- fixes
Quoted 6 lines
When I pull that, I get something completely different from what you claim I should get. Much bigger, and a lot more commits.
Hmm?
Dropped.
OK, I see the problem, but I don't currently have an explanation for how it happened. The scsi-fixes tag somehow became attached to a push of the misc tree for the next merge window instead of the fixes branch.
I've reset it to where it should be
commit 1bc5ad3a6acdcf56f83272f2de1cd2389ea9e9e2
Author: Manish Rangankar <[email protected]> Date: Sun Feb 11 22:48:41 2018 -0800
scsi: qla4xxx: skip error recovery in case of register disconnect.
So it should all be correct if you re-pull.
I suppose it's good that the checks and balances of changelog + diffstat caught this; I'll poke about in my current preparation scripts to see if I can find out what went wrong.
James