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

Commit 649ee054 authored by Bart Van Assche's avatar Bart Van Assche Committed by Nicholas Bellinger
Browse files

target: Move task tag into struct se_cmd + support 64-bit tags 



Simplify target core and target drivers by storing the task tag
a.k.a. command identifier inside struct se_cmd.

For several transports (e.g. SRP) tags are 64 bits wide.
Hence add support for 64-bit tags.

(Fix core_tmr_abort_task conversion spec warnings - nab)
(Fix up usb-gadget to use 16-bit tags - HCH + bart)

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Andy Grover <agrover@redhat.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: <qla2xxx-upstream@qlogic.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 2650d71e

Documentation/target/tcm_mod_builder.py

+0 −8
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.write_pending			= " + fabric_mod_name + "_write_pending,\n"

	buf += "	.write_pending_status		= " + fabric_mod_name + "_write_pending_status,\n"

	buf += "	.set_default_node_attributes	= " + fabric_mod_name + "_set_default_node_attrs,\n"

	buf += "	.get_task_tag			= " + fabric_mod_name + "_get_task_tag,\n"

	buf += "	.get_cmd_state			= " + fabric_mod_name + "_get_cmd_state,\n"

	buf += "	.queue_data_in			= " + fabric_mod_name + "_queue_data_in,\n"

	buf += "	.queue_status			= " + fabric_mod_name + "_queue_status,\n"
@@ -525,13 +524,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "void " + fabric_mod_name + "_set_default_node_attrs(struct se_node_acl *);\n"



		if re.search('get_task_tag\)\(', fo):

			buf += "u32 " + fabric_mod_name + "_get_task_tag(struct se_cmd *se_cmd)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "u32 " + fabric_mod_name + "_get_task_tag(struct se_cmd *);\n"



		if re.search('get_cmd_state\)\(', fo):

			buf += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *se_cmd)\n"

			buf += "{\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+9 −18
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
	}



	pr_debug("Aborting cmd with state %d and tag %lld\n", state,

		 ioctx->tag);

		 ioctx->cmd.tag);



	switch (state) {

	case SRPT_STATE_NEW:
@@ -1701,7 +1701,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, 


	srp_cmd = recv_ioctx->ioctx.buf;

	cmd = &send_ioctx->cmd;

	send_ioctx->tag = srp_cmd->tag;

	cmd->tag = srp_cmd->tag;



	switch (srp_cmd->task_attr) {

	case SRP_CMD_SIMPLE_Q:
@@ -1772,7 +1772,7 @@ static int srpt_rx_mgmt_fn_tag(struct srpt_send_ioctx *ioctx, u64 tag) 
	for (i = 0; i < ch->rq_size; ++i) {

		target = ch->ioctx_ring[i];

		if (target->cmd.se_lun == ioctx->cmd.se_lun &&

		    target->tag == tag &&

		    target->cmd.tag == tag &&

		    srpt_get_cmd_state(target) != SRPT_STATE_DONE) {

			ret = 0;

			/* now let the target core abort &target->cmd; */
@@ -1831,7 +1831,7 @@ static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch, 
		 srp_tsk->task_tag, srp_tsk->tag, ch->cm_id, ch->sess);



	srpt_set_cmd_state(send_ioctx, SRPT_STATE_MGMT);

	send_ioctx->tag = srp_tsk->tag;

	send_ioctx->cmd.tag = srp_tsk->tag;

	tcm_tmr = srp_tmr_to_tcm(srp_tsk->tsk_mgmt_func);

	if (tcm_tmr < 0) {

		send_ioctx->cmd.se_tmr_req->response =
@@ -2979,7 +2979,7 @@ static int srpt_write_pending(struct se_cmd *se_cmd) 
	case CH_DRAINING:

	case CH_RELEASING:

		pr_debug("cmd with tag %lld: channel disconnecting\n",

			 ioctx->tag);

			 ioctx->cmd.tag);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DATA_IN);

		ret = -EINVAL;

		goto out;
@@ -3054,24 +3054,24 @@ static void srpt_queue_response(struct se_cmd *cmd) 
		ret = srpt_xfer_data(ch, ioctx);

		if (ret) {

			pr_err("xfer_data failed for tag %llu\n",

			       ioctx->tag);

			       ioctx->cmd.tag);

			return;

		}

	}



	if (state != SRPT_STATE_MGMT)

		resp_len = srpt_build_cmd_rsp(ch, ioctx, ioctx->tag,

		resp_len = srpt_build_cmd_rsp(ch, ioctx, ioctx->cmd.tag,

					      cmd->scsi_status);

	else {

		srp_tm_status

			= tcm_to_srp_tsk_mgmt_status(cmd->se_tmr_req->response);

		resp_len = srpt_build_tskmgmt_rsp(ch, ioctx, srp_tm_status,

						 ioctx->tag);

						 ioctx->cmd.tag);

	}

	ret = srpt_post_send(ch, ioctx, resp_len);

	if (ret) {

		pr_err("sending cmd response failed for tag %llu\n",

		       ioctx->tag);

		       ioctx->cmd.tag);

		srpt_unmap_sg_to_ib_sge(ch, ioctx);

		srpt_set_cmd_state(ioctx, SRPT_STATE_DONE);

		target_put_sess_cmd(&ioctx->cmd);
