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

nvmf: Remove rx_desc pointer from tx_desc

Browse Source 
The nvmf_request structure holds the pair of pointers
for rx_desc and tx_desc.

Change-Id: I3e735979bbdcdc0e70ad78762e289849d41158ba
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-23 15:23:39 -07:00
parent 6b10df3576
commit c917957bff
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/nvmf/conn.c
View File

@ -380,15 +380,15 @@ spdk_nvmf_send_response(struct spdk_nvmf_conn *conn, struct nvmf_request *req)
"cpl: cdw0=0x%x rsvd1=0x%x sqhd=0x%x sqid=0x%x cid=0x%x status=0x%x\n", "cpl: cdw0=0x%x rsvd1=0x%x sqhd=0x%x sqid=0x%x cid=0x%x status=0x%x\n",
rsp->cdw0, rsp->rsvd1, rsp->sqhd, rsp->sqid, rsp->cid, *(uint16_t *)&rsp->status); rsp->cdw0, rsp->rsvd1, rsp->sqhd, rsp->sqid, rsp->cid, *(uint16_t *)&rsp->status);
return nvmf_post_rdma_send(conn, req->fabric_tx_ctx); return nvmf_post_rdma_send(conn, req->tx_desc);
} }
void void
spdk_nvmf_request_complete(struct nvmf_request *req) spdk_nvmf_request_complete(struct nvmf_request *req)
{ {
struct nvme_qp_tx_desc *tx_desc = (struct nvme_qp_tx_desc *)req->fabric_tx_ctx; struct nvme_qp_tx_desc *tx_desc = req->tx_desc;
struct nvme_qp_rx_desc *rx_desc = req->rx_desc;
struct spdk_nvme_cpl *response; struct spdk_nvme_cpl *response;
struct nvme_qp_rx_desc *rx_desc = tx_desc->rx_desc;
int ret; int ret;
response = &req->rsp->nvme_cpl; response = &req->rsp->nvme_cpl;
@ -707,8 +707,8 @@ nvmf_process_fabrics_command(struct spdk_nvmf_conn *conn, struct nvmf_request *r
static int static int
spdk_nvmf_request_prep_data(struct nvmf_request *req) spdk_nvmf_request_prep_data(struct nvmf_request *req)
{ {
struct nvme_qp_tx_desc *tx_desc = req->fabric_tx_ctx; struct nvme_qp_tx_desc *tx_desc = req->tx_desc;
struct nvme_qp_rx_desc *rx_desc = tx_desc->rx_desc; struct nvme_qp_rx_desc *rx_desc = req->rx_desc;
struct spdk_nvmf_conn *conn = tx_desc->conn; struct spdk_nvmf_conn *conn = tx_desc->conn;
struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd; struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
enum spdk_nvme_data_transfer xfer; enum spdk_nvme_data_transfer xfer;
@ -894,12 +894,11 @@ static int nvmf_recv(struct spdk_nvmf_conn *conn, struct ibv_wc *wc)
} }
tx_desc = STAILQ_FIRST(&conn->qp_tx_desc); tx_desc = STAILQ_FIRST(&conn->qp_tx_desc);
nvmf_active_tx_desc(tx_desc); nvmf_active_tx_desc(tx_desc);
tx_desc->rx_desc = rx_desc;
req = &tx_desc->req_state; req = &tx_desc->req_state;
req->session = conn->sess; req->session = conn->sess;
req->fabric_tx_ctx = tx_desc; req->tx_desc = tx_desc;
req->fabric_rx_ctx = rx_desc; req->rx_desc = rx_desc;
req->length = 0; req->length = 0;
req->xfer = SPDK_NVME_DATA_NONE; req->xfer = SPDK_NVME_DATA_NONE;
req->data = NULL; req->data = NULL;
@ -929,7 +928,6 @@ static int nvmf_recv(struct spdk_nvmf_conn *conn, struct ibv_wc *wc)
* there is not a delayed posting because of * there is not a delayed posting because of
* command processing. * command processing.
*/ */
tx_desc->rx_desc = NULL;
nvmf_deactive_tx_desc(tx_desc); nvmf_deactive_tx_desc(tx_desc);
if (nvmf_post_rdma_recv(conn, rx_desc)) { if (nvmf_post_rdma_recv(conn, rx_desc)) {
SPDK_ERRLOG("Unable to re-post aq rx descriptor\n"); SPDK_ERRLOG("Unable to re-post aq rx descriptor\n");
@ -944,7 +942,6 @@ drop_recv:
recv_error: recv_error:
/* recover the tx_desc */ /* recover the tx_desc */
if (tx_desc != NULL) { if (tx_desc != NULL) {
tx_desc->rx_desc = NULL;
nvmf_deactive_tx_desc(tx_desc); nvmf_deactive_tx_desc(tx_desc);
} }
return -1; return -1;

4
lib/nvmf/nvmf_internal.h
View File

@ -103,8 +103,8 @@ SPDK_STATIC_ASSERT(sizeof(union nvmf_c2h_msg) == 16, "Incorrect size");
struct nvmf_request { struct nvmf_request {
struct nvmf_session *session; struct nvmf_session *session;
void *fabric_tx_ctx; struct nvme_qp_tx_desc *tx_desc;
void *fabric_rx_ctx; struct nvme_qp_rx_desc *rx_desc;
uint16_t cid; /* command identifier */ uint16_t cid; /* command identifier */
uint64_t remote_addr; uint64_t remote_addr;
uint32_t rkey; uint32_t rkey;

7
lib/nvmf/rdma.c
View File

@ -268,7 +268,7 @@ nvmf_post_rdma_read(struct spdk_nvmf_conn *conn,
struct nvme_qp_tx_desc *tx_desc) struct nvme_qp_tx_desc *tx_desc)
{ {
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->rx_desc; struct nvme_qp_rx_desc *rx_desc = tx_desc->req_state.rx_desc;
struct nvmf_request *req = &tx_desc->req_state; struct nvmf_request *req = &tx_desc->req_state;
int rc; int rc;
@ -306,7 +306,7 @@ nvmf_post_rdma_write(struct spdk_nvmf_conn *conn,
struct nvme_qp_tx_desc *tx_desc) struct nvme_qp_tx_desc *tx_desc)
{ {
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->rx_desc; struct nvme_qp_rx_desc *rx_desc = tx_desc->req_state.rx_desc;
struct nvmf_request *req = &tx_desc->req_state; struct nvmf_request *req = &tx_desc->req_state;
int rc; int rc;
@ -332,7 +332,7 @@ nvmf_post_rdma_send(struct spdk_nvmf_conn *conn,
{ {
struct ibv_send_wr wr, *bad_wr = NULL; struct ibv_send_wr wr, *bad_wr = NULL;
struct nvmf_request *req = &tx_desc->req_state; struct nvmf_request *req = &tx_desc->req_state;
struct nvme_qp_rx_desc *rx_desc = tx_desc->rx_desc; struct nvme_qp_rx_desc *rx_desc = req->rx_desc;
int rc; int rc;
RTE_VERIFY(rx_desc != NULL); RTE_VERIFY(rx_desc != NULL);
@ -345,7 +345,6 @@ nvmf_post_rdma_send(struct spdk_nvmf_conn *conn,
SPDK_ERRLOG("Unable to re-post rx descriptor\n"); SPDK_ERRLOG("Unable to re-post rx descriptor\n");
return -1; return -1;
} }
tx_desc->rx_desc = NULL;
nvmf_ibv_send_wr_init(&wr, NULL, &tx_desc->send_sgl, (uint64_t)tx_desc, nvmf_ibv_send_wr_init(&wr, NULL, &tx_desc->send_sgl, (uint64_t)tx_desc,
IBV_WR_SEND, IBV_SEND_SIGNALED); IBV_WR_SEND, IBV_SEND_SIGNALED);

1
lib/nvmf/rdma.h
View File

@ -60,7 +60,6 @@ struct nvme_qp_tx_desc {
struct nvmf_request req_state; struct nvmf_request req_state;
struct ibv_mr *msg_buf_mr; struct ibv_mr *msg_buf_mr;
struct ibv_sge send_sgl; struct ibv_sge send_sgl;
struct nvme_qp_rx_desc *rx_desc;
STAILQ_ENTRY(nvme_qp_tx_desc) link; STAILQ_ENTRY(nvme_qp_tx_desc) link;
}; };