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

Commit 2650d71e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

target: move transport ID handling to the core 



Now that struct se_portal_group contains a protocol identifier field we can
take all the code to format an parse protocol identifiers in CDBs into common
code instead of leaving this to low-level drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 2aeeafae

Documentation/target/tcm_mod_builder.py

+0 −121
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ def tcm_mod_build_FC_include(fabric_mod_dir_var, fabric_mod_name): 
	buf += "};\n"

	buf += "\n"

	buf += "struct " + fabric_mod_name + "_lport {\n"

	buf += "	/* SCSI protocol the lport is providing */\n"

	buf += "	u8 lport_proto_id;\n"

	buf += "	/* Binary World Wide unique Port Name for FC Target Lport */\n"

	buf += "	u64 lport_wwpn;\n"

	buf += "	/* ASCII formatted WWPN for FC Target Lport */\n"
@@ -105,8 +103,6 @@ def tcm_mod_build_SAS_include(fabric_mod_dir_var, fabric_mod_name): 
	buf += "	struct se_portal_group se_tpg;\n"

	buf += "};\n\n"

	buf += "struct " + fabric_mod_name + "_tport {\n"

	buf += "	/* SCSI protocol the tport is providing */\n"

	buf += "	u8 tport_proto_id;\n"

	buf += "	/* Binary World Wide unique Port Name for SAS Target port */\n"

	buf += "	u64 tport_wwpn;\n"

	buf += "	/* ASCII formatted WWPN for SAS Target port */\n"
@@ -150,8 +146,6 @@ def tcm_mod_build_iSCSI_include(fabric_mod_dir_var, fabric_mod_name): 
	buf += "	struct se_portal_group se_tpg;\n"

	buf += "};\n\n"

	buf += "struct " + fabric_mod_name + "_tport {\n"

	buf += "	/* SCSI protocol the tport is providing */\n"

	buf += "	u8 tport_proto_id;\n"

	buf += "	/* ASCII formatted TargetName for IQN */\n"

	buf += "	char tport_name[" + fabric_mod_name.upper() + "_NAMELEN];\n"

	buf += "	/* Returned by " + fabric_mod_name + "_make_tport() */\n"
@@ -303,9 +297,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.get_fabric_name		= " + fabric_mod_name + "_get_fabric_name,\n"

	buf += "	.tpg_get_wwn			= " + fabric_mod_name + "_get_fabric_wwn,\n"

	buf += "	.tpg_get_tag			= " + fabric_mod_name + "_get_tag,\n"

	buf += "	.tpg_get_pr_transport_id	= " + fabric_mod_name + "_get_pr_transport_id,\n"

	buf += "	.tpg_get_pr_transport_id_len	= " + fabric_mod_name + "_get_pr_transport_id_len,\n"

	buf += "	.tpg_parse_pr_out_transport_id	= " + fabric_mod_name + "_parse_pr_out_transport_id,\n"

	buf += "	.tpg_check_demo_mode		= " + fabric_mod_name + "_check_false,\n"

	buf += "	.tpg_check_demo_mode_cache	= " + fabric_mod_name + "_check_true,\n"

	buf += "	.tpg_check_demo_mode_write_protect = " + fabric_mod_name + "_check_true,\n"
