Commit 4216f7ff authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvmf/vfio-user: fix shared CQ usage case 



Multiple IO Submission Queue can share one Completion Queue, and
we use field 'cqid' to save it in Submission Queue, so when posting
completion response, we need to get the Submission Queue's CQID first,
then post the completion queue based on CQID.

Also rename vfio-user internal variables with 'vu_' prefix in this
function.

Change-Id: Ib73b91a86740d105b5fb5c73127484ebfb6b55ef
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8969


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarThanos Makatos <thanos.makatos@nutanix.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 5c1f77f5

lib/nvmf/vfio_user.c

+17 −12
Original line number Diff line number Diff line
@@ -1265,20 +1265,25 @@ consume_admin_cmd(struct nvmf_vfio_user_ctrlr *ctrlr, struct spdk_nvme_cmd *cmd) 
}



static int

handle_cmd_rsp(struct nvmf_vfio_user_req *req, void *cb_arg)

handle_cmd_rsp(struct nvmf_vfio_user_req *vu_req, void *cb_arg)

{

	struct nvmf_vfio_user_qpair *qpair = cb_arg;



	assert(qpair != NULL);

	assert(req != NULL);



	vfu_unmap_sg(qpair->ctrlr->endpoint->vfu_ctx, req->sg, req->iov, req->iovcnt);

	struct nvmf_vfio_user_qpair *vu_qpair = cb_arg;

	struct nvmf_vfio_user_ctrlr *vu_ctrlr = vu_qpair->ctrlr;

	uint16_t sqid, cqid;



	return post_completion(qpair->ctrlr, &req->req.cmd->nvme_cmd,

			       &qpair->ctrlr->qp[req->req.qpair->qid]->cq,

			       req->req.rsp->nvme_cpl.cdw0,

			       req->req.rsp->nvme_cpl.status.sc,

			       req->req.rsp->nvme_cpl.status.sct);

	assert(vu_qpair != NULL);

	assert(vu_req != NULL);

	assert(vu_ctrlr != NULL);



	vfu_unmap_sg(vu_ctrlr->endpoint->vfu_ctx, vu_req->sg, vu_req->iov, vu_req->iovcnt);

	sqid = vu_qpair->qpair.qid;

	cqid = vu_ctrlr->qp[sqid]->sq.cqid;



	return post_completion(vu_ctrlr, &vu_req->req.cmd->nvme_cmd,

			       &vu_ctrlr->qp[cqid]->cq,

			       vu_req->req.rsp->nvme_cpl.cdw0,

			       vu_req->req.rsp->nvme_cpl.status.sc,

			       vu_req->req.rsp->nvme_cpl.status.sct);

}



static int