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

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

target/iscsi: Misc cleanups from Agrover (round 2) 



This patch includes the handful of squashed patches for target/iscsi from
Andy's original series into lio-core/master code:

*) Make iscsit_add_reject static
*) Remove unused data_offset_end from iscsi_datain_req
*) Remove "#if 0" stubs
*) Rename iscsi_datain_req to cmd_datain_node
*) Cleanups for built_r2ts_for_cmd()
*) Cleanups for Cleanup build_sendtargets_response()

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

drivers/target/iscsi/iscsi_target.c

+30 −26
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ static void __exit iscsi_target_cleanup_module(void) 
	kfree(iscsit_global);

}



int iscsit_add_reject(

static int iscsit_add_reject(

	u8 reason,

	int fail_conn,

	unsigned char *buf,
@@ -1442,7 +1442,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf) 
		return 0;

	else if (ret == DATAOUT_SEND_R2T) {

		iscsit_set_dataout_sequence_values(cmd);

		iscsit_build_r2ts_for_cmd(cmd, conn, 0);

		iscsit_build_r2ts_for_cmd(cmd, conn, false);

	} else if (ret == DATAOUT_SEND_TO_TRANSPORT) {

		/*

		 * Handle extra special case for out of order
@@ -2950,15 +2950,13 @@ static int iscsit_send_r2t( 
}



/*

 *	type 0: Normal Operation.

 *	type 1: Called from Storage Transport.

 *	type 2: Called from iscsi_task_reassign_complete_write() for

 *	@recovery: If called from iscsi_task_reassign_complete_write() for

 *		connection recovery.

 */

int iscsit_build_r2ts_for_cmd(

	struct iscsi_cmd *cmd,

	struct iscsi_conn *conn,

	int type)

	bool recovery)

{

	int first_r2t = 1;

	u32 offset = 0, xfer_len = 0;
@@ -2969,27 +2967,33 @@ int iscsit_build_r2ts_for_cmd( 
		return 0;

	}



	if (conn->sess->sess_ops->DataSequenceInOrder && (type != 2))

	if (conn->sess->sess_ops->DataSequenceInOrder &&

	    !recovery)

		cmd->r2t_offset = max(cmd->r2t_offset, cmd->write_data_done);



	while (cmd->outstanding_r2ts < conn->sess->sess_ops->MaxOutstandingR2T) {

		if (conn->sess->sess_ops->DataSequenceInOrder) {

			offset = cmd->r2t_offset;



			if (first_r2t && (type == 2)) {

				xfer_len = ((offset +

					     (conn->sess->sess_ops->MaxBurstLength -

					     cmd->next_burst_len) >

					     cmd->data_length) ?

					    (cmd->data_length - offset) :

					    (conn->sess->sess_ops->MaxBurstLength -

					     cmd->next_burst_len));

			if (first_r2t && recovery) {

				int new_data_end = offset +

					conn->sess->sess_ops->MaxBurstLength -

					cmd->next_burst_len;



				if (new_data_end > cmd->data_length)

					xfer_len = cmd->data_length - offset;

				else

					xfer_len =

						conn->sess->sess_ops->MaxBurstLength -

						cmd->next_burst_len;

			} else {

				xfer_len = ((offset +

					     conn->sess->sess_ops->MaxBurstLength) >

					     cmd->data_length) ?

					     (cmd->data_length - offset) :

				int new_data_end = offset +

					conn->sess->sess_ops->MaxBurstLength;



				if (new_data_end > cmd->data_length)

					xfer_len = cmd->data_length - offset;

				else

					xfer_len = conn->sess->sess_ops->MaxBurstLength;

			}

			cmd->r2t_offset += xfer_len;
@@ -3225,6 +3229,8 @@ static bool iscsit_check_inaddr_any(struct iscsi_np *np) 
	return ret;

}



#define SENDTARGETS_BUF_LIMIT 32768U



static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)

{

	char *payload = NULL;
@@ -3233,12 +3239,10 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd) 
	struct iscsi_tiqn *tiqn;

	struct iscsi_tpg_np *tpg_np;

	int buffer_len, end_of_buf = 0, len = 0, payload_len = 0;

	unsigned char buf[256];



	buffer_len = (conn->conn_ops->MaxRecvDataSegmentLength > 32768) ?

			32768 : conn->conn_ops->MaxRecvDataSegmentLength;

	unsigned char buf[ISCSI_IQN_LEN+12]; /* iqn + "TargetName=" + \0 */



	memset(buf, 0, 256);

	buffer_len = max(conn->conn_ops->MaxRecvDataSegmentLength,

			 SENDTARGETS_BUF_LIMIT);



	payload = kzalloc(buffer_len, GFP_KERNEL);

	if (!payload) {

drivers/target/iscsi/iscsi_target.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern int iscsit_logout_closesession(struct iscsi_cmd *, struct iscsi_conn *); 
extern int iscsit_logout_closeconnection(struct iscsi_cmd *, struct iscsi_conn *);

extern int iscsit_logout_removeconnforrecovery(struct iscsi_cmd *, struct iscsi_conn *);

extern int iscsit_send_async_msg(struct iscsi_conn *, u16, u8, u8);

extern int iscsit_build_r2ts_for_cmd(struct iscsi_cmd *, struct iscsi_conn *, int);

extern int iscsit_build_r2ts_for_cmd(struct iscsi_cmd *, struct iscsi_conn *, bool recovery);

extern void iscsit_thread_get_cpumask(struct iscsi_conn *);

extern int iscsi_target_tx_thread(void *);

extern int iscsi_target_rx_thread(void *);

drivers/target/iscsi/iscsi_target_configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ static int lio_write_pending(struct se_cmd *se_cmd) 
	struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);



	if (!cmd->immediate_data && !cmd->unsolicited_data)

		return iscsit_build_r2ts_for_cmd(cmd, cmd->conn, 1);

		return iscsit_build_r2ts_for_cmd(cmd, cmd->conn, false);



	return 0;

}

drivers/target/iscsi/iscsi_target_core.h

+1 −2
Original line number Diff line number Diff line
@@ -296,12 +296,11 @@ struct iscsi_datain_req { 
	u32			runlength;

	u32			data_length;

	u32			data_offset;

	u32			data_offset_end;

	u32			data_sn;

	u32			next_burst_len;

	u32			read_data_done;

	u32			seq_send_order;

	struct list_head	dr_list;

	struct list_head	cmd_datain_node;

} ____cacheline_aligned;



struct iscsi_ooo_cmdsn {

drivers/target/iscsi/iscsi_target_datain_values.c

+7 −10
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct iscsi_datain_req *iscsit_allocate_datain_req(void) 
				" struct iscsi_datain_req\n");

		return NULL;

	}

	INIT_LIST_HEAD(&dr->dr_list);

	INIT_LIST_HEAD(&dr->cmd_datain_node);



	return dr;

}
@@ -45,14 +45,14 @@ struct iscsi_datain_req *iscsit_allocate_datain_req(void) 
void iscsit_attach_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr)

