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

axboe · axboe · commit 8b878ee247ef · 2018-12-07T08:40:13.000-07:00
Pull NVMe fixes from Christoph.

* 'nvme-4.20' of git://git.infradead.org/nvme:
  nvmet-rdma: fix response use after free
  nvme: validate controller state before rescheduling keep alive
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
@@ -831,6 +831,8 @@ static int nvme_submit_user_cmd(struct request_queue *q,
 static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)
 {
 	struct nvme_ctrl *ctrl = rq->end_io_data;
+	unsigned long flags;
+	bool startka = false;
 
 	blk_mq_free_request(rq);
 
@@ -841,7 +843,13 @@ static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)
 		return;
 	}
 
-	schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
+	spin_lock_irqsave(&ctrl->lock, flags);
+	if (ctrl->state == NVME_CTRL_LIVE ||
+	    ctrl->state == NVME_CTRL_CONNECTING)
+		startka = true;
+	spin_unlock_irqrestore(&ctrl->lock, flags);
+	if (startka)
+		schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
 }
 
 static int nvme_keep_alive(struct nvme_ctrl *ctrl)
diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
@@ -529,14 +529,15 @@ static void nvmet_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc)
 {
 	struct nvmet_rdma_rsp *rsp =
 		container_of(wc->wr_cqe, struct nvmet_rdma_rsp, send_cqe);
+	struct nvmet_rdma_queue *queue = cq->cq_context;
 
 	nvmet_rdma_release_rsp(rsp);
 
 	if (unlikely(wc->status != IB_WC_SUCCESS &&
 		     wc->status != IB_WC_WR_FLUSH_ERR)) {
 		pr_err("SEND for CQE 0x%p failed with status %s (%d).\n",
 			wc->wr_cqe, ib_wc_status_msg(wc->status), wc->status);
-		nvmet_rdma_error_comp(rsp->queue);
+		nvmet_rdma_error_comp(queue);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -831,6 +831,8 @@ static int nvme_submit_user_cmd(struct request_queue *q,`
`831`	`831`	`static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)`
`832`	`832`	`{`
`833`	`833`	`struct nvme_ctrl *ctrl = rq->end_io_data;`
	`834`	`+ unsigned long flags;`
	`835`	`+ bool startka = false;`
`834`	`836`
`835`	`837`	`blk_mq_free_request(rq);`
`836`	`838`
`@@ -841,7 +843,13 @@ static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)`
`841`	`843`	`return;`
`842`	`844`	`}`
`843`	`845`
`844`		`- schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);`
	`846`	`+ spin_lock_irqsave(&ctrl->lock, flags);`
	`847`	`+ if (ctrl->state == NVME_CTRL_LIVE \|\|`
	`848`	`+ ctrl->state == NVME_CTRL_CONNECTING)`
	`849`	`+ startka = true;`
	`850`	`+ spin_unlock_irqrestore(&ctrl->lock, flags);`
	`851`	`+ if (startka)`
	`852`	`+ schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);`
`845`	`853`	`}`
`846`	`854`
`847`	`855`	`static int nvme_keep_alive(struct nvme_ctrl *ctrl)`
Original file line number	Diff line number	Diff line change
`@@ -529,14 +529,15 @@ static void nvmet_rdma_send_done(struct ib_cq cq, struct ib_wc wc)`
`529`	`529`	`{`
`530`	`530`	`struct nvmet_rdma_rsp *rsp =`
`531`	`531`	`container_of(wc->wr_cqe, struct nvmet_rdma_rsp, send_cqe);`
	`532`	`+ struct nvmet_rdma_queue *queue = cq->cq_context;`
`532`	`533`
`533`	`534`	`nvmet_rdma_release_rsp(rsp);`
`534`	`535`
`535`	`536`	`if (unlikely(wc->status != IB_WC_SUCCESS &&`
`536`	`537`	`wc->status != IB_WC_WR_FLUSH_ERR)) {`
`537`	`538`	`pr_err("SEND for CQE 0x%p failed with status %s (%d).\n",`
`538`	`539`	`wc->wr_cqe, ib_wc_status_msg(wc->status), wc->status);`
`539`		`- nvmet_rdma_error_comp(rsp->queue);`
	`540`	`+ nvmet_rdma_error_comp(queue);`
`540`	`541`	`}`
`541`	`542`	`}`
`542`	`543`