@@ -478,118 +469,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "u16 " + fabric_mod_name + "_get_tag(struct se_portal_group *);\n"



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

			buf += "u32 " + fabric_mod_name + "_get_pr_transport_id(\n"

			buf += "	struct se_portal_group *se_tpg,\n"

			buf += "	struct se_node_acl *se_nacl,\n"

			buf += "	struct t10_pr_registration *pr_reg,\n"

			buf += "	int *format_code,\n"

			buf += "	unsigned char *buf)\n"

			buf += "{\n"

			buf += "	struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"

			buf += "				struct " + fabric_mod_name + "_tpg, se_tpg);\n"

			buf += "	struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = tpg->" + fabric_mod_port + ";\n"

			buf += "	int ret = 0;\n\n"

			buf += "	switch (" + fabric_mod_port + "->" + fabric_mod_port + "_proto_id) {\n"

			if proto_ident == "FC":

				buf += "	case SCSI_PROTOCOL_FCP:\n"

				buf += "	default:\n"

				buf += "		ret = fc_get_pr_transport_id(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code, buf);\n"

				buf += "		break;\n"

			elif proto_ident == "SAS":

				buf += "	case SCSI_PROTOCOL_SAS:\n"

				buf += "	default:\n"

				buf += "		ret = sas_get_pr_transport_id(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code, buf);\n"

				buf += "		break;\n"

			elif proto_ident == "iSCSI":

				buf += "	case SCSI_PROTOCOL_ISCSI:\n"

				buf += "	default:\n"

				buf += "		ret = iscsi_get_pr_transport_id(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code, buf);\n"

				buf += "		break;\n"



			buf += "	}\n\n"

			buf += "	return ret;\n"

			buf += "}\n\n"

			bufi += "u32 " + fabric_mod_name + "_get_pr_transport_id(struct se_portal_group *,\n"

			bufi += "			struct se_node_acl *, struct t10_pr_registration *,\n"

			bufi += "			int *, unsigned char *);\n"



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

			buf += "u32 " + fabric_mod_name + "_get_pr_transport_id_len(\n"

			buf += "	struct se_portal_group *se_tpg,\n"

			buf += "	struct se_node_acl *se_nacl,\n"

			buf += "	struct t10_pr_registration *pr_reg,\n"

			buf += "	int *format_code)\n"

			buf += "{\n"

			buf += "	struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"

			buf += "				struct " + fabric_mod_name + "_tpg, se_tpg);\n"

			buf += "	struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = tpg->" + fabric_mod_port + ";\n"

			buf += "	int ret = 0;\n\n"

			buf += "	switch (" + fabric_mod_port + "->" + fabric_mod_port + "_proto_id) {\n"

			if proto_ident == "FC":

				buf += "	case SCSI_PROTOCOL_FCP:\n"

				buf += "	default:\n"

				buf += "		ret = fc_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code);\n"

				buf += "		break;\n"

			elif proto_ident == "SAS":

				buf += "	case SCSI_PROTOCOL_SAS:\n"

				buf += "	default:\n"

				buf += "		ret = sas_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code);\n"

				buf += "		break;\n"

			elif proto_ident == "iSCSI":

				buf += "	case SCSI_PROTOCOL_ISCSI:\n"

				buf += "	default:\n"

				buf += "		ret = iscsi_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,\n"

				buf += "					format_code);\n"

				buf += "		break;\n"





			buf += "	}\n\n"

			buf += "	return ret;\n"

			buf += "}\n\n"

			bufi += "u32 " + fabric_mod_name + "_get_pr_transport_id_len(struct se_portal_group *,\n"

			bufi += "			struct se_node_acl *, struct t10_pr_registration *,\n"

			bufi += "			int *);\n"



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

			buf += "char *" + fabric_mod_name + "_parse_pr_out_transport_id(\n"

			buf += "	struct se_portal_group *se_tpg,\n"

			buf += "	const char *buf,\n"

			buf += "	u32 *out_tid_len,\n"

			buf += "	char **port_nexus_ptr)\n"

			buf += "{\n"

			buf += "	struct " + fabric_mod_name + "_tpg *tpg = container_of(se_tpg,\n"

			buf += "				struct " + fabric_mod_name + "_tpg, se_tpg);\n"

			buf += "	struct " + fabric_mod_name + "_" + fabric_mod_port + " *" + fabric_mod_port + " = tpg->" + fabric_mod_port + ";\n"

			buf += "	char *tid = NULL;\n\n"

			buf += "	switch (" + fabric_mod_port + "->" + fabric_mod_port + "_proto_id) {\n"

			if proto_ident == "FC":

				buf += "	case SCSI_PROTOCOL_FCP:\n"

				buf += "	default:\n"

				buf += "		tid = fc_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,\n"

				buf += "					port_nexus_ptr);\n"

			elif proto_ident == "SAS":

				buf += "	case SCSI_PROTOCOL_SAS:\n"

				buf += "	default:\n"

				buf += "		tid = sas_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,\n"

				buf += "					port_nexus_ptr);\n"

			elif proto_ident == "iSCSI":

				buf += "	case SCSI_PROTOCOL_ISCSI:\n"

				buf += "	default:\n"

				buf += "		tid = iscsi_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,\n"

				buf += "					port_nexus_ptr);\n"



			buf += "	}\n\n"

			buf += "	return tid;\n"

			buf += "}\n\n"

			bufi += "char *" + fabric_mod_name + "_parse_pr_out_transport_id(struct se_portal_group *,\n"

			bufi +=	"			const char *, u32 *, char **);\n"



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

			buf += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *se_tpg)\n"

			buf += "{\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −39
Original line number Diff line number Diff line
@@ -3406,42 +3406,6 @@ static u16 srpt_get_tag(struct se_portal_group *tpg) 
	return 1;

}



static u32 srpt_get_pr_transport_id(struct se_portal_group *se_tpg,

				    struct se_node_acl *se_nacl,

				    struct t10_pr_registration *pr_reg,

				    int *format_code, unsigned char *buf)

{

	struct srpt_node_acl *nacl;

	struct spc_rdma_transport_id *tr_id;



	nacl = container_of(se_nacl, struct srpt_node_acl, nacl);

	tr_id = (void *)buf;

	tr_id->protocol_identifier = SCSI_TRANSPORTID_PROTOCOLID_SRP;

	memcpy(tr_id->i_port_id, nacl->i_port_id, sizeof(tr_id->i_port_id));

	return sizeof(*tr_id);

}



static u32 srpt_get_pr_transport_id_len(struct se_portal_group *se_tpg,

					struct se_node_acl *se_nacl,

					struct t10_pr_registration *pr_reg,

					int *format_code)

{

	*format_code = 0;

	return sizeof(struct spc_rdma_transport_id);

}



static char *srpt_parse_pr_out_transport_id(struct se_portal_group *se_tpg,

					    const char *buf, u32 *out_tid_len,

					    char **port_nexus_ptr)

{

	struct spc_rdma_transport_id *tr_id;



	*port_nexus_ptr = NULL;

	*out_tid_len = sizeof(struct spc_rdma_transport_id);

	tr_id = (void *)buf;

	return (char *)tr_id->i_port_id;

}



static u32 srpt_tpg_get_inst_index(struct se_portal_group *se_tpg)

{

	return 1;
@@ -3860,9 +3824,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.get_fabric_name		= srpt_get_fabric_name,

	.tpg_get_wwn			= srpt_get_fabric_wwn,

	.tpg_get_tag			= srpt_get_tag,

	.tpg_get_pr_transport_id	= srpt_get_pr_transport_id,

	.tpg_get_pr_transport_id_len	= srpt_get_pr_transport_id_len,

	.tpg_parse_pr_out_transport_id	= srpt_parse_pr_out_transport_id,

	.tpg_check_demo_mode		= srpt_check_false,

	.tpg_check_demo_mode_cache	= srpt_check_true,

	.tpg_check_demo_mode_write_protect = srpt_check_true,

drivers/infiniband/ulp/srpt/ib_srpt.h

+0 −18
Original line number Diff line number Diff line
@@ -422,22 +422,4 @@ struct srpt_node_acl { 
	struct list_head	list;

};



/*

 * SRP-releated SCSI persistent reservation definitions.

 *

 * See also SPC4r28, section 7.6.1 (Protocol specific parameters introduction).

 * See also SPC4r28, section 7.6.4.5 (TransportID for initiator ports using

 * SCSI over an RDMA interface).

 */



enum {

	SCSI_TRANSPORTID_PROTOCOLID_SRP	= 4,

};



struct spc_rdma_transport_id {

	uint8_t protocol_identifier;

	uint8_t reserved[7];

	uint8_t i_port_id[16];

};



#endif				/* IB_SRPT_H */

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+0 −73
Original line number Diff line number Diff line
@@ -206,73 +206,6 @@ static u16 tcm_qla2xxx_get_tag(struct se_portal_group *se_tpg) 
	return tpg->lport_tpgt;

}



static u32 tcm_qla2xxx_get_pr_transport_id(

	struct se_portal_group *se_tpg,

	struct se_node_acl *se_nacl,

	struct t10_pr_registration *pr_reg,

	int *format_code,

	unsigned char *buf)

{

	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);

	struct tcm_qla2xxx_lport *lport = tpg->lport;

	int ret = 0;



	switch (lport->lport_proto_id) {

	case SCSI_PROTOCOL_FCP:

	default:

		ret = fc_get_pr_transport_id(se_tpg, se_nacl, pr_reg,

					format_code, buf);

		break;

	}



	return ret;

}



static u32 tcm_qla2xxx_get_pr_transport_id_len(

	struct se_portal_group *se_tpg,

	struct se_node_acl *se_nacl,

	struct t10_pr_registration *pr_reg,

	int *format_code)

{

	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);

	struct tcm_qla2xxx_lport *lport = tpg->lport;

	int ret = 0;



	switch (lport->lport_proto_id) {

	case SCSI_PROTOCOL_FCP:

	default:

		ret = fc_get_pr_transport_id_len(se_tpg, se_nacl, pr_reg,

					format_code);

		break;

	}



	return ret;

}



static char *tcm_qla2xxx_parse_pr_out_transport_id(

	struct se_portal_group *se_tpg,

	const char *buf,

	u32 *out_tid_len,

	char **port_nexus_ptr)

{

	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);

	struct tcm_qla2xxx_lport *lport = tpg->lport;

	char *tid = NULL;



	switch (lport->lport_proto_id) {

	case SCSI_PROTOCOL_FCP:

	default:

		tid = fc_parse_pr_out_transport_id(se_tpg, buf, out_tid_len,

					port_nexus_ptr);

		break;

	}



	return tid;

}



static int tcm_qla2xxx_check_demo_mode(struct se_portal_group *se_tpg)

{

	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,
@@ -1913,9 +1846,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_ops = { 
	.get_fabric_name		= tcm_qla2xxx_get_fabric_name,

	.tpg_get_wwn			= tcm_qla2xxx_get_fabric_wwn,

	.tpg_get_tag			= tcm_qla2xxx_get_tag,

	.tpg_get_pr_transport_id	= tcm_qla2xxx_get_pr_transport_id,

	.tpg_get_pr_transport_id_len	= tcm_qla2xxx_get_pr_transport_id_len,

	.tpg_parse_pr_out_transport_id	= tcm_qla2xxx_parse_pr_out_transport_id,

	.tpg_check_demo_mode		= tcm_qla2xxx_check_demo_mode,

	.tpg_check_demo_mode_cache	= tcm_qla2xxx_check_demo_mode_cache,

	.tpg_check_demo_mode_write_protect =
@@ -1963,9 +1893,6 @@ static const struct target_core_fabric_ops tcm_qla2xxx_npiv_ops = { 
	.get_fabric_name		= tcm_qla2xxx_npiv_get_fabric_name,

	.tpg_get_wwn			= tcm_qla2xxx_get_fabric_wwn,

	.tpg_get_tag			= tcm_qla2xxx_get_tag,

	.tpg_get_pr_transport_id	= tcm_qla2xxx_get_pr_transport_id,

	.tpg_get_pr_transport_id_len	= tcm_qla2xxx_get_pr_transport_id_len,

	.tpg_parse_pr_out_transport_id	= tcm_qla2xxx_parse_pr_out_transport_id,

	.tpg_check_demo_mode		= tcm_qla2xxx_check_demo_mode,

	.tpg_check_demo_mode_cache	= tcm_qla2xxx_check_demo_mode_cache,

	.tpg_check_demo_mode_write_protect = tcm_qla2xxx_check_demo_mode,

drivers/scsi/qla2xxx/tcm_qla2xxx.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct tcm_qla2xxx_fc_loopid { 
};



struct tcm_qla2xxx_lport {

	/* SCSI protocol the lport is providing */

	u8 lport_proto_id;

	/* Binary World Wide unique Port Name for FC Target Lport */

	u64 lport_wwpn;

	/* Binary World Wide unique Port Name for FC NPIV Target Lport */