Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef918d3c 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 a set of user visible fixes (excepting one format string
  change).

  Four of the qla2xxx fixes only affect the firmware dump path, but it's
  still important to the enterprise. The rest are various NULL pointer
  crash conditions or outright driver hangs"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: cxgb4i: libcxgbi: in error case RST tcp conn
  scsi: scsi_debug: Avoid PI being disabled when TPGS is enabled
  scsi: qla2xxx: Fix extraneous ref on sp's after adapter break
  scsi: lpfc: prevent potential null pointer dereference
  scsi: lpfc: Avoid NULL pointer dereference in lpfc_els_abort()
  scsi: lpfc: nvmet_fc: fix format string
  scsi: qla2xxx: Fix crash due to NULL pointer dereference of ctx
  scsi: qla2xxx: Fix mailbox pointer error in fwdump capture
  scsi: qla2xxx: Set bit 15 for DIAG_ECHO_TEST MBC
  scsi: qla2xxx: Modify T262 FW dump template to specify same start/end to debug customer issues
  scsi: qla2xxx: Fix crash due to mismatch mumber of Q-pair creation for Multi queue
  scsi: qla2xxx: Fix NULL pointer access due to redundant fc_host_port_name call
  scsi: qla2xxx: Fix recursive loop during target mode configuration for ISP25XX leaving system unresponsive
  scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats()
  scsi: qla2xxx: don't disable a not previously enabled PCI device
parents 8f56821d e0f8e8cf

drivers/scsi/bnx2fc/bnx2fc.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ struct bnx2fc_hba { 
	struct bnx2fc_cmd_mgr *cmd_mgr;

	spinlock_t hba_lock;

	struct mutex hba_mutex;

	struct mutex hba_stats_mutex;

	unsigned long adapter_state;

		#define ADAPTER_STATE_UP		0

		#define ADAPTER_STATE_GOING_DOWN	1

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+8 −2
Original line number Diff line number Diff line
@@ -663,15 +663,17 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost) 
	if (!fw_stats)

		return NULL;



	mutex_lock(&hba->hba_stats_mutex);



	bnx2fc_stats = fc_get_host_stats(shost);



	init_completion(&hba->stat_req_done);

	if (bnx2fc_send_stat_req(hba))

		return bnx2fc_stats;

		goto unlock_stats_mutex;

	rc = wait_for_completion_timeout(&hba->stat_req_done, (2 * HZ));

	if (!rc) {

		BNX2FC_HBA_DBG(lport, "FW stat req timed out\n");

		return bnx2fc_stats;

		goto unlock_stats_mutex;

	}

	BNX2FC_STATS(hba, rx_stat2, fc_crc_cnt);

	bnx2fc_stats->invalid_crc_count += hba->bfw_stats.fc_crc_cnt;
@@ -693,6 +695,9 @@ static struct fc_host_statistics *bnx2fc_get_host_stats(struct Scsi_Host *shost) 


	memcpy(&hba->prev_stats, hba->stats_buffer,

	       sizeof(struct fcoe_statistics_params));



unlock_stats_mutex:

	mutex_unlock(&hba->hba_stats_mutex);

	return bnx2fc_stats;

}
@@ -1340,6 +1345,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) 
	}

	spin_lock_init(&hba->hba_lock);

	mutex_init(&hba->hba_mutex);

	mutex_init(&hba->hba_stats_mutex);



	hba->cnic = cnic;

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+0 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,6 @@ static void release_offload_resources(struct cxgbi_sock *csk) 
		cxgbi_sock_put(csk);

	}

	csk->dst = NULL;

	csk->cdev = NULL;

}



static int init_act_open(struct cxgbi_sock *csk)

drivers/scsi/cxgbi/libcxgbi.c

+22 −7
Original line number Diff line number Diff line
@@ -867,6 +867,7 @@ static void need_active_close(struct cxgbi_sock *csk) 
	log_debug(1 << CXGBI_DBG_SOCK, "csk 0x%p,%u,0x%lx,%u.\n",

		csk, (csk)->state, (csk)->flags, (csk)->tid);

	spin_lock_bh(&csk->lock);

	if (csk->dst)

		dst_confirm(csk->dst);

	data_lost = skb_queue_len(&csk->receive_queue);

	__skb_queue_purge(&csk->receive_queue);
@@ -882,7 +883,8 @@ static void need_active_close(struct cxgbi_sock *csk) 
	}



	if (close_req) {

		if (data_lost)

		if (!cxgbi_sock_flag(csk, CTPF_LOGOUT_RSP_RCVD) ||

		    data_lost)

			csk->cdev->csk_send_abort_req(csk);

		else

			csk->cdev->csk_send_close_req(csk);
@@ -1186,9 +1188,10 @@ static int cxgbi_sock_send_pdus(struct cxgbi_sock *csk, struct sk_buff *skb) 
				cxgbi_ulp_extra_len(cxgbi_skcb_ulp_mode(skb));

		skb = next;

	}

done:



	if (likely(skb_queue_len(&csk->write_queue)))

		cdev->csk_push_tx_frames(csk, 1);

done:

	spin_unlock_bh(&csk->lock);

	return copied;
@@ -1568,9 +1571,12 @@ static inline int read_pdu_skb(struct iscsi_conn *conn, 
	}

}



static int skb_read_pdu_bhs(struct iscsi_conn *conn, struct sk_buff *skb)

static int

skb_read_pdu_bhs(struct cxgbi_sock *csk, struct iscsi_conn *conn,

		 struct sk_buff *skb)

{

	struct iscsi_tcp_conn *tcp_conn = conn->dd_data;

	int err;



	log_debug(1 << CXGBI_DBG_PDU_RX,

		"conn 0x%p, skb 0x%p, len %u, flag 0x%lx.\n",
@@ -1608,7 +1614,16 @@ static int skb_read_pdu_bhs(struct iscsi_conn *conn, struct sk_buff *skb) 
		}

	}



	return read_pdu_skb(conn, skb, 0, 0);

	err = read_pdu_skb(conn, skb, 0, 0);

	if (likely(err >= 0)) {

		struct iscsi_hdr *hdr = (struct iscsi_hdr *)skb->data;

		u8 opcode = hdr->opcode & ISCSI_OPCODE_MASK;



		if (unlikely(opcode == ISCSI_OP_LOGOUT_RSP))

			cxgbi_sock_set_flag(csk, CTPF_LOGOUT_RSP_RCVD);

	}



	return err;

}



static int skb_read_pdu_data(struct iscsi_conn *conn, struct sk_buff *lskb,
@@ -1713,7 +1728,7 @@ void cxgbi_conn_pdu_ready(struct cxgbi_sock *csk) 
			cxgbi_skcb_rx_pdulen(skb));



		if (cxgbi_skcb_test_flag(skb, SKCBF_RX_COALESCED)) {

			err = skb_read_pdu_bhs(conn, skb);

			err = skb_read_pdu_bhs(csk, conn, skb);

			if (err < 0) {

				pr_err("coalesced bhs, csk 0x%p, skb 0x%p,%u, "

					"f 0x%lx, plen %u.\n",
@@ -1731,7 +1746,7 @@ void cxgbi_conn_pdu_ready(struct cxgbi_sock *csk) 
					cxgbi_skcb_flags(skb),

					cxgbi_skcb_rx_pdulen(skb));

		} else {

			err = skb_read_pdu_bhs(conn, skb);

			err = skb_read_pdu_bhs(csk, conn, skb);

			if (err < 0) {

				pr_err("bhs, csk 0x%p, skb 0x%p,%u, "

					"f 0x%lx, plen %u.\n",

drivers/scsi/cxgbi/libcxgbi.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ enum cxgbi_sock_flags { 
	CTPF_HAS_ATID,		/* reserved atid */

	CTPF_HAS_TID,		/* reserved hw tid */

	CTPF_OFFLOAD_DOWN,	/* offload function off */

	CTPF_LOGOUT_RSP_RCVD,   /* received logout response */

};



struct cxgbi_skb_rx_cb {