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

nvme: move queueing requests to the generic layer

Browse Source 
The tailq and the requests all belong to the generic layer, might as
well put the queueing code there for better encapsulation.

Change-Id: Id5f08f798121b50a21044cfc61856999c50ca227
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469758
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2019-09-27 13:52:21 -07:00 committed by Jim Harris
parent fd892b333d
commit 7630daa204
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvme/nvme_pcie.c
View File

@ -1984,12 +1984,8 @@ nvme_pcie_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_reques
tr = TAILQ_FIRST(&pqpair->free_tr); tr = TAILQ_FIRST(&pqpair->free_tr);
if (tr == NULL) { if (tr == NULL) {
/* /* Inform the upper layer to try again later. */
* Put the request on the qpair's request queue to be rc = -EAGAIN;
* processed when a tracker frees up via a command
* completion.
*/
STAILQ_INSERT_TAIL(&qpair->queued_req, req, stailq);
goto exit; goto exit;
} }

5
lib/nvme/nvme_qpair.c
View File

@ -633,6 +633,11 @@ nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *re
return 0; return 0;
} }
if (rc == -EAGAIN) {
STAILQ_INSERT_TAIL(&qpair->queued_req, req, stailq);
return 0;
}
error: error:
if (req->parent != NULL) { if (req->parent != NULL) {
nvme_request_remove_child(req->parent, req); nvme_request_remove_child(req->parent, req);

8
lib/nvme/nvme_rdma.c
View File

@ -1765,12 +1765,8 @@ nvme_rdma_qpair_submit_request(struct spdk_nvme_qpair *qpair,
rdma_req = nvme_rdma_req_get(rqpair); rdma_req = nvme_rdma_req_get(rqpair);
if (!rdma_req) { if (!rdma_req) {
/* /* Inform the upper layer to try again later. */
* No rdma_req is available, so queue the request to be return -EAGAIN;
* processed later.
*/
STAILQ_INSERT_TAIL(&qpair->queued_req, req, stailq);
return 0;
} }
if (nvme_rdma_req_init(rqpair, req, rdma_req)) { if (nvme_rdma_req_init(rqpair, req, rdma_req)) {

8
lib/nvme/nvme_tcp.c
View File

@ -694,12 +694,8 @@ nvme_tcp_qpair_submit_request(struct spdk_nvme_qpair *qpair,
tcp_req = nvme_tcp_req_get(tqpair); tcp_req = nvme_tcp_req_get(tqpair);
if (!tcp_req) { if (!tcp_req) {
/* /* Inform the upper layer to try again later. */
* No tcp_req is available, so queue the request to be return -EAGAIN;
* processed later.
*/
STAILQ_INSERT_TAIL(&qpair->queued_req, req, stailq);
return 0;
} }
if (nvme_tcp_req_init(tqpair, req, tcp_req)) { if (nvme_tcp_req_init(tqpair, req, tcp_req)) {