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

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

Pull more SCSI updates from James Bottomley:
 "This is the set of patches which arrived too late to stabilise in
  -next for the first pull.

  It's really just an lpfc driver update and an assortment of minor
  fixes, all in drivers. The only core update is to the zone block
  device driver, which isn't the one most people use"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: Update lpfc version to 12.8.0.3
  scsi: lpfc: Fix LUN loss after cable pull
  scsi: lpfc: Fix validation of bsg reply lengths
  scsi: lpfc: Fix retry of PRLI when status indicates its unsupported
  scsi: lpfc: Fix oops when unloading driver while running mds diags
  scsi: lpfc: Fix RSCN timeout due to incorrect gidft counter
  scsi: lpfc: Fix no message shown for lpfc_hdw_queue out of range value
  scsi: lpfc: Fix FCoE speed reporting
  scsi: lpfc: Add missing misc_deregister() for lpfc_init()
  scsi: lpfc: nvmet: Avoid hang / use-after-free again when destroying targetport
  scsi: scsi_transport_sas: Add spaces around binary operator "|"
  scsi: sd_zbc: Improve zone revalidation
  scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases
  scsi: fcoe: Memory leak fix in fcoe_sysfs_fcf_del()
  scsi: target: Make iscsit_register_transport() return void
parents fded0919 7e0e8be3

drivers/scsi/fcoe/fcoe_ctlr.c

+1 −1
Original line number Diff line number Diff line
@@ -256,9 +256,9 @@ static void fcoe_sysfs_fcf_del(struct fcoe_fcf *new) 
		WARN_ON(!fcf_dev);

		new->fcf_dev = NULL;

		fcoe_fcf_device_delete(fcf_dev);

		kfree(new);

		mutex_unlock(&cdev->lock);

	}

	kfree(new);

}



