Commit be941bf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "This is quite a big update because it includes a rework of the lpfc
  driver to separate the NVMe part from the FC part.

  The reason for doing this is because two separate trees (the nvme and
  scsi trees respectively) want to update the individual components and
  this separation will prevent a really nasty cross tree entanglement by
  the time we reach the next merge window.

  The rest of the fixes are the usual minor sort with no significant
  security implications"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (25 commits)
  scsi: zero per-cmd private driver data for each MQ I/O
  scsi: csiostor: fix use after free in csio_hw_use_fwconfig()
  scsi: ufs: Clean up some rpm/spm level SysFS nodes upon remove
  scsi: lpfc: fix build issue if NVME_FC_TARGET is not defined
  scsi: lpfc: Fix NULL pointer dereference during PCI error recovery
  scsi: lpfc: update version to 11.2.0.14
  scsi: lpfc: Add MDS Diagnostic support.
  scsi: lpfc: Fix NVMEI's handling of NVMET's PRLI response attributes
  scsi: lpfc: Cleanup entry_repost settings on SLI4 queues
  scsi: lpfc: Fix debugfs root inode "lpfc" not getting deleted on driver unload.
  scsi: lpfc: Fix NVME I+T not registering NVME as a supported FC4 type
  scsi: lpfc: Added recovery logic for running out of NVMET IO context resources
  scsi: lpfc: Separate NVMET RQ buffer posting from IO resources SGL/iocbq/context
  scsi: lpfc: Separate NVMET data buffer pool fir ELS/CT.
  scsi: lpfc: Fix NMI watchdog assertions when running nvmet IOPS tests
  scsi: lpfc: Fix NVMEI driver not decrementing counter causing bad rport state.
  scsi: lpfc: Fix nvmet RQ resource needs for large block writes.
  scsi: lpfc: Adding additional stats counters for nvme.
  scsi: lpfc: Fix system crash when port is reset.
  scsi: lpfc: Fix used-RPI accounting problem.
  ...
parents 2426125a 1bad6c4a

drivers/scsi/csiostor/csio_hw.c

+4 −1
Original line number Diff line number Diff line
@@ -1769,7 +1769,6 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param) 
		goto bye;

	}



	mempool_free(mbp, hw->mb_mempool);

	if (finicsum != cfcsum) {

		csio_warn(hw,

		      "Config File checksum mismatch: csum=%#x, computed=%#x\n",
@@ -1780,6 +1779,10 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param) 
	rv = csio_hw_validate_caps(hw, mbp);

	if (rv != 0)

		goto bye;



	mempool_free(mbp, hw->mb_mempool);

	mbp = NULL;



	/*

	 * Note that we're operating with parameters

	 * not supplied by the driver, rather than from hard-wired

drivers/scsi/libfc/fc_rport.c

+1 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,7 @@ static void fc_rport_recv_rtv_req(struct fc_rport_priv *rdata, 
	fp = fc_frame_alloc(lport, sizeof(*rtv));

	if (!fp) {

		rjt_data.reason = ELS_RJT_UNAB;

		rjt_data.reason = ELS_EXPL_INSUF_RES;

		rjt_data.explan = ELS_EXPL_INSUF_RES;

		fc_seq_els_rsp_send(in_fp, ELS_LS_RJT, &rjt_data);

		goto drop;

	}

drivers/scsi/lpfc/lpfc.h

+17 −6
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ struct lpfc_dmabuf { 
	uint32_t   buffer_tag;	/* used for tagged queue ring */

};



struct lpfc_nvmet_ctxbuf {

	struct list_head list;

	struct lpfc_nvmet_rcv_ctx *context;

	struct lpfc_iocbq *iocbq;

	struct lpfc_sglq *sglq;

};



struct lpfc_dma_pool {

	struct lpfc_dmabuf   *elements;

