Commit 698e22d8 authored by Jim Harris's avatar Jim Harris
Browse files

iscsi: associate trace ISCSI_PDU object with SOCK_REQ 



This enables mapping sock request events with their respective iscsi_pdu
object.

This removes the need for the iSCSI FLUSH_WRITEBUF events - the new sock
request events serve the exact same purpose - so remove them.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I73ad7ef903edb65e0bedaecabcde85c34fd2ca9a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/22107


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarSeung yeon Shin <syeon.shin@samsung.com>
parent 9df4931b

include/spdk_internal/trace_defs.h

+0 −2
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ 


/* Iscsi conn tracepoint definitions */

#define TRACE_ISCSI_READ_FROM_SOCKET_DONE	SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x0)

#define TRACE_ISCSI_FLUSH_WRITEBUF_START	SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x1)

#define TRACE_ISCSI_FLUSH_WRITEBUF_DONE		SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x2)

#define TRACE_ISCSI_READ_PDU			SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x3)

#define TRACE_ISCSI_TASK_DONE			SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x4)

#define TRACE_ISCSI_TASK_QUEUE			SPDK_TPOINT_ID(TRACE_GROUP_ISCSI, 0x5)

lib/iscsi/conn.c

+3 −10
Original line number Diff line number Diff line
@@ -1406,8 +1406,6 @@ _iscsi_conn_pdu_write_done(void *cb_arg, int err) 


	if (err != 0) {

		conn->state = ISCSI_CONN_STATE_EXITING;

	} else {

		spdk_trace_record(TRACE_ISCSI_FLUSH_WRITEBUF_DONE, conn->id, pdu->mapped_length, (uintptr_t)pdu);

	}



	if ((conn->full_feature) &&
@@ -1470,8 +1468,6 @@ iscsi_conn_write_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu, 
	pdu->sock_req.cb_fn = _iscsi_conn_pdu_write_done;

	pdu->sock_req.cb_arg = pdu;



	spdk_trace_record(TRACE_ISCSI_FLUSH_WRITEBUF_START, conn->id, pdu->mapped_length, (uintptr_t)pdu,

			  pdu->sock_req.iovcnt);

	spdk_sock_writev_async(conn->sock, &pdu->sock_req);

}
@@ -1627,12 +1623,6 @@ SPDK_TRACE_REGISTER_FN(iscsi_conn_trace, "iscsi_conn", TRACE_GROUP_ISCSI) 
	spdk_trace_register_description("ISCSI_READ_DONE", TRACE_ISCSI_READ_FROM_SOCKET_DONE,

					OWNER_ISCSI_CONN, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("ISCSI_WRITE_START", TRACE_ISCSI_FLUSH_WRITEBUF_START,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 1,

					SPDK_TRACE_ARG_TYPE_INT, "iovec");

	spdk_trace_register_description("ISCSI_WRITE_DONE", TRACE_ISCSI_FLUSH_WRITEBUF_DONE,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("ISCSI_READ_PDU", TRACE_ISCSI_READ_PDU,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 1,

					SPDK_TRACE_ARG_TYPE_INT, "opc");
@@ -1648,6 +1638,9 @@ SPDK_TRACE_REGISTER_FN(iscsi_conn_trace, "iscsi_conn", TRACE_GROUP_ISCSI) 
	spdk_trace_register_description("ISCSI_PDU_COMPLETED", TRACE_ISCSI_PDU_COMPLETED,

					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_tpoint_register_relation(TRACE_SOCK_REQ_QUEUE, OBJECT_ISCSI_PDU, 0);

	spdk_trace_tpoint_register_relation(TRACE_SOCK_REQ_PEND, OBJECT_ISCSI_PDU, 0);

	spdk_trace_tpoint_register_relation(TRACE_SOCK_REQ_COMPLETE, OBJECT_ISCSI_PDU, 0);

}



void