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

nvme: make the mutex with robust attribute for multi-process case

Browse Source 
Change-Id: I0dbdad447c6b3b30100a0165a1e1ca300c53c8ca
Signed-off-by: GangCao <gang.cao@intel.com>
This commit is contained in:
GangCao 2016-12-05 01:22:48 -05:00 committed by Daniel Verkamp
parent 17bcc76d30
commit 47341b89b7
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/nvme/nvme.c
View File

@ -206,7 +206,7 @@ nvme_free_request(struct nvme_request *req)
} }
int int
nvme_mutex_init_shared(pthread_mutex_t *mtx) nvme_robust_mutex_init_shared(pthread_mutex_t *mtx)
{ {
int rc = 0; int rc = 0;
@ -219,6 +219,7 @@ nvme_mutex_init_shared(pthread_mutex_t *mtx)
return -1; return -1;
} }
if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED) || if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED) ||
pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST) ||
pthread_mutex_init(mtx, &attr)) { pthread_mutex_init(mtx, &attr)) {
rc = -1; rc = -1;
} }
@ -281,7 +282,7 @@ nvme_driver_init(void)
*/ */
assert(spdk_process_is_primary()); assert(spdk_process_is_primary());
ret = nvme_mutex_init_shared(&g_spdk_nvme_driver->lock); ret = nvme_robust_mutex_init_shared(&g_spdk_nvme_driver->lock);
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);

5
lib/nvme/nvme_ctrlr.c
View File

@ -1240,7 +1240,7 @@ nvme_ctrlr_start(struct spdk_nvme_ctrlr *ctrlr)
} }
int int
nvme_mutex_init_recursive_shared(pthread_mutex_t *mtx) nvme_robust_mutex_init_recursive_shared(pthread_mutex_t *mtx)
{ {
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
int rc = 0; int rc = 0;
@ -1250,6 +1250,7 @@ nvme_mutex_init_recursive_shared(pthread_mutex_t *mtx)
} }
if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) || if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) ||
#ifndef __FreeBSD__ #ifndef __FreeBSD__
pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST) ||
pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED) || pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED) ||
#endif #endif
pthread_mutex_init(mtx, &attr)) { pthread_mutex_init(mtx, &attr)) {
@ -1276,7 +1277,7 @@ nvme_ctrlr_construct(struct spdk_nvme_ctrlr *ctrlr)
TAILQ_INIT(&ctrlr->active_io_qpairs); TAILQ_INIT(&ctrlr->active_io_qpairs);
rc = nvme_mutex_init_recursive_shared(&ctrlr->ctrlr_lock); rc = nvme_robust_mutex_init_recursive_shared(&ctrlr->ctrlr_lock);
if (rc != 0) { if (rc != 0) {
return rc; return rc;
} }

24
lib/nvme/nvme_internal.h
View File

@ -465,6 +465,26 @@ nvme_qpair_is_io_queue(struct spdk_nvme_qpair *qpair)
return qpair->id != 0; return qpair->id != 0;
} }
static inline int
nvme_robust_mutex_lock(pthread_mutex_t *mtx)
{
int rc = pthread_mutex_lock(mtx);
#ifndef __FreeBSD__
if (rc == EOWNERDEAD) {
rc = pthread_mutex_consistent(mtx);
}
#endif
return rc;
}
static inline int
nvme_robust_mutex_unlock(pthread_mutex_t *mtx)
{
return pthread_mutex_unlock(mtx);
}
/* Admin functions */ /* Admin functions */
int nvme_ctrlr_cmd_identify_controller(struct spdk_nvme_ctrlr *ctrlr, int nvme_ctrlr_cmd_identify_controller(struct spdk_nvme_ctrlr *ctrlr,
void *payload, void *payload,
@ -540,8 +560,8 @@ uint64_t nvme_get_quirks(const struct spdk_pci_id *id);
void spdk_nvme_ctrlr_opts_set_defaults(struct spdk_nvme_ctrlr_opts *opts); void spdk_nvme_ctrlr_opts_set_defaults(struct spdk_nvme_ctrlr_opts *opts);
int nvme_mutex_init_shared(pthread_mutex_t *mtx); int nvme_robust_mutex_init_shared(pthread_mutex_t *mtx);
int nvme_mutex_init_recursive_shared(pthread_mutex_t *mtx); int nvme_robust_mutex_init_recursive_shared(pthread_mutex_t *mtx);
bool nvme_completion_is_retry(const struct spdk_nvme_cpl *cpl); bool nvme_completion_is_retry(const struct spdk_nvme_cpl *cpl);
void nvme_qpair_print_command(struct spdk_nvme_qpair *qpair, struct spdk_nvme_cmd *cmd); void nvme_qpair_print_command(struct spdk_nvme_qpair *qpair, struct spdk_nvme_cmd *cmd);