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

Commit 0d4ee015 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus 

Pull nvme target fixes from Sagi:

Given that its -rc6, I removed anything that is not
bug fix.

- nvmet-fc discard fix from Christoph
- queue disconnect fix from James
- nvmet-rdma dma sync fix from Parav
- Some more nvmet fixes
parents 690e5325 19e420bb

drivers/nvme/host/fc.c

+3 −3
Original line number Diff line number Diff line
@@ -1663,13 +1663,13 @@ nvme_fc_map_data(struct nvme_fc_ctrl *ctrl, struct request *rq, 
		return 0;



	freq->sg_table.sgl = freq->first_sgl;

	ret = sg_alloc_table_chained(&freq->sg_table, rq->nr_phys_segments,

			freq->sg_table.sgl);

	ret = sg_alloc_table_chained(&freq->sg_table,

			blk_rq_nr_phys_segments(rq), freq->sg_table.sgl);

	if (ret)

		return -ENOMEM;



	op->nents = blk_rq_map_sg(rq->q, rq, freq->sg_table.sgl);

	WARN_ON(op->nents > rq->nr_phys_segments);

	WARN_ON(op->nents > blk_rq_nr_phys_segments(rq));

	dir = (rq_data_dir(rq) == WRITE) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;

	freq->sg_cnt = fc_dma_map_sg(ctrl->lport->dev, freq->sg_table.sgl,

				op->nents, dir);

drivers/nvme/target/configfs.c

+1 −0
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ static void nvmet_subsys_release(struct config_item *item) 
{

	struct nvmet_subsys *subsys = to_subsys(item);



	nvmet_subsys_del_ctrls(subsys);

	nvmet_subsys_put(subsys);

}

drivers/nvme/target/core.c

+14 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void nvmet_keep_alive_timer(struct work_struct *work) 
	pr_err("ctrl %d keep-alive timer (%d seconds) expired!\n",

		ctrl->cntlid, ctrl->kato);



	ctrl->ops->delete_ctrl(ctrl);

	nvmet_ctrl_fatal_error(ctrl);

}



static void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl)
@@ -816,6 +816,9 @@ static void nvmet_ctrl_free(struct kref *ref) 
	list_del(&ctrl->subsys_entry);

	mutex_unlock(&subsys->lock);



	flush_work(&ctrl->async_event_work);

	cancel_work_sync(&ctrl->fatal_err_work);



	ida_simple_remove(&subsys->cntlid_ida, ctrl->cntlid);

	nvmet_subsys_put(subsys);
@@ -935,6 +938,16 @@ static void nvmet_subsys_free(struct kref *ref) 
	kfree(subsys);

}



void nvmet_subsys_del_ctrls(struct nvmet_subsys *subsys)

{

	struct nvmet_ctrl *ctrl;



	mutex_lock(&subsys->lock);

	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry)

		ctrl->ops->delete_ctrl(ctrl);

	mutex_unlock(&subsys->lock);

}



void nvmet_subsys_put(struct nvmet_subsys *subsys)

{

	kref_put(&subsys->ref, nvmet_subsys_free);

drivers/nvme/target/fc.c

+22 −14
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, 
			(struct fcnvme_ls_disconnect_rqst *)iod->rqstbuf;

	struct fcnvme_ls_disconnect_acc *acc =

			(struct fcnvme_ls_disconnect_acc *)iod->rspbuf;

	struct nvmet_fc_tgt_queue *queue;

	struct nvmet_fc_tgt_queue *queue = NULL;

	struct nvmet_fc_tgt_assoc *assoc;

	int ret = 0;

	bool del_assoc = false;
@@ -1348,7 +1348,18 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, 
		assoc = nvmet_fc_find_target_assoc(tgtport,

				be64_to_cpu(rqst->associd.association_id));

		iod->assoc = assoc;

		if (!assoc)

		if (assoc) {

			if (rqst->discon_cmd.scope ==

					FCNVME_DISCONN_CONNECTION) {

				queue = nvmet_fc_find_target_queue(tgtport,

						be64_to_cpu(

							rqst->discon_cmd.id));

				if (!queue) {

					nvmet_fc_tgt_a_put(assoc);

					ret = VERR_NO_CONN;

				}

			}

		} else

			ret = VERR_NO_ASSOC;

	}
@@ -1373,9 +1384,7 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, 
			FCNVME_LS_DISCONNECT);





	if (rqst->discon_cmd.scope == FCNVME_DISCONN_CONNECTION) {

		queue = nvmet_fc_find_target_queue(tgtport,

					be64_to_cpu(rqst->discon_cmd.id));

	/* are we to delete a Connection ID (queue) */

	if (queue) {

		int qid = queue->qid;
@@ -1388,7 +1397,6 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport, 
		if (!qid)

			del_assoc = true;

	}

	}



	/* release get taken in nvmet_fc_find_target_assoc */

	nvmet_fc_tgt_a_put(iod->assoc);

drivers/nvme/target/nvmet.h

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ void nvmet_ctrl_put(struct nvmet_ctrl *ctrl); 
struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,

		enum nvme_subsys_type type);

void nvmet_subsys_put(struct nvmet_subsys *subsys);

void nvmet_subsys_del_ctrls(struct nvmet_subsys *subsys);



struct nvmet_ns *nvmet_find_namespace(struct nvmet_ctrl *ctrl, __le32 nsid);

void nvmet_put_namespace(struct nvmet_ns *ns);