Commit de4eac2a authored by Krzysztof Karas's avatar Krzysztof Karas Committed by Tomasz Zawadzki
Browse files

trace: add traces around io_device name 



Add/modify tpoints around io_device name in lib/bdev/bdev.c
and lib/thread/thread.c.

Deleted double spaces in commets of trace_defs.h.

Change-Id: I0e2f5118e68b1b329a422bde3400fd2273e7387e
Signed-off-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10687


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
parent e4ef7b39

include/spdk_internal/trace_defs.h

+11 −9
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
/* Bdev tracepoint definitions */

#define TRACE_BDEV_IO_START		SPDK_TPOINT_ID(TRACE_GROUP_BDEV, 0x0)

#define TRACE_BDEV_IO_DONE		SPDK_TPOINT_ID(TRACE_GROUP_BDEV, 0x1)

#define TRACE_BDEV_IOCH_CREATE		SPDK_TPOINT_ID(TRACE_GROUP_BDEV, 0x2)

#define TRACE_BDEV_IOCH_DESTROY		SPDK_TPOINT_ID(TRACE_GROUP_BDEV, 0x3)



/* NVMe-of TCP tracepoint  definitions */

#define TRACE_TCP_REQUEST_STATE_NEW				SPDK_TPOINT_ID(TRACE_GROUP_NVMF_TCP, 0x00)

lib/bdev/bdev.c

+22 −0
Original line number Diff line number Diff line
@@ -3003,6 +3003,9 @@ bdev_channel_create(void *io_device, void *ctx_buf) 
		return -1;

	}



	spdk_trace_record(TRACE_BDEV_IOCH_CREATE, 0, 0, 0, ch->bdev->name,

			  spdk_thread_get_id(spdk_io_channel_get_thread(ch->channel)));



	assert(ch->histogram == NULL);

	if (bdev->internal.histogram_enabled) {

		ch->histogram = spdk_histogram_data_alloc();
@@ -3273,6 +3276,9 @@ bdev_channel_destroy(void *io_device, void *ctx_buf) 
	SPDK_DEBUGLOG(bdev, "Destroying channel %p for bdev %s on thread %p\n", ch, ch->bdev->name,

		      spdk_get_thread());



	spdk_trace_record(TRACE_BDEV_IOCH_DESTROY, 0, 0, 0, ch->bdev->name,

			  spdk_thread_get_id(spdk_io_channel_get_thread(ch->channel)));



	/* This channel is going away, so add its statistics into the bdev so that they don't get lost. */

	pthread_mutex_lock(&ch->bdev->internal.mutex);

	bdev_io_stat_add(&ch->bdev->internal.stat, &ch->stat);
@@ -7165,6 +7171,22 @@ SPDK_TRACE_REGISTER_FN(bdev_trace, "bdev", TRACE_GROUP_BDEV) 
			OWNER_BDEV, OBJECT_BDEV_IO, 0,

			{{ "ctx", SPDK_TRACE_ARG_TYPE_PTR, 8 }}

		},

		{

			"BDEV_IOCH_CREATE", TRACE_BDEV_IOCH_CREATE,

			OWNER_BDEV, OBJECT_NONE, 1,

			{

				{ "name", SPDK_TRACE_ARG_TYPE_STR, 40 },

				{ "thread_id", SPDK_TRACE_ARG_TYPE_INT, 8}

			}

		},

		{

			"BDEV_IOCH_DESTROY", TRACE_BDEV_IOCH_DESTROY,

			OWNER_BDEV, OBJECT_NONE, 0,

			{

				{ "name", SPDK_TRACE_ARG_TYPE_STR, 40 },

				{ "thread_id", SPDK_TRACE_ARG_TYPE_INT, 8}

			}

		},

	};

lib/thread/thread.c

+3 −3
Original line number Diff line number Diff line
@@ -2139,7 +2139,7 @@ spdk_get_io_channel(void *io_device) 
		 */

		pthread_mutex_unlock(&g_devlist_mutex);

		spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0,

				  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref);

				  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref, dev->name);

		return ch;

	}
@@ -2174,7 +2174,7 @@ spdk_get_io_channel(void *io_device) 
		return NULL;

	}



	spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0, (uint64_t)spdk_io_channel_get_ctx(ch), 1);

	spdk_trace_record(TRACE_THREAD_IOCH_GET, 0, 0, (uint64_t)spdk_io_channel_get_ctx(ch), 1, dev->name);

	return ch;

}
@@ -2242,7 +2242,7 @@ spdk_put_io_channel(struct spdk_io_channel *ch) 
	int rc __attribute__((unused));



	spdk_trace_record(TRACE_THREAD_IOCH_PUT, 0, 0,

			  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref);

			  (uint64_t)spdk_io_channel_get_ctx(ch), ch->ref, ch->dev->name);



	thread = spdk_get_thread();

	if (!thread) {