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

Commit 9ba55cf7 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:
 "Here are the outstanding target pending updates for v4.7-rc1.

  The highlights this round include:

   - Allow external PR/ALUA metadata path be defined at runtime via top
     level configfs attribute (Lee)
   - Fix target session shutdown bug for ib_srpt multi-channel (hch)
   - Make TFO close_session() and shutdown_session() optional (hch)
   - Drop se_sess->sess_kref + convert tcm_qla2xxx to internal kref
     (hch)
   - Add tcm_qla2xxx endpoint attribute for basic FC jammer (Laurence)
   - Refactor iscsi-target RX/TX PDU encode/decode into common code
     (Varun)
   - Extend iscsit_transport with xmit_pdu, release_cmd, get_rx_pdu,
     validate_parameters, and get_r2t_ttt for generic ISO offload
     (Varun)
   - Initial merge of cxgb iscsi-segment offload target driver (Varun)

  The bulk of the changes are Chelsio's new driver, along with a number
  of iscsi-target common code improvements made by Varun + Co along the
  way"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (29 commits)
  iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race
  cxgbit: Use type ISCSI_CXGBIT + cxgbit tpg_np attribute
  iscsi-target: Convert transport drivers to signal rdma_shutdown
  iscsi-target: Make iscsi_tpg_np driver show/store use generic code
  tcm_qla2xxx Add SCSI command jammer/discard capability
  iscsi-target: graceful disconnect on invalid mapping to iovec
  target: need_to_release is always false, remove redundant check and kfree
  target: remove sess_kref and ->shutdown_session
  iscsi-target: remove usage of ->shutdown_session
  tcm_qla2xxx: introduce a private sess_kref
  target: make close_session optional
  target: make ->shutdown_session optional
  target: remove acl_stop
  target: consolidate and fix session shutdown
  cxgbit: add files for cxgbit.ko
  iscsi-target: export symbols
  iscsi-target: call complete on conn_logout_comp
  iscsi-target: clear tx_thread_active
  iscsi-target: add new offload transport type
  iscsi-target: use conn_transport->transport_type in text rsp
  ...
parents 1cbe06c3 8f0dfb3d

Documentation/scsi/tcm_qla2xxx.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
tcm_qla2xxx jam_host attribute

------------------------------

There is now a new module endpoint atribute called jam_host

attribute: jam_host: boolean=0/1

This attribute and accompanying code is only included if the

Kconfig parameter TCM_QLA2XXX_DEBUG is set to Y

By default this jammer code and functionality is disabled



Use this attribute to control the discarding of SCSI commands to a

selected host.

This may be useful for testing error handling and simulating slow drain

and other fabric issues.



Setting a boolean of 1 for the jam_host attribute for a particular host

 will discard the commands for that host.

Reset back to 0 to stop the jamming.



Enable host 4 to be jammed

echo 1 > /sys/kernel/config/target/qla2xxx/21:00:00:24:ff:27:8f:ae/tpgt_1/attrib/jam_host



Disable jamming on host 4

echo 0 > /sys/kernel/config/target/qla2xxx/21:00:00:24:ff:27:8f:ae/tpgt_1/attrib/jam_host

Documentation/target/tcm_mod_builder.py

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

	buf += "	.tpg_get_inst_index		= " + fabric_mod_name + "_tpg_get_inst_index,\n"

	buf += "	.release_cmd			= " + fabric_mod_name + "_release_cmd,\n"

	buf += "	.shutdown_session		= " + fabric_mod_name + "_shutdown_session,\n"

	buf += "	.close_session			= " + fabric_mod_name + "_close_session,\n"

	buf += "	.sess_get_index			= " + fabric_mod_name + "_sess_get_index,\n"

	buf += "	.sess_get_initiator_sid		= NULL,\n"

	buf += "	.write_pending			= " + fabric_mod_name + "_write_pending,\n"
@@ -467,20 +465,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *);\n"



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

			buf += "int " + fabric_mod_name + "_shutdown_session(struct se_session *se_sess)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_shutdown_session(struct se_session *);\n"



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

			buf += "void " + fabric_mod_name + "_close_session(struct se_session *se_sess)\n"

			buf += "{\n"

			buf += "	return;\n"

			buf += "}\n\n"

			bufi += "void " + fabric_mod_name + "_close_session(struct se_session *);\n"



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

			buf += "u32 " + fabric_mod_name + "_sess_get_index(struct se_session *se_sess)\n"

			buf += "{\n"

drivers/infiniband/ulp/isert/ib_isert.c

+11 −0
Original line number Diff line number Diff line
@@ -2596,9 +2596,19 @@ static void isert_free_conn(struct iscsi_conn *conn) 
	isert_put_conn(isert_conn);

}



static void isert_get_rx_pdu(struct iscsi_conn *conn)

{

	struct completion comp;



	init_completion(&comp);



	wait_for_completion_interruptible(&comp);

}



static struct iscsit_transport iser_target_transport = {

	.name			= "IB/iSER",

	.transport_type		= ISCSI_INFINIBAND,

	.rdma_shutdown		= true,

	.priv_size		= sizeof(struct isert_cmd),

	.owner			= THIS_MODULE,

	.iscsit_setup_np	= isert_setup_np,
@@ -2614,6 +2624,7 @@ static struct iscsit_transport iser_target_transport = { 
	.iscsit_queue_data_in	= isert_put_datain,

	.iscsit_queue_status	= isert_put_response,

	.iscsit_aborted_task	= isert_aborted_task,

	.iscsit_get_rx_pdu	= isert_get_rx_pdu,

	.iscsit_get_sup_prot_ops = isert_get_sup_prot_ops,

};

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −9
Original line number Diff line number Diff line
@@ -1767,14 +1767,6 @@ static void __srpt_close_all_ch(struct srpt_device *sdev) 
	}

}



/**

 * srpt_shutdown_session() - Whether or not a session may be shut down.

 */

static int srpt_shutdown_session(struct se_session *se_sess)

{

	return 1;

}



static void srpt_free_ch(struct kref *kref)

{

	struct srpt_rdma_ch *ch = container_of(kref, struct srpt_rdma_ch, kref);
@@ -3064,7 +3056,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.tpg_get_inst_index		= srpt_tpg_get_inst_index,

	.release_cmd			= srpt_release_cmd,

	.check_stop_free		= srpt_check_stop_free,

	.shutdown_session		= srpt_shutdown_session,

	.close_session			= srpt_close_session,

	.sess_get_index			= srpt_sess_get_index,

	.sess_get_initiator_sid		= NULL,

drivers/scsi/qla2xxx/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -36,3 +36,12 @@ config TCM_QLA2XXX 
	default n

	---help---

	Say Y here to enable the TCM_QLA2XXX fabric module for QLogic 24xx+ series target mode HBAs



if TCM_QLA2XXX

config TCM_QLA2XXX_DEBUG

	bool "TCM_QLA2XXX fabric module DEBUG mode for QLogic 24xx+ series target mode HBAs"

	default n

	---help---

	Say Y here to enable the TCM_QLA2XXX fabric module DEBUG for QLogic 24xx+ series target mode HBAs

	This will include code to enable the SCSI command jammer

endif