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

Commit d28b1169 authored by Andy Grover's avatar Andy Grover Committed by Nicholas Bellinger
Browse files

target/iscsi: Inline iscsit_allocate_se_cmd and *_for_tmr 



Trying to move a bunch of stuff around so iscsi can use target_submit_cmd
someday, and so stuff needs to be in that function directly instead of
hidden, so it can be reordered etc.

Signed-off-by: default avatarAndy Grover <agrover@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent b16a35b0

drivers/target/iscsi/iscsi_target.c

+101 −5
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ 
#include <asm/unaligned.h>

#include <scsi/scsi_device.h>

#include <scsi/iscsi_proto.h>

#include <scsi/scsi_tcq.h>

#include <target/target_core_base.h>

#include <target/target_core_fabric.h>

#include <target/target_core_configfs.h>



#include "iscsi_target_core.h"

#include "iscsi_target_parameters.h"
@@ -842,6 +844,8 @@ static int iscsit_handle_scsi_cmd( 
	int	dump_immediate_data = 0, send_check_condition = 0, payload_length;

	struct iscsi_cmd	*cmd = NULL;

	struct iscsi_scsi_req *hdr;

	int iscsi_task_attr;

	int sam_task_attr;



	spin_lock_bh(&conn->sess->session_stats_lock);

	conn->sess->cmd_pdus++;
@@ -958,12 +962,39 @@ static int iscsit_handle_scsi_cmd( 
			 (hdr->flags & ISCSI_FLAG_CMD_READ) ? DMA_FROM_DEVICE :

			  DMA_NONE;



	cmd = iscsit_allocate_se_cmd(conn, hdr->data_length, data_direction,

				(hdr->flags & ISCSI_FLAG_CMD_ATTR_MASK));

	cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);

	if (!cmd)

		return iscsit_add_reject(ISCSI_REASON_BOOKMARK_NO_RESOURCES, 1,

					 buf, conn);



	cmd->data_direction = data_direction;

	cmd->data_length = hdr->data_length;

	iscsi_task_attr = hdr->flags & ISCSI_FLAG_CMD_ATTR_MASK;

	/*

	 * Figure out the SAM Task Attribute for the incoming SCSI CDB

	 */

	if ((iscsi_task_attr == ISCSI_ATTR_UNTAGGED) ||

	    (iscsi_task_attr == ISCSI_ATTR_SIMPLE))

		sam_task_attr = MSG_SIMPLE_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_ORDERED)

		sam_task_attr = MSG_ORDERED_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_HEAD_OF_QUEUE)

		sam_task_attr = MSG_HEAD_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_ACA)

		sam_task_attr = MSG_ACA_TAG;

	else {

		pr_debug("Unknown iSCSI Task Attribute: 0x%02x, using"

			" MSG_SIMPLE_TAG\n", iscsi_task_attr);

		sam_task_attr = MSG_SIMPLE_TAG;

	}



	/*

	 * Initialize struct se_cmd descriptor from target_core_mod infrastructure

	 */

	transport_init_se_cmd(&cmd->se_cmd, &lio_target_fabric_configfs->tf_ops,

			conn->sess->se_sess, cmd->data_length, cmd->data_direction,

			sam_task_attr, &cmd->sense_buffer[0]);



	pr_debug("Got SCSI Command, ITT: 0x%08x, CmdSN: 0x%08x,"

		" ExpXferLen: %u, Length: %u, CID: %hu\n", hdr->itt,

		hdr->cmdsn, hdr->data_length, payload_length, conn->cid);
