Commit b9dc11f9 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

nvmf/fc: Rename transport_poll_group instance in nvmf_fc_poll_group to group 



Both RDMA and TCP transport have uesd group for such case. Hence
FC transport changes to use group instead of tp_poll_group.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ic4b401179da506bb204c3ec48650db87f91fe72a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466843


Reviewed-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 01df17d0

lib/nvmf/fc.c

+7 −7
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp) 
		return;

	}



	hwqp->thread = fgroup->tp_poll_group.group->thread;

	hwqp->thread = fgroup->group.group->thread;

	hwqp->fgroup = fgroup;

	fgroup->hwqp_count++;

	spdk_nvmf_fc_poller_api_func(hwqp, SPDK_NVMF_FC_POLLER_API_ADD_HWQP, NULL);
@@ -1300,7 +1300,7 @@ nvmf_fc_request_alloc_buffers(struct spdk_nvmf_fc_request *fc_req) 
	uint32_t length = fc_req->req.length;

	uint32_t num_buffers;

	struct spdk_nvmf_fc_poll_group *fgroup = fc_req->hwqp->fgroup;

	struct spdk_nvmf_transport_poll_group *group = &fgroup->tp_poll_group;

	struct spdk_nvmf_transport_poll_group *group = &fgroup->group;

	struct spdk_nvmf_transport *transport = &fgroup->fc_transport->transport;



	num_buffers = SPDK_CEIL_DIV(length, transport->opts.io_unit_size);
@@ -1469,7 +1469,7 @@ spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req) 
{

	struct spdk_nvmf_fc_hwqp *hwqp = fc_req->hwqp;

	struct spdk_nvmf_fc_poll_group *fgroup = hwqp->fgroup;

	struct spdk_nvmf_transport_poll_group *group = &fgroup->tp_poll_group;

	struct spdk_nvmf_transport_poll_group *group = &fgroup->group;

	struct spdk_nvmf_transport *transport = &fgroup->fc_transport->transport;



	if (!fc_req) {
@@ -2009,7 +2009,7 @@ nvmf_fc_poll_group_create(struct spdk_nvmf_transport *transport) 
	g_nvmf_fgroup_count++;

	pthread_mutex_unlock(&fc_transport->lock);



	return &fgroup->tp_poll_group;

	return &fgroup->group;

}



static void
@@ -2017,7 +2017,7 @@ nvmf_fc_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group) 
{

	struct spdk_nvmf_fc_poll_group *fgroup;



	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);

	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);

	pthread_mutex_lock(&fgroup->fc_transport->lock);

	TAILQ_REMOVE(&g_nvmf_fgroups, fgroup, link);

	g_nvmf_fgroup_count--;
@@ -2036,7 +2036,7 @@ nvmf_fc_poll_group_add(struct spdk_nvmf_transport_poll_group *group, 
	struct spdk_nvmf_fc_ls_add_conn_api_data *api_data = NULL;

	bool hwqp_found = false;



	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);

	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);

	fc_conn  = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_fc_conn, qpair);



	TAILQ_FOREACH(hwqp, &fgroup->hwqp_list, link) {
@@ -2079,7 +2079,7 @@ nvmf_fc_poll_group_poll(struct spdk_nvmf_transport_poll_group *group) 
	struct spdk_nvmf_fc_poll_group *fgroup;

	struct spdk_nvmf_fc_hwqp *hwqp;



	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, tp_poll_group);

	fgroup = SPDK_CONTAINEROF(group, struct spdk_nvmf_fc_poll_group, group);



	TAILQ_FOREACH(hwqp, &fgroup->hwqp_list, link) {

		if (hwqp->state == SPDK_FC_HWQP_ONLINE) {

lib/nvmf/nvmf_fc.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ struct spdk_nvmf_fc_xchg { 
 *  FC poll group structure

 */

struct spdk_nvmf_fc_poll_group {

	struct spdk_nvmf_transport_poll_group tp_poll_group;

	struct spdk_nvmf_transport_poll_group group;

	struct spdk_nvmf_tgt *nvmf_tgt;

	struct spdk_nvmf_fc_transport *fc_transport;

	uint32_t hwqp_count; /* number of hwqp's assigned to this pg */

test/unit/lib/nvmf/fc_ls.c/fc_ls_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -707,8 +707,8 @@ ls_tests_init(void) 
		bzero(&g_fgroup[i], sizeof(struct spdk_nvmf_fc_poll_group));

		TAILQ_INIT(&g_poll_group[i].tgroups);

		TAILQ_INIT(&g_poll_group[i].qpairs);

		g_fgroup[i].tp_poll_group.transport = &g_nvmf_transport;

		g_fgroup[i].tp_poll_group.group = &g_poll_group[i];

		g_fgroup[i].group.transport = &g_nvmf_transport;

		g_fgroup[i].group.group = &g_poll_group[i];

		hwqp->fgroup = &g_fgroup[i];

	}