@@ -3479,14 +3479,6 @@ static void srpt_set_default_node_attrs(struct se_node_acl *nacl) 
{

}



static u32 srpt_get_task_tag(struct se_cmd *se_cmd)

{

	struct srpt_send_ioctx *ioctx;



	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);

	return ioctx->tag;

}



/* Note: only used from inside debug printk's by the TCM core. */

static int srpt_get_tcm_cmd_state(struct se_cmd *se_cmd)

{
@@ -3838,7 +3830,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.write_pending			= srpt_write_pending,

	.write_pending_status		= srpt_write_pending_status,

	.set_default_node_attributes	= srpt_set_default_node_attrs,

	.get_task_tag			= srpt_get_task_tag,

	.get_cmd_state			= srpt_get_tcm_cmd_state,

	.queue_data_in			= srpt_queue_data_in,

	.queue_status			= srpt_queue_status,

drivers/infiniband/ulp/srpt/ib_srpt.h

+0 −1
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ struct srpt_send_ioctx { 
	bool			rdma_aborted;

	struct se_cmd		cmd;

	struct completion	tx_done;

	u64			tag;

	int			sg_cnt;

	int			mapped_sg_count;

	u16			n_rdma_ius;

drivers/scsi/qla2xxx/qla_target.c

+23 −29
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, 
	list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {

		struct qla_tgt_cmd *cmd =

			container_of(se_cmd, struct qla_tgt_cmd, se_cmd);

		if (cmd->tag == abts->exchange_addr_to_abort) {

		if (se_cmd->tag == abts->exchange_addr_to_abort) {

			lun = cmd->unpacked_lun;

			found_lun = true;

			break;
@@ -1728,9 +1728,8 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd, 


	if (unlikely(cmd->aborted)) {

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,

		    "qla_target(%d): terminating exchange "

		    "for aborted cmd=%p (se_cmd=%p, tag=%d)", vha->vp_idx, cmd,

		    se_cmd, cmd->tag);

		       "qla_target(%d): terminating exchange for aborted cmd=%p (se_cmd=%p, tag=%lld)",

		       vha->vp_idx, cmd, se_cmd, se_cmd->tag);



		cmd->state = QLA_TGT_STATE_ABORTED;

		cmd->cmd_flags |= BIT_6;
@@ -1765,18 +1764,17 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd, 
	if (se_cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {

		prm->residual = se_cmd->residual_count;

		ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x305c,

		    "Residual underflow: %d (tag %d, "

		    "op %x, bufflen %d, rq_result %x)\n", prm->residual,

		    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,

		    "Residual underflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",

		       prm->residual, se_cmd->tag,

		       se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,

		       cmd->bufflen, prm->rq_result);

		prm->rq_result |= SS_RESIDUAL_UNDER;

	} else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {

		prm->residual = se_cmd->residual_count;

		ql_dbg(ql_dbg_io, vha, 0x305d,

		    "Residual overflow: %d (tag %d, "

		    "op %x, bufflen %d, rq_result %x)\n", prm->residual,

		    cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,

		    cmd->bufflen, prm->rq_result);

		    "Residual overflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",

		       prm->residual, se_cmd->tag, se_cmd->t_task_cdb ?

		       se_cmd->t_task_cdb[0] : 0, cmd->bufflen, prm->rq_result);

		prm->rq_result |= SS_RESIDUAL_OVER;

	}
@@ -1849,7 +1847,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type) 
	    == 50) {

		*xmit_type &= ~QLA_TGT_XMIT_STATUS;

		ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf015,

		    "Dropping cmd %p (tag %d) status", cmd, cmd->tag);

		    "Dropping cmd %p (tag %d) status", cmd, se_cmd->tag);

	}