@@ -1718,11 +1749,76 @@ static int iscsit_handle_task_mgt_cmd( 
	    (hdr->refcmdsn != ISCSI_RESERVED_TAG))

		hdr->refcmdsn = ISCSI_RESERVED_TAG;



	cmd = iscsit_allocate_se_cmd_for_tmr(conn, function);

	cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);

	if (!cmd)

		return iscsit_add_reject(ISCSI_REASON_BOOKMARK_NO_RESOURCES,

					 1, buf, conn);



	cmd->data_direction = DMA_NONE;



	cmd->tmr_req = kzalloc(sizeof(struct iscsi_tmr_req), GFP_KERNEL);

	if (!cmd->tmr_req) {

		pr_err("Unable to allocate memory for"

			" Task Management command!\n");

		return iscsit_add_reject_from_cmd(

			ISCSI_REASON_BOOKMARK_NO_RESOURCES,

			1, 1, buf, cmd);

	}



	/*

	 * TASK_REASSIGN for ERL=2 / connection stays inside of

	 * LIO-Target $FABRIC_MOD

	 */

	if (function != ISCSI_TM_FUNC_TASK_REASSIGN) {



		u8 tcm_function;

		int ret;



		transport_init_se_cmd(&cmd->se_cmd,

				      &lio_target_fabric_configfs->tf_ops,

				      conn->sess->se_sess, 0, DMA_NONE,

				      MSG_SIMPLE_TAG, &cmd->sense_buffer[0]);



		switch (function) {

		case ISCSI_TM_FUNC_ABORT_TASK:

			tcm_function = TMR_ABORT_TASK;

			break;

		case ISCSI_TM_FUNC_ABORT_TASK_SET:

			tcm_function = TMR_ABORT_TASK_SET;

			break;

		case ISCSI_TM_FUNC_CLEAR_ACA:

			tcm_function = TMR_CLEAR_ACA;

			break;

		case ISCSI_TM_FUNC_CLEAR_TASK_SET:

			tcm_function = TMR_CLEAR_TASK_SET;

			break;

		case ISCSI_TM_FUNC_LOGICAL_UNIT_RESET:

			tcm_function = TMR_LUN_RESET;

			break;

		case ISCSI_TM_FUNC_TARGET_WARM_RESET:

			tcm_function = TMR_TARGET_WARM_RESET;

			break;

		case ISCSI_TM_FUNC_TARGET_COLD_RESET:

			tcm_function = TMR_TARGET_COLD_RESET;

			break;

		default:

			pr_err("Unknown iSCSI TMR Function:"

			       " 0x%02x\n", function);

			return iscsit_add_reject_from_cmd(

				ISCSI_REASON_BOOKMARK_NO_RESOURCES,

				1, 1, buf, cmd);

		}



		ret = core_tmr_alloc_req(&cmd->se_cmd, cmd->tmr_req,

					 tcm_function, GFP_KERNEL);

		if (ret < 0)

			return iscsit_add_reject_from_cmd(

				ISCSI_REASON_BOOKMARK_NO_RESOURCES,

				1, 1, buf, cmd);



		cmd->tmr_req->se_tmr_req = cmd->se_cmd.se_tmr_req;

	}



	cmd->iscsi_opcode	= ISCSI_OP_SCSI_TMFUNC;

	cmd->i_state		= ISTATE_SEND_TASKMGTRSP;

	cmd->immediate_cmd	= ((hdr->opcode & ISCSI_OP_IMMEDIATE) ? 1 : 0);

drivers/target/iscsi/iscsi_target_util.c

+0 −123
Original line number Diff line number Diff line
@@ -176,129 +176,6 @@ struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *conn, gfp_t gfp_mask) 
	return cmd;

}



/*

 * Called from iscsi_handle_scsi_cmd()

 */

struct iscsi_cmd *iscsit_allocate_se_cmd(

	struct iscsi_conn *conn,

	u32 data_length,

	int data_direction,

	int iscsi_task_attr)

{

	struct iscsi_cmd *cmd;

	struct se_cmd *se_cmd;

	int sam_task_attr;



	cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);

	if (!cmd)

		return NULL;



	cmd->data_direction = data_direction;

	cmd->data_length = data_length;

	/*

	 * Figure out the SAM Task Attribute for the incoming SCSI CDB

	 */

	if ((iscsi_task_attr == ISCSI_ATTR_UNTAGGED) ||

	    (iscsi_task_attr == ISCSI_ATTR_SIMPLE))

		sam_task_attr = MSG_SIMPLE_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_ORDERED)

		sam_task_attr = MSG_ORDERED_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_HEAD_OF_QUEUE)

		sam_task_attr = MSG_HEAD_TAG;

	else if (iscsi_task_attr == ISCSI_ATTR_ACA)

		sam_task_attr = MSG_ACA_TAG;

	else {

		pr_debug("Unknown iSCSI Task Attribute: 0x%02x, using"

			" MSG_SIMPLE_TAG\n", iscsi_task_attr);

		sam_task_attr = MSG_SIMPLE_TAG;

	}



	se_cmd = &cmd->se_cmd;

	/*

	 * Initialize struct se_cmd descriptor from target_core_mod infrastructure

	 */

	transport_init_se_cmd(se_cmd, &lio_target_fabric_configfs->tf_ops,

			conn->sess->se_sess, data_length, data_direction,

			sam_task_attr, &cmd->sense_buffer[0]);

	return cmd;

}



struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(

	struct iscsi_conn *conn,

	u8 function)

{

	struct iscsi_cmd *cmd;

	struct se_cmd *se_cmd;

	int rc;

	u8 tcm_function;



	cmd = iscsit_allocate_cmd(conn, GFP_KERNEL);

	if (!cmd)

		return NULL;



	cmd->data_direction = DMA_NONE;



	cmd->tmr_req = kzalloc(sizeof(struct iscsi_tmr_req), GFP_KERNEL);

	if (!cmd->tmr_req) {

		pr_err("Unable to allocate memory for"

			" Task Management command!\n");

		goto out;

	}

	/*

	 * TASK_REASSIGN for ERL=2 / connection stays inside of

	 * LIO-Target $FABRIC_MOD

	 */

	if (function == ISCSI_TM_FUNC_TASK_REASSIGN)

		return cmd;



	se_cmd = &cmd->se_cmd;

	/*

	 * Initialize struct se_cmd descriptor from target_core_mod infrastructure

	 */

	transport_init_se_cmd(se_cmd, &lio_target_fabric_configfs->tf_ops,

				conn->sess->se_sess, 0, DMA_NONE,

				MSG_SIMPLE_TAG, &cmd->sense_buffer[0]);



	switch (function) {

	case ISCSI_TM_FUNC_ABORT_TASK:

		tcm_function = TMR_ABORT_TASK;

		break;

	case ISCSI_TM_FUNC_ABORT_TASK_SET:

		tcm_function = TMR_ABORT_TASK_SET;

		break;

	case ISCSI_TM_FUNC_CLEAR_ACA:

		tcm_function = TMR_CLEAR_ACA;

		break;

	case ISCSI_TM_FUNC_CLEAR_TASK_SET:

		tcm_function = TMR_CLEAR_TASK_SET;

		break;

	case ISCSI_TM_FUNC_LOGICAL_UNIT_RESET:

		tcm_function = TMR_LUN_RESET;

		break;

	case ISCSI_TM_FUNC_TARGET_WARM_RESET:

		tcm_function = TMR_TARGET_WARM_RESET;

		break;

	case ISCSI_TM_FUNC_TARGET_COLD_RESET:

		tcm_function = TMR_TARGET_COLD_RESET;

		break;

	default:

		pr_err("Unknown iSCSI TMR Function:"

			" 0x%02x\n", function);

		goto out;

	}



	rc = core_tmr_alloc_req(se_cmd, cmd->tmr_req, tcm_function, GFP_KERNEL);

	if (rc < 0)

		goto out;



	cmd->tmr_req->se_tmr_req = se_cmd->se_tmr_req;



	return cmd;

out:

	iscsit_release_cmd(cmd);

	return NULL;

}



int iscsit_decide_list_to_build(

	struct iscsi_cmd *cmd,

	u32 immediate_data_length)

drivers/target/iscsi/iscsi_target_util.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ extern struct iscsi_r2t *iscsit_get_r2t_from_list(struct iscsi_cmd *); 
extern void iscsit_free_r2t(struct iscsi_r2t *, struct iscsi_cmd *);

extern void iscsit_free_r2ts_from_list(struct iscsi_cmd *);

extern struct iscsi_cmd *iscsit_allocate_cmd(struct iscsi_conn *, gfp_t);

extern struct iscsi_cmd *iscsit_allocate_se_cmd(struct iscsi_conn *, u32, int, int);

extern struct iscsi_cmd *iscsit_allocate_se_cmd_for_tmr(struct iscsi_conn *, u8);

extern int iscsit_decide_list_to_build(struct iscsi_cmd *, u32);

extern struct iscsi_seq *iscsit_get_seq_holder_for_datain(struct iscsi_cmd *, u32);

extern struct iscsi_seq *iscsit_get_seq_holder_for_r2t(struct iscsi_cmd *);