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

Commit a188e7e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull scsi target updates from Nicholas Bellinger:
 "Things have been calm for the most part with no new fabric drivers in
  flight for v3.7 (we're up to eight now !), so this update is primarily
  focused on addressing a few long-standing items within target-core and
  iscsi-target fabric code.

  The highlights include:

   - target: Simplify fabric sense data length handling (roland)
   - qla2xxx: Fix endianness of task management response code (roland)
   - target: fix truncation of mode data, support zero allocation length
     (paolo)
   - target: Properly support zero-length commands in normal processing
     path (paolo)
   - iscsi-target: Correctly set 0xffffffff field within ISCSI_OP_REJECT
     PDU (ronnie + nab)
   - iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG
     demo-mode (ronnie + nab)
   - target/file: Re-enable optional fd_buffered_io=1 operation (nab +
     hch)
   - iscsi-target: Add MaxXmitDataSegmenthLength forr target ->
     initiator MDRSL declaration (nab)
   - target: Add target_submit_cmd_map_sgls for SGL fabric memory
     passthrough (nab + hch)
   - tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls (hch +
     nab)
   - tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls (nab
     + hch)

  The last series for adding a new target_submit_cmd_map_sgls() fabric
  caller (as requested by hch) that accepts pre-allocated SGL memory
  (using existing logic), along with converting tcm_loop + tcm_vhost has
  only been in -next for the last days, but has gotten enough review
  +testing and is clear enough a mechanical change that I think it's
  reasonable to merge for -rc1 code.

  Thanks again to everyone who contributed this round! Extra special
  thanks to Roland (PureStorage) for tracking down the qla2xxx target
  TMR response code endian issue, and to Paolo (Redhat) for resolving
  the long standing zero-length CDB issues within target-core between
  virtual and pSCSI backends."

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (44 commits)
  iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values
  iscsit: proper endianess conversions
  iscsit: use the itt_t abstract type
  iscsit: add missing endianess conversion in iscsit_check_inaddr_any
  iscsit: remove incorrect unlock in iscsit_build_sendtargets_resp
  iscsit: mark various functions static
  target/iscsi: precedence bug in iscsit_set_dataout_sequence_values()
  target/usb-gadget: strlen() doesn't count the terminator
  target/usb-gadget: remove duplicate initialization
  tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls
  target: Add control CDB READ payload zero work-around
  tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls
  target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough
  iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG demo-mode
  iscsi-target: Change iscsi_target_seq_pdu_list.c to honor MaxXmitDataSegmentLength
  iscsi-target: Add MaxXmitDataSegmentLength connection recovery check
  iscsi-target: Convert incoming PDU payload checks to MaxXmitDataSegmentLength
  iscsi-target: Enable MaxXmitDataSegmentLength operation in login path
  iscsi-target: Add base MaxXmitDataSegmentLength code
  target/file: Re-enable optional fd_buffered_io=1 operation
  ...
parents e1b28147 cf0eb28d

Documentation/target/tcm_mod_builder.py

+0 −16
Original line number Diff line number Diff line
@@ -402,8 +402,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.queue_data_in			= " + fabric_mod_name + "_queue_data_in,\n"

	buf += "	.queue_status			= " + fabric_mod_name + "_queue_status,\n"

	buf += "	.queue_tm_rsp			= " + fabric_mod_name + "_queue_tm_rsp,\n"

	buf += "	.get_fabric_sense_len		= " + fabric_mod_name + "_get_fabric_sense_len,\n"

	buf += "	.set_fabric_sense_len		= " + fabric_mod_name + "_set_fabric_sense_len,\n"

	buf += "	.is_state_remove		= " + fabric_mod_name + "_is_state_remove,\n"

	buf += "	/*\n"

	buf += "	 * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"
@@ -906,20 +904,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_queue_tm_rsp(struct se_cmd *);\n"



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

			buf += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "u16 " + fabric_mod_name + "_get_fabric_sense_len(void);\n"



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

			buf += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *se_cmd, u32 sense_length)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "u16 " + fabric_mod_name + "_set_fabric_sense_len(struct se_cmd *, u32);\n"



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

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

			buf += "{\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −12
Original line number Diff line number Diff line
@@ -3564,16 +3564,6 @@ static int srpt_get_tcm_cmd_state(struct se_cmd *se_cmd) 
	return srpt_get_cmd_state(ioctx);

}



static u16 srpt_set_fabric_sense_len(struct se_cmd *cmd, u32 sense_length)

{

	return 0;

}



static u16 srpt_get_fabric_sense_len(void)

{

	return 0;

}



/**

 * srpt_parse_i_port_id() - Parse an initiator port ID.

 * @name: ASCII representation of a 128-bit initiator port ID.
@@ -3953,8 +3943,6 @@ static struct target_core_fabric_ops srpt_template = { 
	.queue_data_in			= srpt_queue_response,

	.queue_status			= srpt_queue_status,

	.queue_tm_rsp			= srpt_queue_response,

	.get_fabric_sense_len		= srpt_get_fabric_sense_len,

	.set_fabric_sense_len		= srpt_set_fabric_sense_len,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c

drivers/scsi/qla2xxx/qla_target.c

+1 −1
Original line number Diff line number Diff line
@@ -1403,7 +1403,7 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha, 
	ctio->u.status1.scsi_status =

	    __constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);

	ctio->u.status1.response_len = __constant_cpu_to_le16(8);

	((uint32_t *)ctio->u.status1.sense_data)[0] = cpu_to_be32(resp_code);

	ctio->u.status1.sense_data[0] = resp_code;



	qla2x00_start_iocbs(ha, ha->req);

}

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+0 −15
Original line number Diff line number Diff line
@@ -735,17 +735,6 @@ static int tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd) 
	return 0;

}



static u16 tcm_qla2xxx_get_fabric_sense_len(void)

{

	return 0;

}



static u16 tcm_qla2xxx_set_fabric_sense_len(struct se_cmd *se_cmd,

					u32 sense_length)

{

	return 0;

}



/* Local pointer to allocated TCM configfs fabric module */

struct target_fabric_configfs *tcm_qla2xxx_fabric_configfs;

struct target_fabric_configfs *tcm_qla2xxx_npiv_fabric_configfs;
@@ -1691,8 +1680,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_ops = { 
	.queue_data_in			= tcm_qla2xxx_queue_data_in,

	.queue_status			= tcm_qla2xxx_queue_status,

	.queue_tm_rsp			= tcm_qla2xxx_queue_tm_rsp,

	.get_fabric_sense_len		= tcm_qla2xxx_get_fabric_sense_len,

	.set_fabric_sense_len		= tcm_qla2xxx_set_fabric_sense_len,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c
@@ -1740,8 +1727,6 @@ static struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { 
	.queue_data_in			= tcm_qla2xxx_queue_data_in,

	.queue_status			= tcm_qla2xxx_queue_status,

	.queue_tm_rsp			= tcm_qla2xxx_queue_tm_rsp,

	.get_fabric_sense_len		= tcm_qla2xxx_get_fabric_sense_len,

	.set_fabric_sense_len		= tcm_qla2xxx_set_fabric_sense_len,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c

drivers/target/iscsi/iscsi_target.c

+90 −106

File changed.

Preview size limit exceeded, changes collapsed.