niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

nvmet: implement valid sqhd values in completions

Browse source 
To support sqhd, for initiators that are following the spec and
paying attention to sqhd vs their sqtail values:

- add sqhd to struct nvmet_sq
- initialize sqhd to 0 in nvmet_sq_setup
- rather than propagate the 0's-based qsize value from the connect message
  which requires a +1 in every sqhd update, and as nothing else references
  it, convert to 1's-based value in nvmt_sq/cq_setup() calls.
- validate connect message sqsize being non-zero per spec.
- updated assign sqhd for every completion that goes back.

Also remove handling the NULL sq case in __nvmet_req_complete, as it can't
happen with the current code.

Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
James Smart 2017-09-18 09:08:29 -07:00 • committed by Jens Axboe
parent 8edd11c9ad
commit bb1cc74790
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/nvme/target/core.c
View file

@ -390,10 +390,9 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status)
if (status) if (status)
nvmet_set_status(req, status); nvmet_set_status(req, status);
/* XXX: need to fill in something useful for sq_head */ req->sq->sqhd = (req->sq->sqhd + 1) % req->sq->size;
req->rsp->sq_head = 0; req->rsp->sq_head = cpu_to_le16(req->sq->sqhd);
if (likely(req->sq)) /* may happen during early failure */ req->rsp->sq_id = cpu_to_le16(req->sq->qid);
req->rsp->sq_id = cpu_to_le16(req->sq->qid);
req->rsp->command_id = req->cmd->common.command_id; req->rsp->command_id = req->cmd->common.command_id;
if (req->ns) if (req->ns)
@ -420,6 +419,7 @@ void nvmet_cq_setup(struct nvmet_ctrl *ctrl, struct nvmet_cq *cq,
void nvmet_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq, void nvmet_sq_setup(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq,
u16 qid, u16 size) u16 qid, u16 size)
{ {
sq->sqhd = 0;
sq->qid = qid; sq->qid = qid;
sq->size = size; sq->size = size;

9
drivers/nvme/target/fabrics-cmd.c
View file

@ -109,9 +109,14 @@ static u16 nvmet_install_queue(struct nvmet_ctrl *ctrl, struct nvmet_req *req)
pr_warn("queue already connected!\n"); pr_warn("queue already connected!\n");
return NVME_SC_CONNECT_CTRL_BUSY | NVME_SC_DNR; return NVME_SC_CONNECT_CTRL_BUSY | NVME_SC_DNR;
} }
if (!sqsize) {
pr_warn("queue size zero!\n");
return NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;
}
nvmet_cq_setup(ctrl, req->cq, qid, sqsize); /* note: convert queue size from 0's-based value to 1's-based value */
nvmet_sq_setup(ctrl, req->sq, qid, sqsize); nvmet_cq_setup(ctrl, req->cq, qid, sqsize + 1);
nvmet_sq_setup(ctrl, req->sq, qid, sqsize + 1);
return 0; return 0;
} }

1
drivers/nvme/target/nvmet.h
View file

@ -74,6 +74,7 @@ struct nvmet_sq {
struct percpu_ref ref; struct percpu_ref ref;
u16 qid; u16 qid;
u16 size; u16 size;
u16 sqhd;
struct completion free_done; struct completion free_done;
struct completion confirm_done; struct completion confirm_done;
}; };