Commit a09115b2 authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

NVMe: Cancel outstanding IOs on queue deletion 



If the device is hot-unplugged while there are active commands, we should
time out the I/Os so that upper layers don't just see the I/Os disappear.

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 9e866774

drivers/block/nvme.c

+32 −23
Original line number Diff line number Diff line
@@ -868,6 +868,33 @@ static int nvme_set_features(struct nvme_dev *dev, unsigned fid, 
	return nvme_submit_admin_cmd(dev, &c, result);

}



/**

 * nvme_cancel_ios - Cancel outstanding I/Os

 * @queue: The queue to cancel I/Os on

 * @timeout: True to only cancel I/Os which have timed out

 */

static void nvme_cancel_ios(struct nvme_queue *nvmeq, bool timeout)

{

	int depth = nvmeq->q_depth - 1;

	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);

	unsigned long now = jiffies;

	int cmdid;



	for_each_set_bit(cmdid, nvmeq->cmdid_data, depth) {

		void *ctx;

		nvme_completion_fn fn;

		static struct nvme_completion cqe = {

			.status = cpu_to_le16(NVME_SC_ABORT_REQ) << 1,

		};



		if (timeout && !time_after(now, info[cmdid].timeout))

			continue;

		dev_warn(nvmeq->q_dmadev, "Cancelling I/O %d\n", cmdid);

		ctx = cancel_cmdid(nvmeq, cmdid, &fn);

		fn(nvmeq->dev, ctx, &cqe);

	}

}



static void nvme_free_queue_mem(struct nvme_queue *nvmeq)

{

	dma_free_coherent(nvmeq->q_dmadev, CQ_SIZE(nvmeq->q_depth),
@@ -882,6 +909,10 @@ static void nvme_free_queue(struct nvme_dev *dev, int qid) 
	struct nvme_queue *nvmeq = dev->queues[qid];

	int vector = dev->entry[nvmeq->cq_vector].vector;



	spin_lock_irq(&nvmeq->q_lock);

	nvme_cancel_ios(nvmeq, false);

	spin_unlock_irq(&nvmeq->q_lock);



	irq_set_affinity_hint(vector, NULL);

	free_irq(vector, nvmeq);
@@ -1236,26 +1267,6 @@ static const struct block_device_operations nvme_fops = { 
	.compat_ioctl	= nvme_ioctl,

};



static void nvme_timeout_ios(struct nvme_queue *nvmeq)

{

	int depth = nvmeq->q_depth - 1;

	struct nvme_cmd_info *info = nvme_cmd_info(nvmeq);

	unsigned long now = jiffies;

	int cmdid;



	for_each_set_bit(cmdid, nvmeq->cmdid_data, depth) {

		void *ctx;

		nvme_completion_fn fn;

		static struct nvme_completion cqe = { .status = cpu_to_le16(NVME_SC_ABORT_REQ) << 1, };



		if (!time_after(now, info[cmdid].timeout))

			continue;

		dev_warn(nvmeq->q_dmadev, "Timing out I/O %d\n", cmdid);

		ctx = cancel_cmdid(nvmeq, cmdid, &fn);

		fn(nvmeq->dev, ctx, &cqe);

	}

}



static void nvme_resubmit_bios(struct nvme_queue *nvmeq)

{

	while (bio_list_peek(&nvmeq->sq_cong)) {
@@ -1287,7 +1298,7 @@ static int nvme_kthread(void *data) 
				spin_lock_irq(&nvmeq->q_lock);

				if (nvme_process_cq(nvmeq))

					printk("process_cq did something\n");

				nvme_timeout_ios(nvmeq);

				nvme_cancel_ios(nvmeq, true);

				nvme_resubmit_bios(nvmeq);

				spin_unlock_irq(&nvmeq->q_lock);

			}
@@ -1549,8 +1560,6 @@ static int nvme_dev_remove(struct nvme_dev *dev) 
	list_del(&dev->node);

	spin_unlock(&dev_list_lock);



	/* TODO: wait all I/O finished or cancel them */



	list_for_each_entry_safe(ns, next, &dev->namespaces, list) {

		list_del(&ns->list);

		del_gendisk(ns->disk);