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

nvme: add mutex to nvme_driver_init

Browse Source 
This will allow spdk_nvme_probe and variants to be
called from multiple threads in parallel.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I534db605c9e192b943afe973981b7b503d8b7e34

Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2680
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Jim Harris 2020-05-28 11:46:33 -07:00 committed by Tomasz Zawadzki
parent 80d7bc3060
commit 18f79f2449
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/nvme/nvme.c
View File

@ -351,10 +351,19 @@ nvme_robust_mutex_init_shared(pthread_mutex_t *mtx)
int int
nvme_driver_init(void) nvme_driver_init(void)
{ {
static pthread_mutex_t g_init_mutex = PTHREAD_MUTEX_INITIALIZER;
int ret = 0; int ret = 0;
/* Any socket ID */ /* Any socket ID */
int socket_id = -1; int socket_id = -1;
/* Use a special process-private mutex to ensure the global
* nvme driver object (g_spdk_nvme_driver) gets initialized by
* only one thread. Once that object is established and its
* mutex is initialized, we can unlock this mutex and use that
* one instead.
*/
pthread_mutex_lock(&g_init_mutex);
/* Each process needs its own pid. */ /* Each process needs its own pid. */
g_spdk_nvme_pid = getpid(); g_spdk_nvme_pid = getpid();
@ -367,6 +376,7 @@ nvme_driver_init(void)
if (spdk_process_is_primary()) { if (spdk_process_is_primary()) {
/* The unique named memzone already reserved. */ /* The unique named memzone already reserved. */
if (g_spdk_nvme_driver != NULL) { if (g_spdk_nvme_driver != NULL) {
pthread_mutex_unlock(&g_init_mutex);
return 0; return 0;
} else { } else {
g_spdk_nvme_driver = spdk_memzone_reserve(SPDK_NVME_DRIVER_NAME, g_spdk_nvme_driver = spdk_memzone_reserve(SPDK_NVME_DRIVER_NAME,
@ -376,7 +386,7 @@ nvme_driver_init(void)
if (g_spdk_nvme_driver == NULL) { if (g_spdk_nvme_driver == NULL) {
SPDK_ERRLOG("primary process failed to reserve memory\n"); SPDK_ERRLOG("primary process failed to reserve memory\n");
pthread_mutex_unlock(&g_init_mutex);
return -1; return -1;
} }
} else { } else {
@ -394,15 +404,16 @@ nvme_driver_init(void)
} }
if (g_spdk_nvme_driver->initialized == false) { if (g_spdk_nvme_driver->initialized == false) {
SPDK_ERRLOG("timeout waiting for primary process to init\n"); SPDK_ERRLOG("timeout waiting for primary process to init\n");
pthread_mutex_unlock(&g_init_mutex);
return -1; return -1;
} }
} else { } else {
SPDK_ERRLOG("primary process is not started yet\n"); SPDK_ERRLOG("primary process is not started yet\n");
pthread_mutex_unlock(&g_init_mutex);
return -1; return -1;
} }
pthread_mutex_unlock(&g_init_mutex);
return 0; return 0;
} }
@ -416,9 +427,14 @@ nvme_driver_init(void)
if (ret != 0) { if (ret != 0) {
SPDK_ERRLOG("failed to initialize mutex\n"); SPDK_ERRLOG("failed to initialize mutex\n");
spdk_memzone_free(SPDK_NVME_DRIVER_NAME); spdk_memzone_free(SPDK_NVME_DRIVER_NAME);
pthread_mutex_unlock(&g_init_mutex);
return ret; return ret;
} }
/* The lock in the shared g_spdk_nvme_driver object is now ready to
* be used - so we can unlock the g_init_mutex here.
*/
pthread_mutex_unlock(&g_init_mutex);
nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock); nvme_robust_mutex_lock(&g_spdk_nvme_driver->lock);
g_spdk_nvme_driver->initialized = false; g_spdk_nvme_driver->initialized = false;