#endif

	/*
@@ -1873,7 +1871,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type) 
		ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf016,

		    "Cutting cmd %p (tag %d) buffer"

		    " tail to len %d, sg_cnt %d (cmd->bufflen %d,"

		    " cmd->sg_cnt %d)", cmd, cmd->tag, tot_len, leave,

		    " cmd->sg_cnt %d)", cmd, se_cmd->tag, tot_len, leave,

		    cmd->bufflen, cmd->sg_cnt);



		cmd->bufflen = tot_len;
@@ -1885,13 +1883,13 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type) 


		ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf017,

		    "Cutting cmd %p (tag %d) buffer head "

		    "to offset %d (cmd->bufflen %d)", cmd, cmd->tag, offset,

		    "to offset %d (cmd->bufflen %d)", cmd, se_cmd->tag, offset,

		    cmd->bufflen);

		if (offset == 0)

			*xmit_type &= ~QLA_TGT_XMIT_DATA;

		else if (qlt_set_data_offset(cmd, offset)) {

			ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf018,

			    "qlt_set_data_offset() failed (tag %d)", cmd->tag);

			    "qlt_set_data_offset() failed (tag %d)", se_cmd->tag);

		}

	}

}
@@ -3194,7 +3192,7 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle, 
		return;

	} else if (cmd->state == QLA_TGT_STATE_ABORTED) {

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e,

		    "Aborted command %p (tag %d) finished\n", cmd, cmd->tag);

		  "Aborted command %p (tag %lld) finished\n", cmd, se_cmd->tag);

	} else {

		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c,

		    "qla_target(%d): A command in state (%d) should "
@@ -3266,7 +3264,7 @@ static void __qlt_do_work(struct qla_tgt_cmd *cmd) 
		goto out_term;



	cdb = &atio->u.isp24.fcp_cmnd.cdb[0];

	cmd->tag = atio->u.isp24.exchange_addr;

	cmd->se_cmd.tag = atio->u.isp24.exchange_addr;

	cmd->unpacked_lun = scsilun_to_int(

	    (struct scsi_lun *)&atio->u.isp24.fcp_cmnd.lun);
@@ -3891,9 +3889,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha, 
			resp = 1;

		} else {

			ql_dbg(ql_dbg_tgt_mgt, vha, 0xf064,

			    "qla_target(%d): SRR for in data for cmd "

			    "without them (tag %d, SCSI status %d), "

			    "reject", vha->vp_idx, cmd->tag,

			       "qla_target(%d): SRR for in data for cmd without them (tag %lld, SCSI status %d), reject",

			       vha->vp_idx, se_cmd->tag,

			    cmd->se_cmd.scsi_status);

			goto out_reject;

		}
@@ -3927,10 +3924,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha, 
			}

		} else {

			ql_dbg(ql_dbg_tgt_mgt, vha, 0xf066,

			    "qla_target(%d): SRR for out data for cmd "

			    "without them (tag %d, SCSI status %d), "

			    "reject", vha->vp_idx, cmd->tag,

			    cmd->se_cmd.scsi_status);

			    "qla_target(%d): SRR for out data for cmd without them (tag %lld, SCSI status %d), reject",

			       vha->vp_idx, se_cmd->tag, cmd->se_cmd.scsi_status);

			goto out_reject;

		}

		break;
@@ -4051,10 +4046,9 @@ static void qlt_handle_srr_work(struct work_struct *work) 
		cmd->sg = se_cmd->t_data_sg;



		ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,

		    "SRR cmd %p (se_cmd %p, tag %d, op %x), "

		    "sg_cnt=%d, offset=%d", cmd, &cmd->se_cmd, cmd->tag,

		    se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,

		    cmd->sg_cnt, cmd->offset);

		       "SRR cmd %p (se_cmd %p, tag %lld, op %x), sg_cnt=%d, offset=%d",

		       cmd, &cmd->se_cmd, se_cmd->tag, se_cmd->t_task_cdb ?

		       se_cmd->t_task_cdb[0] : 0, cmd->sg_cnt, cmd->offset);



		qlt_handle_srr(vha, sctio, imm);

drivers/scsi/qla2xxx/qla_target.h

+0 −1
Original line number Diff line number Diff line
@@ -924,7 +924,6 @@ struct qla_tgt_cmd { 
	int sg_cnt;		/* SG segments count */

	int bufflen;		/* cmd buffer length */

	int offset;

	uint32_t tag;

	uint32_t unpacked_lun;

	enum dma_data_direction dma_data_direction;

	uint32_t reset_count;