Commit 17d0fbf4 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:
 "Four fixes, three for edge conditions which don't occur very often.
  The lpfc fix mitigates memory exhaustion for some high CPU systems"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: Mitigate high memory pre-allocation by SCSI-MQ
  scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()
  scsi: target: tcmu: avoid use-after-free after command timeout
  scsi: qla2xxx: Fix gnl.l memory leak on adapter init failure
parents 8942230a 77ffd346

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -824,6 +824,7 @@ struct lpfc_hba { 
	uint32_t cfg_cq_poll_threshold;

	uint32_t cfg_cq_max_proc_limit;

	uint32_t cfg_fcp_cpu_map;

	uint32_t cfg_fcp_mq_threshold;

	uint32_t cfg_hdw_queue;

	uint32_t cfg_irq_chann;

	uint32_t cfg_suppress_rsp;

drivers/scsi/lpfc/lpfc_attr.c

+15 −0
Original line number Diff line number Diff line
@@ -5708,6 +5708,19 @@ LPFC_ATTR_RW(nvme_oas, 0, 0, 1, 
LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2,

	     "Embed NVME Command in WQE");



/*

 * lpfc_fcp_mq_threshold: Set the maximum number of Hardware Queues

 * the driver will advertise it supports to the SCSI layer.

 *

 *      0    = Set nr_hw_queues by the number of CPUs or HW queues.

 *      1,128 = Manually specify the maximum nr_hw_queue value to be set,

 *

 * Value range is [0,128]. Default value is 8.

 */

LPFC_ATTR_R(fcp_mq_threshold, LPFC_FCP_MQ_THRESHOLD_DEF,

	    LPFC_FCP_MQ_THRESHOLD_MIN, LPFC_FCP_MQ_THRESHOLD_MAX,

	    "Set the number of SCSI Queues advertised");



/*

 * lpfc_hdw_queue: Set the number of Hardware Queues the driver

 * will advertise it supports to the NVME and  SCSI layers. This also
@@ -6030,6 +6043,7 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_cq_poll_threshold,

	&dev_attr_lpfc_cq_max_proc_limit,

	&dev_attr_lpfc_fcp_cpu_map,

	&dev_attr_lpfc_fcp_mq_threshold,

	&dev_attr_lpfc_hdw_queue,

	&dev_attr_lpfc_irq_chann,

	&dev_attr_lpfc_suppress_rsp,
@@ -7112,6 +7126,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	/* Initialize first burst. Target vs Initiator are different. */

	lpfc_nvme_enable_fb_init(phba, lpfc_nvme_enable_fb);

	lpfc_nvmet_fb_size_init(phba, lpfc_nvmet_fb_size);

	lpfc_fcp_mq_threshold_init(phba, lpfc_fcp_mq_threshold);

	lpfc_hdw_queue_init(phba, lpfc_hdw_queue);

	lpfc_irq_chann_init(phba, lpfc_irq_chann);

	lpfc_enable_bbcr_init(phba, lpfc_enable_bbcr);

drivers/scsi/lpfc/lpfc_init.c

+6 −4
Original line number Diff line number Diff line
@@ -4309,10 +4309,12 @@ lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev) 
	shost->max_cmd_len = 16;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		if (phba->cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_HDWQ)

			shost->nr_hw_queues = phba->cfg_hdw_queue;

		else

			shost->nr_hw_queues = phba->sli4_hba.num_present_cpu;

		if (!phba->cfg_fcp_mq_threshold ||

		    phba->cfg_fcp_mq_threshold > phba->cfg_hdw_queue)

			phba->cfg_fcp_mq_threshold = phba->cfg_hdw_queue;



		shost->nr_hw_queues = min_t(int, 2 * num_possible_nodes(),

					    phba->cfg_fcp_mq_threshold);



		shost->dma_boundary =

			phba->sli4_hba.pc_sli4_params.sge_supp_len-1;

drivers/scsi/lpfc/lpfc_sli4.h

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ 
#define LPFC_HBA_HDWQ_MAX	128

#define LPFC_HBA_HDWQ_DEF	0



/* FCP MQ queue count limiting */

#define LPFC_FCP_MQ_THRESHOLD_MIN	0

#define LPFC_FCP_MQ_THRESHOLD_MAX	128

#define LPFC_FCP_MQ_THRESHOLD_DEF	8



/* Common buffer size to accomidate SCSI and NVME IO buffers */

#define LPFC_COMMON_IO_BUF_SZ	768

drivers/scsi/qla2xxx/qla_attr.c

+2 −0
Original line number Diff line number Diff line
@@ -2956,6 +2956,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) 
	dma_free_coherent(&ha->pdev->dev, vha->gnl.size, vha->gnl.l,

	    vha->gnl.ldma);



	vha->gnl.l = NULL;



	vfree(vha->scan.l);



	if (vha->qpair && vha->qpair->vp_idx == vha->vp_idx) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE