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

Commit 1733348b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull SCSI target fixes from Nicholas Bellinger:
 "Mostly minor items this time around, the most notable being a FILEIO
  backend change to enforce hw_max_sectors based upon the current
  block_size to address a bug where large sized I/Os (> 1M) where being
  rejected"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure
  target: Remove extra percpu_ref_init
  target/file: Update hw_max_sectors based on current block_size
  iser-target: Move INIT_WORK setup into isert_create_device_ib_res
  iscsi-target: Fix incorrect np->np_thread NULL assignment
  qla2xxx: Fix schedule_delayed_work() for target timeout calculations
  iser-target: fix error return code in isert_create_device_ib_res()
  iscsi-target: Fix-up all zero data-length CDBs with R/W_BIT set
  target: Remove write-only stats fields and lock from struct se_node_acl
  iscsi-target: return -EINVAL on oversized configfs parameter
parents a8472b4b dcd21199

drivers/infiniband/ulp/isert/ib_isert.c

+16 −6
Original line number Diff line number Diff line
@@ -207,7 +207,9 @@ isert_free_rx_descriptors(struct isert_conn *isert_conn) 
	isert_conn->conn_rx_descs = NULL;

}



static void isert_cq_tx_work(struct work_struct *);

static void isert_cq_tx_callback(struct ib_cq *, void *);

static void isert_cq_rx_work(struct work_struct *);

static void isert_cq_rx_callback(struct ib_cq *, void *);



static int
@@ -259,26 +261,36 @@ isert_create_device_ib_res(struct isert_device *device) 
		cq_desc[i].device = device;

		cq_desc[i].cq_index = i;



		INIT_WORK(&cq_desc[i].cq_rx_work, isert_cq_rx_work);

		device->dev_rx_cq[i] = ib_create_cq(device->ib_device,

						isert_cq_rx_callback,

						isert_cq_event_callback,

						(void *)&cq_desc[i],

						ISER_MAX_RX_CQ_LEN, i);

		if (IS_ERR(device->dev_rx_cq[i]))

		if (IS_ERR(device->dev_rx_cq[i])) {

			ret = PTR_ERR(device->dev_rx_cq[i]);

			device->dev_rx_cq[i] = NULL;

			goto out_cq;

		}



		INIT_WORK(&cq_desc[i].cq_tx_work, isert_cq_tx_work);

		device->dev_tx_cq[i] = ib_create_cq(device->ib_device,

						isert_cq_tx_callback,

						isert_cq_event_callback,

						(void *)&cq_desc[i],

						ISER_MAX_TX_CQ_LEN, i);

		if (IS_ERR(device->dev_tx_cq[i]))

		if (IS_ERR(device->dev_tx_cq[i])) {

			ret = PTR_ERR(device->dev_tx_cq[i]);

			device->dev_tx_cq[i] = NULL;

			goto out_cq;

		}



		if (ib_req_notify_cq(device->dev_rx_cq[i], IB_CQ_NEXT_COMP))

		ret = ib_req_notify_cq(device->dev_rx_cq[i], IB_CQ_NEXT_COMP);

		if (ret)

			goto out_cq;



		if (ib_req_notify_cq(device->dev_tx_cq[i], IB_CQ_NEXT_COMP))

		ret = ib_req_notify_cq(device->dev_tx_cq[i], IB_CQ_NEXT_COMP);

		if (ret)

			goto out_cq;

	}
@@ -1724,7 +1736,6 @@ isert_cq_tx_callback(struct ib_cq *cq, void *context) 
{

	struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;



	INIT_WORK(&cq_desc->cq_tx_work, isert_cq_tx_work);

	queue_work(isert_comp_wq, &cq_desc->cq_tx_work);

}
@@ -1768,7 +1779,6 @@ isert_cq_rx_callback(struct ib_cq *cq, void *context) 
{

	struct isert_cq_desc *cq_desc = (struct isert_cq_desc *)context;



	INIT_WORK(&cq_desc->cq_rx_work, isert_cq_rx_work);

	queue_work(isert_rx_wq, &cq_desc->cq_rx_work);

}

drivers/scsi/qla2xxx/qla_target.c

+6 −4
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static void qlt_schedule_sess_for_deletion(struct qla_tgt_sess *sess, 
		schedule_delayed_work(&tgt->sess_del_work, 0);

	else

		schedule_delayed_work(&tgt->sess_del_work,

		    jiffies - sess->expires);

		    sess->expires - jiffies);

}



/* ha->hardware_lock supposed to be held on entry */
@@ -550,13 +550,14 @@ static void qlt_del_sess_work_fn(struct delayed_work *work) 
	struct scsi_qla_host *vha = tgt->vha;

	struct qla_hw_data *ha = vha->hw;

	struct qla_tgt_sess *sess;

	unsigned long flags;

	unsigned long flags, elapsed;



	spin_lock_irqsave(&ha->hardware_lock, flags);

	while (!list_empty(&tgt->del_sess_list)) {

		sess = list_entry(tgt->del_sess_list.next, typeof(*sess),

		    del_list_entry);

		if (time_after_eq(jiffies, sess->expires)) {

		elapsed = jiffies;

		if (time_after_eq(elapsed, sess->expires)) {

			qlt_undelete_sess(sess);



			ql_dbg(ql_dbg_tgt_mgt, vha, 0xf004,
@@ -566,7 +567,7 @@ static void qlt_del_sess_work_fn(struct delayed_work *work) 
			ha->tgt.tgt_ops->put_sess(sess);

		} else {

			schedule_delayed_work(&tgt->sess_del_work,

			    jiffies - sess->expires);

			    sess->expires - elapsed);

			break;

		}

	}
@@ -4290,6 +4291,7 @@ int qlt_lport_register(struct qla_tgt_func_tmpl *qla_tgt_ops, u64 wwpn, 
		if (rc != 0) {

			ha->tgt.tgt_ops = NULL;

			ha->tgt.target_lport_ptr = NULL;

			scsi_host_put(host);

		}

		mutex_unlock(&qla_tgt_mutex);

		return rc;

drivers/target/iscsi/iscsi_target.c

+13 −14
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ int iscsit_del_np(struct iscsi_np *np) 
		 */

		send_sig(SIGINT, np->np_thread, 1);

		kthread_stop(np->np_thread);

		np->np_thread = NULL;

	}



	np->np_transport->iscsit_free_np(np);
@@ -823,24 +824,22 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
	if (((hdr->flags & ISCSI_FLAG_CMD_READ) ||

	     (hdr->flags & ISCSI_FLAG_CMD_WRITE)) && !hdr->data_length) {

		/*

		 * Vmware ESX v3.0 uses a modified Cisco Initiator (v3.4.2)

		 * that adds support for RESERVE/RELEASE.  There is a bug

		 * add with this new functionality that sets R/W bits when

		 * neither CDB carries any READ or WRITE datapayloads.

		 * From RFC-3720 Section 10.3.1:

		 *

		 * "Either or both of R and W MAY be 1 when either the

		 *  Expected Data Transfer Length and/or Bidirectional Read

		 *  Expected Data Transfer Length are 0"

		 *

		 * For this case, go ahead and clear the unnecssary bits

		 * to avoid any confusion with ->data_direction.

		 */

		if ((hdr->cdb[0] == 0x16) || (hdr->cdb[0] == 0x17)) {

		hdr->flags &= ~ISCSI_FLAG_CMD_READ;

		hdr->flags &= ~ISCSI_FLAG_CMD_WRITE;

			goto done;

		}



		pr_err("ISCSI_FLAG_CMD_READ or ISCSI_FLAG_CMD_WRITE"

		pr_warn("ISCSI_FLAG_CMD_READ or ISCSI_FLAG_CMD_WRITE"

			" set when Expected Data Transfer Length is 0 for"

			" CDB: 0x%02x. Bad iSCSI Initiator.\n", hdr->cdb[0]);

		return iscsit_add_reject_cmd(cmd,

					     ISCSI_REASON_BOOKMARK_INVALID, buf);

			" CDB: 0x%02x, Fixing up flags\n", hdr->cdb[0]);

	}

done:



	if (!(hdr->flags & ISCSI_FLAG_CMD_READ) &&

	    !(hdr->flags & ISCSI_FLAG_CMD_WRITE) && (hdr->data_length != 0)) {

drivers/target/iscsi/iscsi_target_configfs.c

+2 −1
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ static ssize_t __iscsi_##prefix##_store_##name( \ 
									\

	if (!capable(CAP_SYS_ADMIN))					\

		return -EPERM;						\

									\

	if (count >= sizeof(auth->name))				\

		return -EINVAL;						\

	snprintf(auth->name, sizeof(auth->name), "%s", page);		\

	if (!strncmp("NULL", auth->name, 4))				\

		auth->naf_flags &= ~flags;				\

drivers/target/iscsi/iscsi_target_login.c

+0 −6
Original line number Diff line number Diff line
@@ -1403,11 +1403,6 @@ old_sess_out: 


out:

	stop = kthread_should_stop();

	if (!stop && signal_pending(current)) {

		spin_lock_bh(&np->np_thread_lock);

		stop = (np->np_thread_state == ISCSI_NP_THREAD_SHUTDOWN);

		spin_unlock_bh(&np->np_thread_lock);

	}

	/* Wait for another socket.. */

	if (!stop)

		return 1;
@@ -1415,7 +1410,6 @@ exit: 
	iscsi_stop_login_thread_timer(np);

	spin_lock_bh(&np->np_thread_lock);

	np->np_thread_state = ISCSI_NP_THREAD_EXIT;

	np->np_thread = NULL;

	spin_unlock_bh(&np->np_thread_lock);



	return 0;