Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvme_disk: Use a recursive lock instead of a mutex.

Browse Source 
It appears on some controllers we can wind up in cases that are
a double-lock, otherwise.

Should fix #18093.
This commit is contained in:
Augustin Cavalier 2022-11-29 17:51:31 -05:00
parent b85db63d2b
commit f2dd9acf72
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2019, Haiku, Inc. All rights reserved.
* Copyright 2019-2022, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -11,13 +11,13 @@
#include <lock.h>
#define pthread_mutex_t mutex
#undef PTHREAD_MUTEX_INITIALIZER
#define PTHREAD_MUTEX_INITIALIZER MUTEX_INITIALIZER(__FUNCTION__)
#define pthread_mutex_init(mtx, attr) mutex_init(mtx, __FUNCTION__)
#define pthread_mutex_destroy mutex_destroy
#define pthread_mutex_lock mutex_lock
#define pthread_mutex_unlock mutex_unlock
#define pthread_mutex_t recursive_lock
#undef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER RECURSIVE_LOCK_INITIALIZER(__FUNCTION__)
#define pthread_mutex_init(mtx, attr) recursive_lock_init(mtx, __FUNCTION__)
#define pthread_mutex_destroy recursive_lock_destroy
#define pthread_mutex_lock recursive_lock_lock
#define pthread_mutex_unlock recursive_lock_unlock
#endif /* __NVME_PLATFORM_H__ */

2
src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.c
View File

@ -37,7 +37,7 @@
* List of open controllers and its lock.
*/
LIST_HEAD(, nvme_ctrlr) ctrlr_head = LIST_HEAD_INITIALIZER(ctrlr_head);
static pthread_mutex_t ctrlr_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t ctrlr_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
/*
* Search for an open controller.