Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 549f01ae authored by Vijay Immanuel's avatar Vijay Immanuel Committed by Jens Axboe
Browse files

nvmet: release the sq ref on rdma read errors 



On rdma read errors, release the sq ref that was taken
when the req was initialized. This avoids a hang in
nvmet_sq_destroy() when the queue is being freed.

Signed-off-by: default avatarVijay Immanuel <vijayi@attalasystems.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4b8ba5fa

drivers/nvme/target/core.c

+6 −0
Original line number Diff line number Diff line
@@ -529,6 +529,12 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, 
}

EXPORT_SYMBOL_GPL(nvmet_req_init);



void nvmet_req_uninit(struct nvmet_req *req)

{

	percpu_ref_put(&req->sq->ref);

}

EXPORT_SYMBOL_GPL(nvmet_req_uninit);



static inline bool nvmet_cc_en(u32 cc)

{

	return cc & 0x1;

drivers/nvme/target/nvmet.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ u16 nvmet_parse_fabrics_cmd(struct nvmet_req *req); 


bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq,

		struct nvmet_sq *sq, struct nvmet_fabrics_ops *ops);

void nvmet_req_uninit(struct nvmet_req *req);

void nvmet_req_complete(struct nvmet_req *req, u16 status);



void nvmet_cq_setup(struct nvmet_ctrl *ctrl, struct nvmet_cq *cq, u16 qid,

drivers/nvme/target/rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ static void nvmet_rdma_read_data_done(struct ib_cq *cq, struct ib_wc *wc) 
	rsp->n_rdma = 0;



	if (unlikely(wc->status != IB_WC_SUCCESS)) {

		nvmet_req_uninit(&rsp->req);

		nvmet_rdma_release_rsp(rsp);

		if (wc->status != IB_WC_WR_FLUSH_ERR) {

			pr_info("RDMA READ for CQE 0x%p failed with status %s (%d).\n",