Commit 4e4b48a9 authored by Jim Harris's avatar Jim Harris
Browse files

net: add group support for multiple spdk_net_impls. 



Supporting sock_groups with multiple spdk_net_impls
is a bit tricky.  We cannot just allocate space off
the end of spdk_sock_group for the implementation-specific
details - we need separate allocations for each
spdk_net_impl so that one spdk_sock_group can handle
spdk_socks from multiple spdk_net_impls.

Unit tests will come in upcoming patch.

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

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 450ee009

lib/net/sock.c

+99 −35
Original line number Diff line number Diff line
@@ -64,13 +64,13 @@ struct spdk_posix_sock { 
};



struct spdk_sock_group {

	struct spdk_net_impl		*net_impl;

	struct spdk_sock_group_impl	*group_impl;

	TAILQ_HEAD(, spdk_sock)		socks;

	STAILQ_HEAD(, spdk_sock_group_impl)	group_impls;

};



struct spdk_sock_group_impl {

	TAILQ_ENTRY(spdk_sock_group_impl)	link;

	struct spdk_net_impl			*net_impl;

	TAILQ_HEAD(, spdk_sock)			socks;

	STAILQ_ENTRY(spdk_sock_group_impl)	link;

};



struct spdk_posix_sock_group_impl {
@@ -718,6 +718,7 @@ spdk_sock_is_ipv4(struct spdk_sock *sock) 
struct spdk_sock_group *

spdk_sock_group_create(void)

{

	struct spdk_net_impl *impl = NULL;

	struct spdk_sock_group *group;

	struct spdk_sock_group_impl *group_impl;
@@ -726,11 +727,14 @@ spdk_sock_group_create(void) 
		return NULL;

	}



	group_impl = STAILQ_FIRST(&g_net_impls)->group_impl_create();

