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

nvme_disk: Add locking around request queue access.

Browse Source 
Should help with #15123 further.
This commit is contained in:
Augustin Cavalier 2020-03-28 16:24:43 -04:00
parent ce363eca71
commit a73bad3ed2
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_internal.h
View File

@ -708,6 +708,7 @@ nvme_request_allocate_contig(struct nvme_qpair *qpair,
nvme_cmd_cb cb_fn, void *cb_arg);
extern void nvme_request_free(struct nvme_request *req);
extern void nvme_request_free_locked(struct nvme_request *req);
extern void nvme_request_add_child(struct nvme_request *parent,
struct nvme_request *child);

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

@ -401,7 +401,7 @@ static void nvme_qpair_complete_tracker(struct nvme_qpair *qpair,
if (req->cb_fn)
req->cb_fn(req->cb_arg, cpl);
nvme_request_free(req);
nvme_request_free_locked(req);
done:
tr->req = NULL;
@ -418,6 +418,8 @@ done:
!qpair->ctrlr->resetting) {
req = STAILQ_FIRST(&qpair->queued_req);
STAILQ_REMOVE_HEAD(&qpair->queued_req, stailq);
pthread_mutex_unlock(&qpair->lock);
nvme_qpair_submit_request(qpair, req);
}
}
@ -464,7 +466,7 @@ static void nvme_qpair_manual_complete_request(struct nvme_qpair *qpair,
if (req->cb_fn)
req->cb_fn(req->cb_arg, &cpl);
nvme_request_free(req);
nvme_request_free_locked(req);
}
static void nvme_qpair_abort_aers(struct nvme_qpair *qpair)

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

@ -40,12 +40,16 @@ static struct nvme_request *nvme_alloc_request(struct nvme_qpair *qpair)
{
struct nvme_request *req;
pthread_mutex_lock(&qpair->lock);
req = STAILQ_FIRST(&qpair->free_req);
if (req) {
STAILQ_REMOVE_HEAD(&qpair->free_req, stailq);
memset(&req->cmd, 0, sizeof(struct nvme_cmd));
}
pthread_mutex_unlock(&qpair->lock);
return req;
}
@ -169,13 +173,20 @@ struct nvme_request *nvme_request_allocate_null(struct nvme_qpair *qpair,
return nvme_request_allocate_contig(qpair, NULL, 0, cb_fn, cb_arg);
}
void nvme_request_free(struct nvme_request *req)
void nvme_request_free_locked(struct nvme_request *req)
{
struct nvme_qpair *qpair = req->qpair;
nvme_assert(req->child_reqs == 0, "Number of child request not 0\n");
STAILQ_INSERT_HEAD(&qpair->free_req, req, stailq);
STAILQ_INSERT_HEAD(&req->qpair->free_req, req, stailq);
}
void nvme_request_free(struct nvme_request *req)
{
pthread_mutex_lock(&req->qpair->lock);
nvme_request_free_locked(req);
pthread_mutex_unlock(&req->qpair->lock);
}
void nvme_request_add_child(struct nvme_request *parent,