nvmet-fc: correct ref counting error when deferred rcv used (619c62dc) · Commits · 戴 / test

Whenever a cmd is received a reference is taken while looking up the queue. The reference is removed after the cmd is done as the iod is returned for reuse. The fod may be reused for a deferred (recevied but no job context) cmd. Existing code removes the reference only if the fod is not reused for another command. Given the fod may be used for one or more ios, although a reference was taken per io, it won't be matched on the frees. Remove the reference on every fod free. This pairs the references to each io. Signed-off-by:

James Smart <james.smart@broadcom.com> Reviewed-by:

Sagi Grimberg <sagi@grimberg.me> Signed-off-by:

Christoph Hellwig <hch@lst.de>

drivers/nvme/target/fc.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -533,15 +533,15 @@ nvmet_fc_free_fcp_iod(struct nvmet_fc_tgt_queue *queue,

		tgtport->ops->fcp_req_release(&tgtport->fc_target_port, fcpreq);

		/* release the queue lookup reference on the completed IO */
		nvmet_fc_tgt_q_put(queue);

		spin_lock_irqsave(&queue->qlock, flags);
		deferfcp = list_first_entry_or_null(&queue->pending_cmd_list,
		struct nvmet_fc_defer_fcp_req, req_list);
		if (!deferfcp) {
		list_add_tail(&fod->fcp_list, &fod->queue->fod_list);
		spin_unlock_irqrestore(&queue->qlock, flags);

		/* Release reference taken at queue lookup and fod allocation */
		nvmet_fc_tgt_q_put(queue);
		return;
		}

		@@ -760,6 +760,9 @@ nvmet_fc_delete_target_queue(struct nvmet_fc_tgt_queue *queue)
		tgtport->ops->fcp_req_release(&tgtport->fc_target_port,
		deferfcp->fcp_req);

		/* release the queue lookup reference */
		nvmet_fc_tgt_q_put(queue);

		kfree(deferfcp);

		spin_lock_irqsave(&queue->qlock, flags);

Admin message