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

axboe · axboe · commit 52bd456a66c1 · 2018-08-29T11:05:20.000-06:00
Pull NVMe fixes from Christoph.

* 'nvme-4.19' of git://git.infradead.org/nvme:
  nvmet: free workqueue object if module init fails
  nvme-fcloop: Fix dropped LS's to removed target port
  nvme-pci: add a memory barrier to nvme_dbbuf_update_and_check_event
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
@@ -316,6 +316,14 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db,
 		old_value = *dbbuf_db;
 		*dbbuf_db = value;
 
+		/*
+		 * Ensure that the doorbell is updated before reading the event
+		 * index from memory.  The controller needs to provide similar
+		 * ordering to ensure the envent index is updated before reading
+		 * the doorbell.
+		 */
+		mb();
+
 		if (!nvme_dbbuf_need_event(*dbbuf_ei, value, old_value))
 			return false;
 	}
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
@@ -1210,7 +1210,7 @@ static int __init nvmet_init(void)
 
 	error = nvmet_init_discovery();
 	if (error)
-		goto out;
+		goto out_free_work_queue;
 
 	error = nvmet_init_configfs();
 	if (error)
@@ -1219,6 +1219,8 @@ static int __init nvmet_init(void)
 
 out_exit_discovery:
 	nvmet_exit_discovery();
+out_free_work_queue:
+	destroy_workqueue(buffered_io_wq);
 out:
 	return error;
 }
diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
@@ -311,7 +311,7 @@ fcloop_tgt_lsrqst_done_work(struct work_struct *work)
 	struct fcloop_tport *tport = tls_req->tport;
 	struct nvmefc_ls_req *lsreq = tls_req->lsreq;
 
-	if (tport->remoteport)
+	if (!tport || tport->remoteport)
 		lsreq->done(lsreq, tls_req->status);
 }
 
@@ -329,6 +329,7 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,
 
 	if (!rport->targetport) {
 		tls_req->status = -ECONNREFUSED;
+		tls_req->tport = NULL;
 		schedule_work(&tls_req->work);
 		return ret;
 	}

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ fcloop_tgt_lsrqst_done_work(struct work_struct *work)`
`311`	`311`	`struct fcloop_tport *tport = tls_req->tport;`
`312`	`312`	`struct nvmefc_ls_req *lsreq = tls_req->lsreq;`
`313`	`313`
`314`		`- if (tport->remoteport)`
	`314`	`+ if (!tport \|\| tport->remoteport)`
`315`	`315`	`lsreq->done(lsreq, tls_req->status);`
`316`	`316`	`}`
`317`	`317`
`@@ -329,6 +329,7 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,`
`329`	`329`
`330`	`330`	`if (!rport->targetport) {`
`331`	`331`	`tls_req->status = -ECONNREFUSED;`
	`332`	`+ tls_req->tport = NULL;`
`332`	`333`	`schedule_work(&tls_req->work);`
`333`	`334`	`return ret;`
`334`	`335`	`}`