	uint32_t    max_count;
@@ -163,9 +170,7 @@ struct rqb_dmabuf { 
	struct lpfc_dmabuf dbuf;

	uint16_t total_size;

	uint16_t bytes_recv;

	void *context;

	struct lpfc_iocbq *iocbq;

	struct lpfc_sglq *sglq;

	uint16_t idx;

	struct lpfc_queue *hrq;	  /* ptr to associated Header RQ */

	struct lpfc_queue *drq;	  /* ptr to associated Data RQ */

};
@@ -670,6 +675,8 @@ struct lpfc_hba { 
					/* INIT_LINK mailbox command */

#define LS_NPIV_FAB_SUPPORTED 0x2	/* Fabric supports NPIV */

#define LS_IGNORE_ERATT       0x4	/* intr handler should ignore ERATT */

#define LS_MDS_LINK_DOWN      0x8	/* MDS Diagnostics Link Down */

#define LS_MDS_LOOPBACK      0x16	/* MDS Diagnostics Link Up (Loopback) */



	uint32_t hba_flag;	/* hba generic flags */

#define HBA_ERATT_HANDLED	0x1 /* This flag is set when eratt handled */
@@ -777,7 +784,6 @@ struct lpfc_hba { 
	uint32_t cfg_nvme_oas;

	uint32_t cfg_nvme_io_channel;

	uint32_t cfg_nvmet_mrq;

	uint32_t cfg_nvmet_mrq_post;

	uint32_t cfg_enable_nvmet;

	uint32_t cfg_nvme_enable_fb;

	uint32_t cfg_nvmet_fb_size;
@@ -943,6 +949,7 @@ struct lpfc_hba { 
	struct pci_pool *lpfc_mbuf_pool;

	struct pci_pool *lpfc_hrb_pool;	/* header receive buffer pool */

	struct pci_pool *lpfc_drb_pool; /* data receive buffer pool */

	struct pci_pool *lpfc_nvmet_drb_pool; /* data receive buffer pool */

	struct pci_pool *lpfc_hbq_pool;	/* SLI3 hbq buffer pool */

	struct pci_pool *txrdy_payload_pool;

	struct lpfc_dma_pool lpfc_mbuf_safety_pool;
@@ -1228,7 +1235,11 @@ lpfc_sli_read_hs(struct lpfc_hba *phba) 
static inline struct lpfc_sli_ring *

lpfc_phba_elsring(struct lpfc_hba *phba)

{

	if (phba->sli_rev == LPFC_SLI_REV4)

	if (phba->sli_rev == LPFC_SLI_REV4) {

		if (phba->sli4_hba.els_wq)

			return phba->sli4_hba.els_wq->pring;

		else

			return NULL;

	}

	return &phba->sli.sli3_ring[LPFC_ELS_RING];

}

drivers/scsi/lpfc/lpfc_attr.c

+23 −24
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ 
#define LPFC_MIN_DEVLOSS_TMO	1

#define LPFC_MAX_DEVLOSS_TMO	255



#define LPFC_DEF_MRQ_POST	256

#define LPFC_MIN_MRQ_POST	32

#define LPFC_MAX_MRQ_POST	512

#define LPFC_DEF_MRQ_POST	512

#define LPFC_MIN_MRQ_POST	512

#define LPFC_MAX_MRQ_POST	2048



/*

 * Write key size should be multiple of 4. If write key is changed
@@ -205,8 +205,9 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, 
				atomic_read(&tgtp->xmt_ls_rsp_error));



		len += snprintf(buf+len, PAGE_SIZE-len,

				"FCP: Rcv %08x Drop %08x\n",

				"FCP: Rcv %08x Release %08x Drop %08x\n",

				atomic_read(&tgtp->rcv_fcp_cmd_in),

				atomic_read(&tgtp->xmt_fcp_release),

				atomic_read(&tgtp->rcv_fcp_cmd_drop));



		if (atomic_read(&tgtp->rcv_fcp_cmd_in) !=
@@ -218,15 +219,12 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, 
		}



		len += snprintf(buf+len, PAGE_SIZE-len,

				"FCP Rsp: RD %08x rsp %08x WR %08x rsp %08x\n",

				"FCP Rsp: RD %08x rsp %08x WR %08x rsp %08x "

				"drop %08x\n",

				atomic_read(&tgtp->xmt_fcp_read),

				atomic_read(&tgtp->xmt_fcp_read_rsp),

				atomic_read(&tgtp->xmt_fcp_write),

				atomic_read(&tgtp->xmt_fcp_rsp));



		len += snprintf(buf+len, PAGE_SIZE-len,

				"FCP Rsp: abort %08x drop %08x\n",

				atomic_read(&tgtp->xmt_fcp_abort),

				atomic_read(&tgtp->xmt_fcp_rsp),

				atomic_read(&tgtp->xmt_fcp_drop));



		len += snprintf(buf+len, PAGE_SIZE-len,
@@ -236,10 +234,22 @@ lpfc_nvme_info_show(struct device *dev, struct device_attribute *attr, 
				atomic_read(&tgtp->xmt_fcp_rsp_drop));



		len += snprintf(buf+len, PAGE_SIZE-len,

				"ABORT: Xmt %08x Err %08x Cmpl %08x",

				"ABORT: Xmt %08x Cmpl %08x\n",

				atomic_read(&tgtp->xmt_fcp_abort),

				atomic_read(&tgtp->xmt_fcp_abort_cmpl));



		len += snprintf(buf + len, PAGE_SIZE - len,

				"ABORT: Sol %08x  Usol %08x Err %08x Cmpl %08x",

				atomic_read(&tgtp->xmt_abort_sol),

				atomic_read(&tgtp->xmt_abort_unsol),

				atomic_read(&tgtp->xmt_abort_rsp),

				atomic_read(&tgtp->xmt_abort_rsp_error),

				atomic_read(&tgtp->xmt_abort_cmpl));

				atomic_read(&tgtp->xmt_abort_rsp_error));



		len += snprintf(buf + len, PAGE_SIZE - len,

				"IO_CTX: %08x outstanding %08x total %x",

				phba->sli4_hba.nvmet_ctx_cnt,

				phba->sli4_hba.nvmet_io_wait_cnt,

				phba->sli4_hba.nvmet_io_wait_total);



		len +=  snprintf(buf+len, PAGE_SIZE-len, "\n");

		return len;
@@ -3311,14 +3321,6 @@ LPFC_ATTR_R(nvmet_mrq, 
	    1, 1, 16,

	    "Specify number of RQ pairs for processing NVMET cmds");



/*

 * lpfc_nvmet_mrq_post: Specify number buffers to post on every MRQ

 *

 */

LPFC_ATTR_R(nvmet_mrq_post, LPFC_DEF_MRQ_POST,

	    LPFC_MIN_MRQ_POST, LPFC_MAX_MRQ_POST,

	    "Specify number of buffers to post on every MRQ");



/*

 * lpfc_enable_fc4_type: Defines what FC4 types are supported.

 * Supported Values:  1 - register just FCP
@@ -5154,7 +5156,6 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_suppress_rsp,

	&dev_attr_lpfc_nvme_io_channel,

	&dev_attr_lpfc_nvmet_mrq,

	&dev_attr_lpfc_nvmet_mrq_post,

	&dev_attr_lpfc_nvme_enable_fb,

	&dev_attr_lpfc_nvmet_fb_size,

	&dev_attr_lpfc_enable_bg,
@@ -6194,7 +6195,6 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 


	lpfc_enable_fc4_type_init(phba, lpfc_enable_fc4_type);

	lpfc_nvmet_mrq_init(phba, lpfc_nvmet_mrq);

	lpfc_nvmet_mrq_post_init(phba, lpfc_nvmet_mrq_post);



	/* Initialize first burst. Target vs Initiator are different. */

	lpfc_nvme_enable_fb_init(phba, lpfc_nvme_enable_fb);
@@ -6291,7 +6291,6 @@ lpfc_nvme_mod_param_dep(struct lpfc_hba *phba) 
		/* Not NVME Target mode.  Turn off Target parameters. */

		phba->nvmet_support = 0;

		phba->cfg_nvmet_mrq = 0;

		phba->cfg_nvmet_mrq_post = 0;

		phba->cfg_nvmet_fb_size = 0;

	}

drivers/scsi/lpfc/lpfc_crtn.h

+7 −4
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ void lpfc_init_vpi_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *); 
void lpfc_cancel_all_vport_retry_delay_timer(struct lpfc_hba *);

void lpfc_retry_pport_discovery(struct lpfc_hba *);

void lpfc_release_rpi(struct lpfc_hba *, struct lpfc_vport *, uint16_t);

int lpfc_init_iocb_list(struct lpfc_hba *phba, int cnt);

void lpfc_free_iocb_list(struct lpfc_hba *phba);

int lpfc_post_rq_buffer(struct lpfc_hba *phba, struct lpfc_queue *hrq,

			struct lpfc_queue *drq, int count, int idx);



void lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbx_cmpl_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -246,16 +250,14 @@ struct hbq_dmabuf *lpfc_sli4_rb_alloc(struct lpfc_hba *); 
void lpfc_sli4_rb_free(struct lpfc_hba *, struct hbq_dmabuf *);

struct rqb_dmabuf *lpfc_sli4_nvmet_alloc(struct lpfc_hba *phba);

void lpfc_sli4_nvmet_free(struct lpfc_hba *phba, struct rqb_dmabuf *dmab);

void lpfc_nvmet_rq_post(struct lpfc_hba *phba, struct lpfc_nvmet_rcv_ctx *ctxp,

			struct lpfc_dmabuf *mp);

void lpfc_nvmet_ctxbuf_post(struct lpfc_hba *phba,

			    struct lpfc_nvmet_ctxbuf *ctxp);

int lpfc_nvmet_rcv_unsol_abort(struct lpfc_vport *vport,

			       struct fc_frame_header *fc_hdr);

void lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *, struct fcf_record *,

			uint16_t);

int lpfc_sli4_rq_put(struct lpfc_queue *hq, struct lpfc_queue *dq,

		     struct lpfc_rqe *hrqe, struct lpfc_rqe *drqe);

int lpfc_post_rq_buffer(struct lpfc_hba *phba, struct lpfc_queue *hq,

			struct lpfc_queue *dq, int count);

int lpfc_free_rq_buffer(struct lpfc_hba *phba, struct lpfc_queue *hq);

void lpfc_unregister_fcf(struct lpfc_hba *);

void lpfc_unregister_fcf_rescan(struct lpfc_hba *);
@@ -271,6 +273,7 @@ int lpfc_sli4_fcf_rr_next_proc(struct lpfc_vport *, uint16_t); 
void lpfc_sli4_clear_fcf_rr_bmask(struct lpfc_hba *);



int lpfc_mem_alloc(struct lpfc_hba *, int align);

int lpfc_nvmet_mem_alloc(struct lpfc_hba *phba);

int lpfc_mem_alloc_active_rrq_pool_s4(struct lpfc_hba *);

void lpfc_mem_free(struct lpfc_hba *);

void lpfc_mem_free_all(struct lpfc_hba *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE