Commit 90ea17a9 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:
 "13 fixes, all in drivers.

  The most extensive changes are in the iscsi series (affecting drivers
  qedi, cxgbi and bnx2i), the next most is scsi_debug, but that's just a
  simple revert and then minor updates to pm80xx"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: iscsi: MAINTAINERS: Add Mike Christie as co-maintainer
  scsi: qedi: Fix failed disconnect handling
  scsi: iscsi: Fix NOP handling during conn recovery
  scsi: iscsi: Merge suspend fields
  scsi: iscsi: Fix unbound endpoint error handling
  scsi: iscsi: Fix conn cleanup and stop race during iscsid restart
  scsi: iscsi: Fix endpoint reuse regression
  scsi: iscsi: Release endpoint ID when its freed
  scsi: iscsi: Fix offload conn cleanup when iscsid restarts
  scsi: iscsi: Move iscsi_ep_disconnect()
  scsi: pm80xx: Enable upper inbound, outbound queues
  scsi: pm80xx: Mask and unmask upper interrupt vectors 32-63
  Revert "scsi: scsi_debug: Address races following module load"
parents b0086839 70a3baee

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -10371,6 +10371,7 @@ F: include/linux/isapnp.h 
ISCSI

M:	Lee Duncan <lduncan@suse.com>

M:	Chris Leech <cleech@redhat.com>

M:	Mike Christie <michael.christie@oracle.com>

L:	open-iscsi@googlegroups.com

L:	linux-scsi@vger.kernel.org

S:	Maintained

drivers/scsi/bnx2i/bnx2i_hwi.c

+1 −1
Original line number Diff line number Diff line
@@ -1977,7 +1977,7 @@ static int bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn) 
		if (nopin->cq_req_sn != qp->cqe_exp_seq_sn)

			break;



		if (unlikely(test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx))) {

		if (unlikely(test_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags))) {

			if (nopin->op_code == ISCSI_OP_NOOP_IN &&

			    nopin->itt == (u16) RESERVED_ITT) {

				printk(KERN_ALERT "bnx2i: Unsolicited "

drivers/scsi/bnx2i/bnx2i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ static int bnx2i_tear_down_conn(struct bnx2i_hba *hba, 
			struct iscsi_conn *conn = ep->conn->cls_conn->dd_data;



			/* Must suspend all rx queue activity for this ep */

			set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);

			set_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);

		}

		/* CONN_DISCONNECT timeout may or may not be an issue depending

		 * on what transcribed in TCP layer, different targets behave

drivers/scsi/cxgbi/libcxgbi.c

+3 −3
Original line number Diff line number Diff line
@@ -1634,11 +1634,11 @@ void cxgbi_conn_pdu_ready(struct cxgbi_sock *csk) 
	log_debug(1 << CXGBI_DBG_PDU_RX,

		"csk 0x%p, conn 0x%p.\n", csk, conn);



	if (unlikely(!conn || conn->suspend_rx)) {

	if (unlikely(!conn || test_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags))) {

		log_debug(1 << CXGBI_DBG_PDU_RX,

			"csk 0x%p, conn 0x%p, id %d, suspend_rx %lu!\n",

			"csk 0x%p, conn 0x%p, id %d, conn flags 0x%lx!\n",

			csk, conn, conn ? conn->id : 0xFF,

			conn ? conn->suspend_rx : 0xFF);

			conn ? conn->flags : 0xFF);

		return;

	}

drivers/scsi/libiscsi.c

+16 −11
Original line number Diff line number Diff line
@@ -678,7 +678,8 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
	struct iscsi_task *task;

	itt_t itt;



	if (session->state == ISCSI_STATE_TERMINATE)

	if (session->state == ISCSI_STATE_TERMINATE ||

	    !test_bit(ISCSI_CONN_FLAG_BOUND, &conn->flags))

		return NULL;



	if (opcode == ISCSI_OP_LOGIN || opcode == ISCSI_OP_TEXT) {
@@ -1392,8 +1393,8 @@ static bool iscsi_set_conn_failed(struct iscsi_conn *conn) 
	if (conn->stop_stage == 0)

		session->state = ISCSI_STATE_FAILED;



	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);

	set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	set_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);

	return true;

}
@@ -1454,7 +1455,7 @@ static int iscsi_xmit_task(struct iscsi_conn *conn, struct iscsi_task *task, 
	 * Do this after dropping the extra ref because if this was a requeue

	 * it's removed from that list and cleanup_queued_task would miss it.

	 */

	if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) {

	if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {

		/*

		 * Save the task and ref in case we weren't cleaning up this

		 * task and get woken up again.
@@ -1532,7 +1533,7 @@ static int iscsi_data_xmit(struct iscsi_conn *conn) 
	int rc = 0;



	spin_lock_bh(&conn->session->frwd_lock);

	if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) {

	if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {

		ISCSI_DBG_SESSION(conn->session, "Tx suspended!\n");

		spin_unlock_bh(&conn->session->frwd_lock);

		return -ENODATA;
@@ -1746,7 +1747,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc) 
		goto fault;

	}



	if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) {

	if (test_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags)) {

		reason = FAILURE_SESSION_IN_RECOVERY;

		sc->result = DID_REQUEUE << 16;

		goto fault;
@@ -1935,7 +1936,7 @@ static void fail_scsi_tasks(struct iscsi_conn *conn, u64 lun, int error) 
void iscsi_suspend_queue(struct iscsi_conn *conn)

{

	spin_lock_bh(&conn->session->frwd_lock);

	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	spin_unlock_bh(&conn->session->frwd_lock);

}

EXPORT_SYMBOL_GPL(iscsi_suspend_queue);
@@ -1953,7 +1954,7 @@ void iscsi_suspend_tx(struct iscsi_conn *conn) 
	struct Scsi_Host *shost = conn->session->host;

	struct iscsi_host *ihost = shost_priv(shost);



	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	set_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	if (ihost->workq)

		flush_workqueue(ihost->workq);

}
@@ -1961,7 +1962,7 @@ EXPORT_SYMBOL_GPL(iscsi_suspend_tx); 


static void iscsi_start_tx(struct iscsi_conn *conn)

{

	clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	clear_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	iscsi_conn_queue_work(conn);

}
@@ -2214,6 +2215,8 @@ void iscsi_conn_unbind(struct iscsi_cls_conn *cls_conn, bool is_active) 
	iscsi_suspend_tx(conn);



	spin_lock_bh(&session->frwd_lock);

	clear_bit(ISCSI_CONN_FLAG_BOUND, &conn->flags);



	if (!is_active) {

		/*

		 * if logout timed out before userspace could even send a PDU
@@ -3317,6 +3320,8 @@ int iscsi_conn_bind(struct iscsi_cls_session *cls_session, 
	spin_lock_bh(&session->frwd_lock);

	if (is_leading)

		session->leadconn = conn;



	set_bit(ISCSI_CONN_FLAG_BOUND, &conn->flags);

	spin_unlock_bh(&session->frwd_lock);



	/*
@@ -3329,8 +3334,8 @@ int iscsi_conn_bind(struct iscsi_cls_session *cls_session, 
	/*

	 * Unblock xmitworker(), Login Phase will pass through.

	 */

	clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);

	clear_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	clear_bit(ISCSI_CONN_FLAG_SUSPEND_RX, &conn->flags);

	clear_bit(ISCSI_CONN_FLAG_SUSPEND_TX, &conn->flags);

	return 0;

}

EXPORT_SYMBOL_GPL(iscsi_conn_bind);