ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sock: sock_map_insert now takes the map as the first parameter

Browse Source 
This is a step toward allowing for multiple maps. Each module may have a
different meaning for placement_id with different uniqueness rules. They
can't all be in the same map.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: I608680a08b947a5d5c0818ff66505ed64e1b891e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7214
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Ben Walker 2021-03-30 13:23:56 -07:00 committed by Jim Harris
parent d3f7d076a6
commit 5a11b6a64b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/sock/sock.c
View File

@ -66,28 +66,28 @@ static struct spdk_sock_map g_map = {
* If the group is already in the map, take a reference. * If the group is already in the map, take a reference.
*/ */
static int static int
sock_map_insert(int placement_id, struct spdk_sock_group *group) sock_map_insert(struct spdk_sock_map *map, int placement_id, struct spdk_sock_group *group)
{ {
struct spdk_sock_placement_id_entry *entry; struct spdk_sock_placement_id_entry *entry;
pthread_mutex_lock(&g_map.mtx); pthread_mutex_lock(&map->mtx);
STAILQ_FOREACH(entry, &g_map.entries, link) { STAILQ_FOREACH(entry, &map->entries, link) {
if (placement_id == entry->placement_id) { if (placement_id == entry->placement_id) {
/* Can't set group to NULL if it is already not-NULL */ /* Can't set group to NULL if it is already not-NULL */
if (group == NULL) { if (group == NULL) {
pthread_mutex_unlock(&g_map.mtx); pthread_mutex_unlock(&map->mtx);
return (entry->group == NULL) ? 0 : -EINVAL; return (entry->group == NULL) ? 0 : -EINVAL;
} }
if (entry->group == NULL) { if (entry->group == NULL) {
entry->group = group; entry->group = group;
} else if (entry->group != group) { } else if (entry->group != group) {
pthread_mutex_unlock(&g_map.mtx); pthread_mutex_unlock(&map->mtx);
return -EINVAL; return -EINVAL;
} }
entry->ref++; entry->ref++;
pthread_mutex_unlock(&g_map.mtx); pthread_mutex_unlock(&map->mtx);
return 0; return 0;
} }
} }
@ -95,7 +95,7 @@ sock_map_insert(int placement_id, struct spdk_sock_group *group)
entry = calloc(1, sizeof(*entry)); entry = calloc(1, sizeof(*entry));
if (!entry) { if (!entry) {
SPDK_ERRLOG("Cannot allocate an entry for placement_id=%u\n", placement_id); SPDK_ERRLOG("Cannot allocate an entry for placement_id=%u\n", placement_id);
pthread_mutex_unlock(&g_map.mtx); pthread_mutex_unlock(&map->mtx);
return -ENOMEM; return -ENOMEM;
} }
@ -105,8 +105,8 @@ sock_map_insert(int placement_id, struct spdk_sock_group *group)
entry->ref++; entry->ref++;
} }
STAILQ_INSERT_TAIL(&g_map.entries, entry, link); STAILQ_INSERT_TAIL(&map->entries, entry, link);
pthread_mutex_unlock(&g_map.mtx); pthread_mutex_unlock(&map->mtx);
return 0; return 0;
} }
@ -526,7 +526,7 @@ spdk_sock_group_create(void *ctx)
/* if any net_impl is configured to use SO_INCOMING_CPU, initialize the sock map */ /* if any net_impl is configured to use SO_INCOMING_CPU, initialize the sock map */
if (enable_incoming_cpu) { if (enable_incoming_cpu) {
sock_map_insert(spdk_env_get_current_core(), group); sock_map_insert(&g_map, spdk_env_get_current_core(), group);
} }
return group; return group;
@ -585,7 +585,7 @@ spdk_sock_group_add_sock(struct spdk_sock_group *group, struct spdk_sock *sock,
placement_id = sock_get_placement_id(sock); placement_id = sock_get_placement_id(sock);
if (placement_id != -1) { if (placement_id != -1) {
rc = sock_map_insert(placement_id, group); rc = sock_map_insert(&g_map, placement_id, group);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("Failed to insert sock group into map: %d", rc); SPDK_ERRLOG("Failed to insert sock group into map: %d", rc);
/* Do not treat this as an error. The system will continue running. */ /* Do not treat this as an error. The system will continue running. */