Commit 7c349dde authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme-pci: use a flag for polled queues 



A negative value for the cq_vector used to mean the queue is either
disabled or a polled queue. However, we have a queue enabled flag,
so the cq_vector had been serving double duty.

Don't overload the meaning of cq_vector. Use a flag specific to the
polled queues instead.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 70583295

drivers/nvme/host/pci.c

+13 −20
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct nvme_queue { 
	dma_addr_t cq_dma_addr;

	u32 __iomem *q_db;

	u16 q_depth;

	s16 cq_vector;

	u16 cq_vector;

	u16 sq_tail;

	u16 last_sq_tail;

	u16 cq_head;
@@ -200,6 +200,7 @@ struct nvme_queue { 
#define NVMEQ_ENABLED		0

#define NVMEQ_SQ_CMB		1

#define NVMEQ_DELETE_ERROR	2

#define NVMEQ_POLLED		3

	u32 *dbbuf_sq_db;

	u32 *dbbuf_cq_db;

	u32 *dbbuf_sq_ei;
@@ -1088,7 +1089,7 @@ static int nvme_poll_irqdisable(struct nvme_queue *nvmeq, unsigned int tag) 
	 * using the CQ lock.  For normal interrupt driven threads we have

	 * to disable the interrupt to avoid racing with it.

	 */

	if (nvmeq->cq_vector == -1) {

	if (test_bit(NVMEQ_POLLED, &nvmeq->flags)) {

		spin_lock(&nvmeq->cq_poll_lock);

		found = nvme_process_cq(nvmeq, &start, &end, tag);

		spin_unlock(&nvmeq->cq_poll_lock);
@@ -1148,7 +1149,7 @@ static int adapter_alloc_cq(struct nvme_dev *dev, u16 qid, 
	struct nvme_command c;

	int flags = NVME_QUEUE_PHYS_CONTIG;



	if (vector != -1)

	if (!test_bit(NVMEQ_POLLED, &nvmeq->flags))

		flags |= NVME_CQ_IRQ_ENABLED;



	/*
@@ -1161,10 +1162,7 @@ static int adapter_alloc_cq(struct nvme_dev *dev, u16 qid, 
	c.create_cq.cqid = cpu_to_le16(qid);

	c.create_cq.qsize = cpu_to_le16(nvmeq->q_depth - 1);

	c.create_cq.cq_flags = cpu_to_le16(flags);

	if (vector != -1)

	c.create_cq.irq_vector = cpu_to_le16(vector);

	else

		c.create_cq.irq_vector = 0;



	return nvme_submit_sync_cmd(dev->ctrl.admin_q, &c, NULL, 0);

}
@@ -1410,10 +1408,8 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq) 
	nvmeq->dev->online_queues--;

	if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q)

		blk_mq_quiesce_queue(nvmeq->dev->ctrl.admin_q);

	if (nvmeq->cq_vector == -1)

		return 0;

	if (!test_and_clear_bit(NVMEQ_POLLED, &nvmeq->flags))

		pci_free_irq(to_pci_dev(nvmeq->dev->dev), nvmeq->cq_vector, nvmeq);

	nvmeq->cq_vector = -1;

	return 0;

}
@@ -1507,7 +1503,6 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) 
	nvmeq->q_db = &dev->dbs[qid * 2 * dev->db_stride];

	nvmeq->q_depth = depth;

	nvmeq->qid = qid;

	nvmeq->cq_vector = -1;

	dev->ctrl.queue_count++;



	return 0;
@@ -1552,7 +1547,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) 
{

	struct nvme_dev *dev = nvmeq->dev;

	int result;

	s16 vector;

	u16 vector = 0;



	clear_bit(NVMEQ_DELETE_ERROR, &nvmeq->flags);
@@ -1563,7 +1558,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) 
	if (!polled)

		vector = dev->num_vecs == 1 ? 0 : qid;

	else

		vector = -1;

		set_bit(NVMEQ_POLLED, &nvmeq->flags);



	result = adapter_alloc_cq(dev, qid, nvmeq, vector);

	if (result)
@@ -1578,7 +1573,8 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) 
	nvmeq->cq_vector = vector;

	nvme_init_queue(nvmeq, qid);



	if (vector != -1) {

	if (!polled) {

		nvmeq->cq_vector = vector;

		result = queue_request_irq(nvmeq);

		if (result < 0)

			goto release_sq;
@@ -1588,7 +1584,6 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid, bool polled) 
	return result;



release_sq:

	nvmeq->cq_vector = -1;

	dev->online_queues--;

	adapter_delete_sq(dev, qid);

release_cq:
@@ -1730,7 +1725,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev) 
	nvme_init_queue(nvmeq, 0);

	result = queue_request_irq(nvmeq);

	if (result) {

		nvmeq->cq_vector = -1;

		dev->online_queues--;

		return result;

	}
@@ -2171,10 +2166,8 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) 
	 * number of interrupts.

	 */

	result = queue_request_irq(adminq);

	if (result) {

		adminq->cq_vector = -1;

	if (result)

		return result;

	}

	set_bit(NVMEQ_ENABLED, &adminq->flags);



	result = nvme_create_io_queues(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE