Commit 4bcafd5b authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

sock: Delay asking a socket about it's placement_id until after it is 


added to a group

The process of adding a socket to a group may, in some scenarios, change
the placement id.

Change-Id: I879d9641099d86978ede5d5e2be1a72eda65a79b
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7207


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 141a95aa

lib/sock/sock.c

+17 −14
Original line number Diff line number Diff line
@@ -554,14 +554,6 @@ spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, 
		return -1;

	}



	placement_id = sock_get_placement_id(sock);

	if (placement_id != -1) {

		rc = sock_map_insert(placement_id, group, 0);

		if (rc < 0) {

			return -1;

		}

	}



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

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

			break;
@@ -574,14 +566,25 @@ spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock, 
	}



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

	if (rc == 0) {

	if (rc != 0) {

		return rc;

	}



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

	sock->group_impl = group_impl;

	sock->cb_fn = cb_fn;

	sock->cb_arg = cb_arg;



	placement_id = sock_get_placement_id(sock);

	if (placement_id != -1) {

		rc = sock_map_insert(placement_id, group, 0);

		if (rc != 0) {

			SPDK_ERRLOG("Failed to insert sock group into map: %d", rc);

			/* Do not treat this as an error. The system will continue running. */

		}

	}



	return rc;

	return 0;

}



int