Commit 40cf86f2 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

nvmf: use SPDK_TRACE_ARG_TYPE #defines 



Note: a lot of the TCP and FC trace registers were
specifying '1' which means the arg type is a pointer,
but in reality it is always passing 0 for arg1.  So
this patch just changes them to SPDK_TRACE_ARG_TYPE_INT.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I18d3cedd21e516f16cb2cd0a7f8c16670b1895d7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7763


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent a7ea7cbc

lib/nvmf/fc.c

+32 −16
Original line number Diff line number Diff line
@@ -116,52 +116,68 @@ SPDK_TRACE_REGISTER_FN(nvmf_fc_trace, "nvmf_fc", TRACE_GROUP_NVMF_FC) 
	spdk_trace_register_object(OBJECT_NVMF_FC_IO, 'r');

	spdk_trace_register_description("FC_REQ_NEW",

					TRACE_FC_REQ_INIT,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 1, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 1,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_READ_SUBMIT_TO_BDEV",

					TRACE_FC_REQ_READ_BDEV,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_READ_XFER_DATA",

					TRACE_FC_REQ_READ_XFER,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_READ_RSP",

					TRACE_FC_REQ_READ_RSP,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_WRITE_NEED_BUFFER",

					TRACE_FC_REQ_WRITE_BUFFS,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_WRITE_XFER_DATA",

					TRACE_FC_REQ_WRITE_XFER,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_WRITE_SUBMIT_TO_BDEV",

					TRACE_FC_REQ_WRITE_BDEV,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_WRITE_RSP",

					TRACE_FC_REQ_WRITE_RSP,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_NONE_SUBMIT_TO_BDEV",

					TRACE_FC_REQ_NONE_BDEV,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_NONE_RSP",

					TRACE_FC_REQ_NONE_RSP,

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_FC_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_SUCCESS",

					TRACE_FC_REQ_SUCCESS,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_FAILED",

					TRACE_FC_REQ_FAILED,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_ABORTED",

					TRACE_FC_REQ_ABORTED,

					OWNER_NONE, OBJECT_NONE, 0, 1, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_ABORTED_SUBMIT_TO_BDEV",

					TRACE_FC_REQ_BDEV_ABORTED,

					OWNER_NONE, OBJECT_NONE, 0, 1, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_PENDING",

					TRACE_FC_REQ_PENDING,

					OWNER_NONE, OBJECT_NONE, 0, 1, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("FC_REQ_FUSED_WAITING",

					TRACE_FC_REQ_FUSED_WAITING,

					OWNER_NONE, OBJECT_NONE, 0, 1, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

}



/**

lib/nvmf/rdma.c

+36 −18
Original line number Diff line number Diff line
@@ -158,52 +158,70 @@ SPDK_TRACE_REGISTER_FN(nvmf_trace, "nvmf_rdma", TRACE_GROUP_NVMF_RDMA) 
{

	spdk_trace_register_object(OBJECT_NVMF_RDMA_IO, 'r');

	spdk_trace_register_description("RDMA_REQ_NEW", TRACE_RDMA_REQUEST_STATE_NEW,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 1, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 1,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_NEED_BUFFER", TRACE_RDMA_REQUEST_STATE_NEED_BUFFER,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_C2H",

					TRACE_RDMA_REQUEST_STATE_DATA_TRANSFER_TO_HOST_PENDING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_PENDING_H2C",

					TRACE_RDMA_REQUEST_STATE_DATA_TRANSFER_TO_CONTROLLER_PENDING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_TX_H2C",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_RDY_TO_EXECUTE",

					TRACE_RDMA_REQUEST_STATE_READY_TO_EXECUTE,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_EXECUTING",

					TRACE_RDMA_REQUEST_STATE_EXECUTING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_EXECUTED",

					TRACE_RDMA_REQUEST_STATE_EXECUTED,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_RDY_TO_COMPL",

					TRACE_RDMA_REQUEST_STATE_READY_TO_COMPLETE,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETING_C2H",

					TRACE_RDMA_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETING",

					TRACE_RDMA_REQUEST_STATE_COMPLETING,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");

	spdk_trace_register_description("RDMA_REQ_COMPLETED",

					TRACE_RDMA_REQUEST_STATE_COMPLETED,

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0, 1, "cmid:   ");

					OWNER_NONE, OBJECT_NVMF_RDMA_IO, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "cmid:   ");



	spdk_trace_register_description("RDMA_QP_CREATE", TRACE_RDMA_QP_CREATE,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("RDMA_IBV_ASYNC_EVENT", TRACE_RDMA_IBV_ASYNC_EVENT,

					OWNER_NONE, OBJECT_NONE, 0, 0, "type:   ");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "type:   ");

	spdk_trace_register_description("RDMA_CM_ASYNC_EVENT", TRACE_RDMA_CM_ASYNC_EVENT,

					OWNER_NONE, OBJECT_NONE, 0, 0, "type:   ");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "type:   ");

	spdk_trace_register_description("RDMA_QP_STATE_CHANGE", TRACE_RDMA_QP_STATE_CHANGE,

					OWNER_NONE, OBJECT_NONE, 0, 1, "state:  ");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_PTR, "state:  ");

	spdk_trace_register_description("RDMA_QP_DISCONNECT", TRACE_RDMA_QP_DISCONNECT,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("RDMA_QP_DESTROY", TRACE_RDMA_QP_DESTROY,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

}



enum spdk_nvmf_rdma_wr_type {

lib/nvmf/tcp.c

+26 −13
Original line number Diff line number Diff line
@@ -128,43 +128,56 @@ SPDK_TRACE_REGISTER_FN(nvmf_tcp_trace, "nvmf_tcp", TRACE_GROUP_NVMF_TCP) 
	spdk_trace_register_object(OBJECT_NVMF_TCP_IO, 'r');

	spdk_trace_register_description("TCP_REQ_NEW",

					TRACE_TCP_REQUEST_STATE_NEW,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 1, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 1,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_NEED_BUFFER",

					TRACE_TCP_REQUEST_STATE_NEED_BUFFER,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_TX_H_TO_C",

					TRACE_TCP_REQUEST_STATE_TRANSFERRING_HOST_TO_CONTROLLER,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_RDY_TO_EXECUTE",

					TRACE_TCP_REQUEST_STATE_READY_TO_EXECUTE,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_EXECUTING",

					TRACE_TCP_REQUEST_STATE_EXECUTING,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_EXECUTED",

					TRACE_TCP_REQUEST_STATE_EXECUTED,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_RDY_TO_COMPLETE",

					TRACE_TCP_REQUEST_STATE_READY_TO_COMPLETE,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_TRANSFER_C2H",

					TRACE_TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_COMPLETED",

					TRACE_TCP_REQUEST_STATE_COMPLETED,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_WRITE_START",

					TRACE_TCP_FLUSH_WRITEBUF_START,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_WRITE_DONE",

					TRACE_TCP_FLUSH_WRITEBUF_DONE,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_READ_DONE",

					TRACE_TCP_READ_FROM_SOCKET_DONE,

					OWNER_NONE, OBJECT_NONE, 0, 0, "");

					OWNER_NONE, OBJECT_NONE, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

	spdk_trace_register_description("TCP_REQ_AWAIT_R2T_ACK",

					TRACE_TCP_REQUEST_STATE_AWAIT_R2T_ACK,

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0, 1, "");

					OWNER_NONE, OBJECT_NVMF_TCP_IO, 0,

					SPDK_TRACE_ARG_TYPE_INT, "");

}



struct spdk_nvmf_tcp_req  {