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

Commit 131e6abc authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Add TFO->abort_task for aborted task resources release 



Now that TASK_ABORTED status is not generated for all cases by
TMR ABORT_TASK + LUN_RESET, a new TFO->abort_task() caller is
necessary in order to give fabric drivers a chance to unmap
hardware / software resources before the se_cmd descriptor is
released via the normal TFO->release_cmd() codepath.

This patch adds TFO->aborted_task() in core_tmr_abort_task()
in place of the original transport_send_task_abort(), and
also updates all fabric drivers to implement this caller.

The fabric drivers that include changes to perform cleanup
via ->aborted_task() are:

  - iscsi-target
  - iser-target
  - srpt
  - tcm_qla2xxx

The fabric drivers that currently set ->aborted_task() to
NOPs are:

  - loopback
  - tcm_fc
  - usb-gadget
  - sbp-target
  - vhost-scsi

For the latter five, there appears to be no additional cleanup
required before invoking TFO->release_cmd() to release the
se_cmd descriptor.

v2 changes:
  - Move ->aborted_task() call into transport_cmd_finish_abort (Alex)

Cc: Alex Leung <amleung21@yahoo.com>
Cc: Mark Rustad <mark.d.rustad@intel.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Vu Pham <vu@mellanox.com>
Cc: Chris Boot <bootc@bootc.net>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
Cc: Saurav Kashyap <saurav.kashyap@qlogic.com>
Cc: Quinn Tran <quinn.tran@qlogic.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 68259b5a

drivers/infiniband/ulp/isert/ib_isert.c

+19 −0
Original line number Diff line number Diff line
@@ -2162,6 +2162,24 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
	return isert_post_response(isert_conn, isert_cmd);

}



static void

isert_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

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

	struct isert_device *device = isert_conn->conn_device;



	spin_lock_bh(&conn->cmd_lock);

	if (!list_empty(&cmd->i_conn_node))

		list_del_init(&cmd->i_conn_node);

	spin_unlock_bh(&conn->cmd_lock);



	if (cmd->data_direction == DMA_TO_DEVICE)

		iscsit_stop_dataout_timer(cmd);



	device->unreg_rdma_mem(isert_cmd, isert_conn);

}



static int

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

		bool nopout_response)
@@ -3217,6 +3235,7 @@ static struct iscsit_transport iser_target_transport = { 
	.iscsit_get_dataout	= isert_get_dataout,

	.iscsit_queue_data_in	= isert_put_datain,

	.iscsit_queue_status	= isert_put_response,

	.iscsit_aborted_task	= isert_aborted_task,

};



static int __init isert_init(void)

drivers/infiniband/ulp/srpt/ib_srpt.c

+9 −0
Original line number Diff line number Diff line
@@ -3081,6 +3081,14 @@ static void srpt_queue_tm_rsp(struct se_cmd *cmd) 
	srpt_queue_response(cmd);

}



static void srpt_aborted_task(struct se_cmd *cmd)

{

	struct srpt_send_ioctx *ioctx = container_of(cmd,

				struct srpt_send_ioctx, cmd);



	srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);

}



static int srpt_queue_status(struct se_cmd *cmd)

{

	struct srpt_send_ioctx *ioctx;
@@ -3928,6 +3936,7 @@ static struct target_core_fabric_ops srpt_template = { 
	.queue_data_in			= srpt_queue_data_in,

	.queue_status			= srpt_queue_status,

	.queue_tm_rsp			= srpt_queue_tm_rsp,

	.aborted_task			= srpt_aborted_task,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+16 −0
Original line number Diff line number Diff line
@@ -684,6 +684,20 @@ static void tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd) 
	qlt_xmit_tm_rsp(mcmd);

}



static void tcm_qla2xxx_aborted_task(struct se_cmd *se_cmd)

{

	struct qla_tgt_cmd *cmd = container_of(se_cmd,

				struct qla_tgt_cmd, se_cmd);

	struct scsi_qla_host *vha = cmd->vha;

	struct qla_hw_data *ha = vha->hw;



	if (!cmd->sg_mapped)

		return;



	pci_unmap_sg(ha->pdev, cmd->sg, cmd->sg_cnt, cmd->dma_data_direction);

	cmd->sg_mapped = 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;
@@ -1877,6 +1891,7 @@ 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,

	.aborted_task			= tcm_qla2xxx_aborted_task,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c
@@ -1926,6 +1941,7 @@ 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,

	.aborted_task			= tcm_qla2xxx_aborted_task,

	/*

	 * Setup function pointers for generic logic in

	 * target_core_fabric_configfs.c

drivers/target/iscsi/iscsi_target.c

+13 −0
Original line number Diff line number Diff line
@@ -499,6 +499,18 @@ static int iscsit_queue_rsp(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
	return 0;

}



static void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)

{

	bool scsi_cmd = (cmd->iscsi_opcode == ISCSI_OP_SCSI_CMD);



	spin_lock_bh(&conn->cmd_lock);

	if (!list_empty(&cmd->i_conn_node))

		list_del_init(&cmd->i_conn_node);

	spin_unlock_bh(&conn->cmd_lock);



	__iscsit_free_cmd(cmd, scsi_cmd, true);

}



static struct iscsit_transport iscsi_target_transport = {

	.name			= "iSCSI/TCP",

	.transport_type		= ISCSI_TCP,
@@ -513,6 +525,7 @@ static struct iscsit_transport iscsi_target_transport = { 
	.iscsit_response_queue	= iscsit_response_queue,

	.iscsit_queue_data_in	= iscsit_queue_rsp,

	.iscsit_queue_status	= iscsit_queue_rsp,

	.iscsit_aborted_task	= iscsit_aborted_task,

};



static int __init iscsi_target_init_module(void)

drivers/target/iscsi/iscsi_target_configfs.c

+8 −0
Original line number Diff line number Diff line
@@ -1821,6 +1821,13 @@ static void lio_queue_tm_rsp(struct se_cmd *se_cmd) 
	iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);

}



static void lio_aborted_task(struct se_cmd *se_cmd)

{

	struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);



	cmd->conn->conn_transport->iscsit_aborted_task(cmd->conn, cmd);

}



static char *lio_tpg_get_endpoint_wwn(struct se_portal_group *se_tpg)

{

	struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;
@@ -2005,6 +2012,7 @@ int iscsi_target_register_configfs(void) 
	fabric->tf_ops.queue_data_in = &lio_queue_data_in;

	fabric->tf_ops.queue_status = &lio_queue_status;

	fabric->tf_ops.queue_tm_rsp = &lio_queue_tm_rsp;

	fabric->tf_ops.aborted_task = &lio_aborted_task;

	/*

	 * Setup function pointers for generic logic in target_core_fabric_configfs.c

	 */