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

nvmf: pass nvmf_request to nvmf_post_rdma_read()

Browse Source 
Make nvmf_post_rdma_read() interface generic (don't require a tx_desc).

Change-Id: I331a93eed4bb1912a47a88bb904cf392fcc364c6
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-24 16:35:05 -07:00
parent a435e9eeee
commit e067f3302d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nvmf/rdma.c
View File

@ -286,11 +286,12 @@ nvmf_ibv_send_wr_init(struct ibv_send_wr *wr,
int int
nvmf_post_rdma_read(struct spdk_nvmf_conn *conn, nvmf_post_rdma_read(struct spdk_nvmf_conn *conn,
struct nvme_qp_tx_desc *tx_desc) struct nvmf_request *req)
{ {
struct ibv_send_wr wr, *bad_wr = NULL; struct ibv_send_wr wr, *bad_wr = NULL;
struct nvme_qp_rx_desc *rx_desc = tx_desc->req_state.rx_desc; struct nvme_qp_tx_desc *tx_desc = req->tx_desc;
struct nvmf_request *req = &tx_desc->req_state; struct nvme_qp_rx_desc *rx_desc = req->rx_desc;
int rc; int rc;
if (rx_desc == NULL) { if (rx_desc == NULL) {
@ -1090,7 +1091,7 @@ nvmf_process_pending_rdma(struct spdk_nvmf_conn *conn)
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Issue rdma read from pending queue: tx_desc %p\n", SPDK_TRACELOG(SPDK_TRACE_RDMA, "Issue rdma read from pending queue: tx_desc %p\n",
tx_desc); tx_desc);
rc = nvmf_post_rdma_read(conn, tx_desc); rc = nvmf_post_rdma_read(conn, &tx_desc->req_state);
if (rc) { if (rc) {
SPDK_ERRLOG("Unable to post pending rdma read descriptor\n"); SPDK_ERRLOG("Unable to post pending rdma read descriptor\n");
return -1; return -1;

2
lib/nvmf/rdma.h
View File

@ -80,7 +80,7 @@ struct nvme_qp_tx_desc {
}; };
int nvmf_post_rdma_read(struct spdk_nvmf_conn *conn, int nvmf_post_rdma_read(struct spdk_nvmf_conn *conn,
struct nvme_qp_tx_desc *tx_desc); struct nvmf_request *req);
int nvmf_post_rdma_write(struct spdk_nvmf_conn *conn, int nvmf_post_rdma_write(struct spdk_nvmf_conn *conn,
struct nvme_qp_tx_desc *tx_desc); struct nvme_qp_tx_desc *tx_desc);
int nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn, int nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn,

2
lib/nvmf/request.c
View File

@ -738,7 +738,7 @@ spdk_nvmf_request_prep_data(struct nvmf_request *req,
if (xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) { if (xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER) {
if (sgl->generic.type == SPDK_NVME_SGL_TYPE_KEYED_DATA_BLOCK) { if (sgl->generic.type == SPDK_NVME_SGL_TYPE_KEYED_DATA_BLOCK) {
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Issuing RDMA Read to get host data\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "Issuing RDMA Read to get host data\n");
ret = nvmf_post_rdma_read(conn, tx_desc); ret = nvmf_post_rdma_read(conn, req);
if (ret) { if (ret) {
SPDK_ERRLOG("Unable to post rdma read tx descriptor\n"); SPDK_ERRLOG("Unable to post rdma read tx descriptor\n");
return -1; return -1;