Commit 908cab3f authored by Jim Harris's avatar Jim Harris Committed by Daniel Verkamp
Browse files

bdev: populate module_name 



Add a name parameter to the MODULE_REGISTER macros, and then
modify each bdev module to pass a string for its name.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: If878617ce3c3eacfcf5df44ed6f194f11c66f78f

Reviewed-on: https://review.gerrithub.io/368596


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent b509410c

include/spdk_internal/bdev.h

+12 −10
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct spdk_bdev_module_if { 
	void (*config_text)(FILE *fp);



	/** Name for the modules being defined. */

	const char *module_name;

	const char *name;



	/**

	 * Returns the allocation size required for the backend for uses such as local
@@ -423,29 +423,31 @@ spdk_bdev_io_from_ctx(void *ctx) 
	       ((uintptr_t)ctx - offsetof(struct spdk_bdev_io, driver_ctx));

}



#define SPDK_BDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn)			\

	static struct spdk_bdev_module_if init_fn ## _if = {					\

#define SPDK_BDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn)		\

	static struct spdk_bdev_module_if _name ## _if = {					\

	.name		= #_name,								\

	.module_init 	= init_fn,								\

	.module_fini	= fini_fn,								\

	.config_text	= config_fn,								\

	.get_ctx_size	= ctx_size_fn,                                				\

	};  											\

	__attribute__((constructor)) static void init_fn ## _init(void)  			\

	__attribute__((constructor)) static void _name ## _init(void)  				\

	{                                                           				\

	    spdk_bdev_module_list_add(&init_fn ## _if);                  			\

	    spdk_bdev_module_list_add(&_name ## _if);                  				\

	}



#define SPDK_VBDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn, bdev_registered_fn)\

	static struct spdk_bdev_module_if init_fn ## _if = {					\

#define SPDK_VBDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn, registered_fn)\

	static struct spdk_bdev_module_if _name ## _if = {					\

	.name		= #_name,								\

	.module_init 	= init_fn,								\

	.module_fini	= fini_fn,								\

	.config_text	= config_fn,								\

	.get_ctx_size	= ctx_size_fn,                                				\

	.bdev_registered	= bdev_registered_fn,						\

	.bdev_registered	= registered_fn,						\

	};  											\

	__attribute__((constructor)) static void init_fn ## _init(void)  			\

	__attribute__((constructor)) static void _name ## _init(void) 				\

	{                                                           				\

	    spdk_vbdev_module_list_add(&init_fn ## _if);                  			\

	    spdk_vbdev_module_list_add(&_name ## _if);                  			\

	}



#endif /* SPDK_INTERNAL_BDEV_H */

lib/bdev/aio/blockdev_aio.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ blockdev_aio_get_ctx_size(void) 
	return sizeof(struct blockdev_aio_task);

}



SPDK_BDEV_MODULE_REGISTER(blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size)

SPDK_BDEV_MODULE_REGISTER(aio, blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size)



static int

blockdev_aio_open(struct file_disk *disk)

lib/bdev/bdev.c

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ spdk_bdev_module_init_next(int rc) 
{

	if (rc) {

		assert(g_next_bdev_module != NULL);

		SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->module_name);

		SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->name);

		spdk_bdev_init_complete(rc);

		return;

	}
@@ -396,7 +396,7 @@ spdk_vbdev_module_init_next(int rc) 
{

	if (rc) {

		assert(g_next_vbdev_module != NULL);

		SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->module_name);

		SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->name);

		spdk_bdev_init_complete(rc);

		return;

	}

lib/bdev/error/vbdev_error.c

+1 −1
Original line number Diff line number Diff line
@@ -330,4 +330,4 @@ vbdev_error_fini(void) 
	}

}



SPDK_VBDEV_MODULE_REGISTER(vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL)
 
SPDK_VBDEV_MODULE_REGISTER(error, vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL)

lib/bdev/gpt/vbdev_gpt.c

+1 −1
Original line number Diff line number Diff line
@@ -545,6 +545,6 @@ vbdev_gpt_get_ctx_size(void) 
	return sizeof(struct spdk_io_channel *);

}



SPDK_VBDEV_MODULE_REGISTER(vbdev_gpt_init, vbdev_gpt_fini, NULL,

SPDK_VBDEV_MODULE_REGISTER(gpt, vbdev_gpt_init, vbdev_gpt_fini, NULL,

			   vbdev_gpt_get_ctx_size, vbdev_gpt_register)

SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_gpt", SPDK_TRACE_VBDEV_GPT)