/**

drivers/scsi/libfc/fc_disc.c

+9 −3
Original line number Diff line number Diff line
@@ -581,8 +581,12 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp, 


	if (PTR_ERR(fp) == -FC_EX_CLOSED)

		goto out;

	if (IS_ERR(fp))

		goto redisc;

	if (IS_ERR(fp)) {

		mutex_lock(&disc->disc_mutex);

		fc_disc_restart(disc);

		mutex_unlock(&disc->disc_mutex);

		goto out;

	}



	cp = fc_frame_payload_get(fp, sizeof(*cp));

	if (!cp)
@@ -609,7 +613,7 @@ static void fc_disc_gpn_id_resp(struct fc_seq *sp, struct fc_frame *fp, 
				new_rdata->disc_id = disc->disc_id;

				fc_rport_login(new_rdata);

			}

			goto out;

			goto free_fp;

		}

		rdata->disc_id = disc->disc_id;

		mutex_unlock(&rdata->rp_mutex);
@@ -626,6 +630,8 @@ redisc: 
		fc_disc_restart(disc);

		mutex_unlock(&disc->disc_mutex);

	}

free_fp:

	fc_frame_free(fp);

out:

	kref_put(&rdata->kref, fc_rport_destroy);

	if (!IS_ERR(fp))

drivers/scsi/lpfc/lpfc_attr.c

+23 −3
Original line number Diff line number Diff line
@@ -6679,9 +6679,15 @@ lpfc_get_host_speed(struct Scsi_Host *shost) 
		}

	} else if (lpfc_is_link_up(phba) && (phba->hba_flag & HBA_FCOE_MODE)) {

		switch (phba->fc_linkspeed) {

		case LPFC_ASYNC_LINK_SPEED_1GBPS:

			fc_host_speed(shost) = FC_PORTSPEED_1GBIT;

			break;

		case LPFC_ASYNC_LINK_SPEED_10GBPS:

			fc_host_speed(shost) = FC_PORTSPEED_10GBIT;

			break;

		case LPFC_ASYNC_LINK_SPEED_20GBPS:

			fc_host_speed(shost) = FC_PORTSPEED_20GBIT;

			break;

		case LPFC_ASYNC_LINK_SPEED_25GBPS:

			fc_host_speed(shost) = FC_PORTSPEED_25GBIT;

			break;
@@ -7406,12 +7412,26 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
void

lpfc_nvme_mod_param_dep(struct lpfc_hba *phba)

{

	if (phba->cfg_hdw_queue > phba->sli4_hba.num_present_cpu)

	int  logit = 0;



	if (phba->cfg_hdw_queue > phba->sli4_hba.num_present_cpu) {

		phba->cfg_hdw_queue = phba->sli4_hba.num_present_cpu;

	if (phba->cfg_irq_chann > phba->sli4_hba.num_present_cpu)

		logit = 1;

	}

	if (phba->cfg_irq_chann > phba->sli4_hba.num_present_cpu) {

		phba->cfg_irq_chann = phba->sli4_hba.num_present_cpu;

	if (phba->cfg_irq_chann > phba->cfg_hdw_queue)

		logit = 1;

	}

	if (phba->cfg_irq_chann > phba->cfg_hdw_queue) {

		phba->cfg_irq_chann = phba->cfg_hdw_queue;

		logit = 1;

	}

	if (logit)

		lpfc_printf_log(phba, KERN_ERR, LOG_SLI,

				"2006 Reducing Queues - CPU limitation: "

				"IRQ %d HDWQ %d\n",

				phba->cfg_irq_chann,

				phba->cfg_hdw_queue);



	if (phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME &&

	    phba->nvmet_support) {

drivers/scsi/lpfc/lpfc_bsg.c

+8 −13
Original line number Diff line number Diff line
@@ -2494,13 +2494,12 @@ lpfc_sli4_bsg_link_diag_test(struct bsg_job *job) 
	diag_status_reply = (struct diag_status *)

			    bsg_reply->reply_data.vendor_reply.vendor_rsp;



	if (job->reply_len <

	    sizeof(struct fc_bsg_request) + sizeof(struct diag_status)) {

	if (job->reply_len < sizeof(*bsg_reply) + sizeof(*diag_status_reply)) {

		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,

				"3012 Received Run link diag test reply "

				"below minimum size (%d): reply_len:%d\n",

				(int)(sizeof(struct fc_bsg_request) +

				sizeof(struct diag_status)),

				(int)(sizeof(*bsg_reply) +

				sizeof(*diag_status_reply)),

				job->reply_len);

		rc = -EINVAL;

		goto job_error;
@@ -3418,8 +3417,7 @@ lpfc_bsg_get_dfc_rev(struct bsg_job *job) 
	event_reply = (struct get_mgmt_rev_reply *)

		bsg_reply->reply_data.vendor_reply.vendor_rsp;



	if (job->reply_len <

	    sizeof(struct fc_bsg_request) + sizeof(struct get_mgmt_rev_reply)) {

	if (job->reply_len < sizeof(*bsg_reply) + sizeof(*event_reply)) {

		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,

				"2741 Received GET_DFC_REV reply below "

				"minimum size\n");
@@ -5202,8 +5200,8 @@ lpfc_menlo_cmd(struct bsg_job *job) 
		goto no_dd_data;

	}



	if (job->reply_len <

	    sizeof(struct fc_bsg_request) + sizeof(struct menlo_response)) {

	if (job->reply_len < sizeof(*bsg_reply) +

				sizeof(struct menlo_response)) {

		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,

				"2785 Received MENLO_CMD reply below "

				"minimum size\n");
@@ -5359,9 +5357,7 @@ lpfc_forced_link_speed(struct bsg_job *job) 
	forced_reply = (struct forced_link_speed_support_reply *)

		bsg_reply->reply_data.vendor_reply.vendor_rsp;



	if (job->reply_len <

	    sizeof(struct fc_bsg_request) +

	    sizeof(struct forced_link_speed_support_reply)) {

	if (job->reply_len < sizeof(*bsg_reply) + sizeof(*forced_reply)) {

		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,

				"0049 Received FORCED_LINK_SPEED reply below "

				"minimum size\n");
@@ -5715,8 +5711,7 @@ lpfc_get_trunk_info(struct bsg_job *job) 
	event_reply = (struct lpfc_trunk_info *)

		bsg_reply->reply_data.vendor_reply.vendor_rsp;



	if (job->reply_len <

	    sizeof(struct fc_bsg_request) + sizeof(struct lpfc_trunk_info)) {

	if (job->reply_len < sizeof(*bsg_reply) + sizeof(*event_reply)) {

		lpfc_printf_log(phba, KERN_WARNING, LOG_LIBDFC,

				"2728 Received GET TRUNK _INFO reply below "

				"minimum size\n");

drivers/scsi/lpfc/lpfc_ct.c

+16 −6
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		/* This is a GID_FT completing so the gidft_inp counter was

		 * incremented before the GID_FT was issued to the wire.

		 */

		if (vport->gidft_inp)

			vport->gidft_inp--;



		/*
@@ -741,11 +742,14 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				goto out;



			/* CT command is being retried */

			vport->gidft_inp--;

			rc = lpfc_ns_cmd(vport, SLI_CTNS_GID_FT,

					 vport->fc_ns_retry, type);

			if (rc == 0)

				goto out;

			else { /* Unable to send NS cmd */

				if (vport->gidft_inp)

					vport->gidft_inp--;

			}

		}

		if (vport->fc_flag & FC_RSCN_MODE)

			lpfc_els_flush_rscn(vport);
@@ -825,6 +829,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				(uint32_t) CTrsp->ReasonCode,

				(uint32_t) CTrsp->Explanation);

		}

		if (vport->gidft_inp)

			vport->gidft_inp--;

	}
@@ -918,6 +923,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		/* This is a GID_PT completing so the gidft_inp counter was

		 * incremented before the GID_PT was issued to the wire.

		 */

		if (vport->gidft_inp)

			vport->gidft_inp--;



		/*
@@ -942,11 +948,14 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				vport->fc_ns_retry++;



			/* CT command is being retried */

			vport->gidft_inp--;

			rc = lpfc_ns_cmd(vport, SLI_CTNS_GID_PT,

					 vport->fc_ns_retry, GID_PT_N_PORT);

			if (rc == 0)

				goto out;

			else { /* Unable to send NS cmd */

				if (vport->gidft_inp)

					vport->gidft_inp--;

			}

		}

		if (vport->fc_flag & FC_RSCN_MODE)

			lpfc_els_flush_rscn(vport);
@@ -1027,6 +1036,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
				(uint32_t)CTrsp->ReasonCode,

				(uint32_t)CTrsp->Explanation);

		}

		if (vport->gidft_inp)

			vport->gidft_inp--;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE