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

Commit e70beee7 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Pass in transport supported PI at session initialization 



In order to support local WRITE_INSERT + READ_STRIP operations for
non PI enabled fabrics, the fabric driver needs to be able signal
what protection offload operations are supported.

This is done at session initialization time so the modes can be
signaled by individual se_wwn + se_portal_group endpoints, as well
as optionally across different transports on the same endpoint.

For iser-target, set TARGET_PROT_ALL if the underlying ib_device
has already signaled PI offload support, and allow this to be
exposed via a new iscsit_transport->iscsit_get_sup_prot_ops()
callback.

For loopback, set TARGET_PROT_ALL to signal SCSI initiator mode
operation.

For all other drivers, set TARGET_PROT_NORMAL to disable fabric
level PI.

Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Cc: Quinn Tran <quinn.tran@qlogic.com>
Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent d84287bc

drivers/infiniband/ulp/isert/ib_isert.c

+13 −0
Original line number Diff line number Diff line
@@ -2196,6 +2196,18 @@ isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
	device->unreg_rdma_mem(isert_cmd, isert_conn);

}



static enum target_prot_op

isert_get_sup_prot_ops(struct iscsi_conn *conn)

{

	struct isert_conn *isert_conn = (struct isert_conn *)conn->context;

	struct isert_device *device = isert_conn->conn_device;



	if (device->pi_capable)

		return TARGET_PROT_ALL;



	return TARGET_PROT_NORMAL;

}



static int

isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn,

		bool nopout_response)
@@ -3252,6 +3264,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_sup_prot_ops = isert_get_sup_prot_ops,

};



static int __init isert_init(void)

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −1
Original line number Diff line number Diff line
@@ -2580,7 +2580,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, 
		goto destroy_ib;

	}



	ch->sess = transport_init_session();

	ch->sess = transport_init_session(TARGET_PROT_NORMAL);

	if (IS_ERR(ch->sess)) {

		rej->reason = __constant_cpu_to_be32(

				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ static int tcm_qla2xxx_check_initiator_node_acl( 
	}

	se_tpg = &tpg->se_tpg;



	se_sess = transport_init_session();

	se_sess = transport_init_session(TARGET_PROT_NORMAL);

	if (IS_ERR(se_sess)) {

		pr_err("Unable to initialize struct se_session\n");

		return PTR_ERR(se_sess);

drivers/target/iscsi/iscsi_target.c

+6 −0
Original line number Diff line number Diff line
@@ -511,6 +511,11 @@ static void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
	__iscsit_free_cmd(cmd, scsi_cmd, true);

}



static enum target_prot_op iscsit_get_sup_prot_ops(struct iscsi_conn *conn)

{

	return TARGET_PROT_NORMAL;

}



static struct iscsit_transport iscsi_target_transport = {

	.name			= "iSCSI/TCP",

	.transport_type		= ISCSI_TCP,
@@ -526,6 +531,7 @@ static struct iscsit_transport iscsi_target_transport = { 
	.iscsit_queue_data_in	= iscsit_queue_rsp,

	.iscsit_queue_status	= iscsit_queue_rsp,

	.iscsit_aborted_task	= iscsit_aborted_task,

	.iscsit_get_sup_prot_ops = iscsit_get_sup_prot_ops,

};



static int __init iscsi_target_init_module(void)

drivers/target/iscsi/iscsi_target_login.c

+3 −1
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ static int iscsi_login_zero_tsih_s1( 
{

	struct iscsi_session *sess = NULL;

	struct iscsi_login_req *pdu = (struct iscsi_login_req *)buf;

	enum target_prot_op sup_pro_ops;

	int ret;



	sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);
@@ -320,8 +321,9 @@ static int iscsi_login_zero_tsih_s1( 
		kfree(sess);

		return -ENOMEM;

	}

	sup_pro_ops = conn->conn_transport->iscsit_get_sup_prot_ops(conn);



	sess->se_sess = transport_init_session();

	sess->se_sess = transport_init_session(sup_pro_ops);

	if (IS_ERR(sess->se_sess)) {

		iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,

				ISCSI_LOGIN_STATUS_NO_RESOURCES);