Commit 8cb172f2 authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

nvmf/transport->add per-pg cache 



This is implemented at a generic level.

Change-Id: Ibf8167e828f8da27cc26cd04e611c3f3c084319a
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/440418


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent cefabb56

lib/nvmf/nvmf_internal.h

+9 −2
Original line number Diff line number Diff line
@@ -101,8 +101,15 @@ struct spdk_nvmf_listener { 
	TAILQ_ENTRY(spdk_nvmf_listener)	link;

};



struct spdk_nvmf_transport_pg_cache_buf {

	STAILQ_ENTRY(spdk_nvmf_transport_pg_cache_buf) link;

};



struct spdk_nvmf_transport_poll_group {

	struct spdk_nvmf_transport					*transport;

	STAILQ_HEAD(, spdk_nvmf_transport_pg_cache_buf)			buf_cache;

	uint32_t							buf_cache_count;

	uint32_t							buf_cache_size;

	TAILQ_ENTRY(spdk_nvmf_transport_poll_group)			link;

};

lib/nvmf/transport.c

+22 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ struct spdk_nvmf_transport_poll_group * 
spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport)

{

	struct spdk_nvmf_transport_poll_group *group;

	struct spdk_nvmf_transport_pg_cache_buf *buf;



	group = transport->ops->poll_group_create(transport);

	if (!group) {
@@ -203,12 +204,33 @@ spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport) 
	}

	group->transport = transport;



	STAILQ_INIT(&group->buf_cache);



	if (transport->opts.buf_cache_size) {

		group->buf_cache_count = 0;

		group->buf_cache_size = transport->opts.buf_cache_size;

		while (group->buf_cache_count < group->buf_cache_size) {

			buf = (struct spdk_nvmf_transport_pg_cache_buf *)spdk_mempool_get(transport->data_buf_pool);

			if (!buf) {

				SPDK_NOTICELOG("Unable to reserve the full number of buffers for the pg buffer cache.\n");

				break;

			}

			STAILQ_INSERT_HEAD(&group->buf_cache, buf, link);

			group->buf_cache_count++;

		}

	}

	return group;

}



void

spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group)

{

	struct spdk_nvmf_transport_pg_cache_buf *buf, *tmp;



	STAILQ_FOREACH_SAFE(buf, &group->buf_cache, link, tmp) {

		STAILQ_REMOVE(&group->buf_cache, buf, spdk_nvmf_transport_pg_cache_buf, link);

		spdk_mempool_put(group->transport->data_buf_pool, buf);

	}

	group->transport->ops->poll_group_destroy(group);

}