{

	spin_lock(&cmd->datain_lock);

	list_add_tail(&dr->dr_list, &cmd->datain_list);

	list_add_tail(&dr->cmd_datain_node, &cmd->datain_list);

	spin_unlock(&cmd->datain_lock);

}



void iscsit_free_datain_req(struct iscsi_cmd *cmd, struct iscsi_datain_req *dr)

{

	spin_lock(&cmd->datain_lock);

	list_del(&dr->dr_list);

	list_del(&dr->cmd_datain_node);

	spin_unlock(&cmd->datain_lock);



	kmem_cache_free(lio_dr_cache, dr);
@@ -63,8 +63,8 @@ void iscsit_free_all_datain_reqs(struct iscsi_cmd *cmd) 
	struct iscsi_datain_req *dr, *dr_tmp;



	spin_lock(&cmd->datain_lock);

	list_for_each_entry_safe(dr, dr_tmp, &cmd->datain_list, dr_list) {

		list_del(&dr->dr_list);

	list_for_each_entry_safe(dr, dr_tmp, &cmd->datain_list, cmd_datain_node) {

		list_del(&dr->cmd_datain_node);

		kmem_cache_free(lio_dr_cache, dr);

	}

	spin_unlock(&cmd->datain_lock);
@@ -72,17 +72,14 @@ void iscsit_free_all_datain_reqs(struct iscsi_cmd *cmd) 


struct iscsi_datain_req *iscsit_get_datain_req(struct iscsi_cmd *cmd)

{

	struct iscsi_datain_req *dr;



	if (list_empty(&cmd->datain_list)) {

		pr_err("cmd->datain_list is empty for ITT:"

			" 0x%08x\n", cmd->init_task_tag);

		return NULL;

	}

	list_for_each_entry(dr, &cmd->datain_list, dr_list)

		break;



	return dr;

	return list_first_entry(&cmd->datain_list, struct iscsi_datain_req,

				cmd_datain_node);

}



/*