	if (group_impl != NULL) {

		TAILQ_INIT(&group->socks);

		group->net_impl = STAILQ_FIRST(&g_net_impls);

		group->group_impl = group_impl;

	STAILQ_INIT(&group->group_impls);



	STAILQ_FOREACH_FROM(impl, &g_net_impls, link) {

		group_impl = impl->group_impl_create();

		assert(group_impl != NULL);

		STAILQ_INSERT_TAIL(&group->group_impls, group_impl, link);

		TAILQ_INIT(&group_impl->socks);

		group_impl->net_impl = impl;

	}



	return group;
@@ -740,6 +744,7 @@ int 
spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock,

			 spdk_sock_cb cb_fn, void *cb_arg)

{

	struct spdk_sock_group_impl *group_impl = NULL;

	int rc;



	if (cb_fn == NULL) {
@@ -756,9 +761,20 @@ spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, 
		return -1;

	}



	rc = group->net_impl->group_impl_add_sock(group->group_impl, sock);

	STAILQ_FOREACH_FROM(group_impl, &group->group_impls, link) {

		if (sock->net_impl == group_impl->net_impl) {

			break;

		}

	}



	if (group_impl == NULL) {

		errno = EINVAL;

		return -1;

	}



	rc = group_impl->net_impl->group_impl_add_sock(group_impl, sock);

	if (rc == 0) {

		TAILQ_INSERT_TAIL(&group->socks, sock, link);

		TAILQ_INSERT_TAIL(&group_impl->socks, sock, link);

		sock->cb_fn = cb_fn;

		sock->cb_arg = cb_arg;

	}
@@ -769,11 +785,23 @@ spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, 
int

spdk_sock_group_remove_sock(struct spdk_sock_group *group, struct spdk_sock *sock)

{

	struct spdk_sock_group_impl *group_impl = NULL;

	int rc;



	rc = group->net_impl->group_impl_remove_sock(group->group_impl, sock);

	STAILQ_FOREACH_FROM(group_impl, &group->group_impls, link) {

		if (sock->net_impl == group_impl->net_impl) {

			break;

		}

	}



	if (group_impl == NULL) {

		errno = EINVAL;

		return -1;

	}



	rc = group_impl->net_impl->group_impl_remove_sock(group_impl, sock);

	if (rc == 0) {

		TAILQ_REMOVE(&group->socks, sock, link);

		TAILQ_REMOVE(&group_impl->socks, sock, link);

		sock->cb_fn = NULL;

		sock->cb_arg = NULL;

	}
@@ -787,12 +815,38 @@ spdk_sock_group_poll(struct spdk_sock_group *group) 
	return spdk_sock_group_poll_count(group, MAX_EVENTS_PER_POLL);

}



int

spdk_sock_group_poll_count(struct spdk_sock_group *group, int max_events)

static int

spdk_sock_group_impl_poll_count(struct spdk_sock_group_impl *group_impl,

				struct spdk_sock_group *group,

				int max_events)

{

	struct spdk_sock *socks[MAX_EVENTS_PER_POLL];

	int num_events, i;



	if (TAILQ_EMPTY(&group_impl->socks)) {

		return 0;

	}



	num_events = group_impl->net_impl->group_impl_poll(group_impl, max_events, socks);

	if (num_events == -1) {

		return -1;

	}



	for (i = 0; i < num_events; i++) {

		struct spdk_sock *sock = socks[i];



		assert(sock->cb_fn != NULL);

		sock->cb_fn(sock->cb_arg, group, sock);

	}

	return 0;

}



int

spdk_sock_group_poll_count(struct spdk_sock_group *group, int max_events)

{

	struct spdk_sock_group_impl *group_impl = NULL;

	int rc, final_rc = 0;



	if (max_events < 1) {

		errno = -EINVAL;

		return -1;
@@ -806,23 +860,22 @@ spdk_sock_group_poll_count(struct spdk_sock_group *group, int max_events) 
		max_events = MAX_EVENTS_PER_POLL;

	}



	num_events = group->net_impl->group_impl_poll(group->group_impl, max_events, socks);

	if (num_events == -1) {

		return -1;

	STAILQ_FOREACH_FROM(group_impl, &group->group_impls, link) {

		rc = spdk_sock_group_impl_poll_count(group_impl, group, max_events);

		if (rc != 0) {

			final_rc = rc;

			SPDK_ERRLOG("group_impl_poll_count for net(%s) failed\n",

				    group_impl->net_impl->name);

		}



	for (i = 0; i < num_events; i++) {

		struct spdk_sock *sock = socks[i];



		assert(sock->cb_fn != NULL);

		sock->cb_fn(sock->cb_arg, group, sock);

	}

	return 0;



	return final_rc;

}



int

spdk_sock_group_close(struct spdk_sock_group **group)

{

	struct spdk_sock_group_impl *group_impl = NULL, *tmp;

	int rc;



	if (*group == NULL) {
@@ -830,23 +883,34 @@ spdk_sock_group_close(struct spdk_sock_group **group) 
		return -1;

	}



	if (!TAILQ_EMPTY(&(*group)->socks)) {

	STAILQ_FOREACH_SAFE(group_impl, &(*group)->group_impls, link, tmp) {

		if (!TAILQ_EMPTY(&group_impl->socks)) {

			errno = EBUSY;

			return -1;

		}

	}



	STAILQ_FOREACH_SAFE(group_impl, &(*group)->group_impls, link, tmp) {

		rc = group_impl->net_impl->group_impl_close(group_impl);

		if (rc != 0) {

			SPDK_ERRLOG("group_impl_close for net(%s) failed\n",

				    group_impl->net_impl->name);

		}

		free(group_impl);

	}



	rc = (*group)->net_impl->group_impl_close((*group)->group_impl);

	if (rc == 0) {

		free((*group)->group_impl);

	free(*group);

	*group = NULL;

	}



	return rc;

	return 0;

}



void

spdk_net_impl_register(struct spdk_net_impl *impl)

{

	if (!strcmp("posix", impl->name)) {

		STAILQ_INSERT_TAIL(&g_net_impls, impl, link);

	} else {

		STAILQ_INSERT_HEAD(&g_net_impls, impl, link);

	}

}