NVMe PCI endpoint target fixes
Subsystems (2)
cover NVMe PCI endpoint target fixes
All,
A couple of fixes for the NVMe PCI endpoint target driver. The first patch fixes an issue that sometimes causes crashes (hard to reproduce).
Damien Le Moal (2):
nvmet: pci-epf: Set NVMET_PCI_EPF_Q_LIVE when a queue is fully created
nvmet: pci-epf: Do not add an IRQ vector if not needed
drivers/nvme/target/pci-epf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
Signature · 1 line
2.48.1
PATCH 1/2 nvmet: pci-epf: Set NVMET_PCI_EPF_Q_LIVE when a queue is fully created
The function nvmet_pci_epf_create_sq() use test_and_set_bit() to check that a submission queue is not already live and if not, set the NVMET_PCI_EPF_Q_LIVE queue flag to declare the sq live (ready to use). However, this is done on entry to the function, before the submission queue is actually fully initialized and ready to use. This creates a race situation with the function nvmet_pci_epf_poll_sqs_work() which looks at the NVMET_PCI_EPF_Q_LIVE queue flag to poll the submission queue when it is live. This race can lead to invalid DMA transfers if nvmet_pci_epf_poll_sqs_work() runs after the NVMET_PCI_EPF_Q_LIVE flag is set but before setting the sq pci address and doorbell ofset.
Avoid this race by only testing the NVMET_PCI_EPF_Q_LIVE flag on entry to nvmet_pci_epf_create_sq() and setting it after the submission queue is fully setup before nvmet_pci_epf_create_sq() returns success. Since the function nvmet_pci_epf_create_cq() also has the same racy flag setting pattern, also make a similar change in that function.
--- drivers/nvme/target/pci-epf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/nvme/target/pci-epf.c +7 -6
@@ -1265,7 +1265,7 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,struct nvmet_pci_epf_queue *cq = &ctrl->cq[cqid];u16 status; -if (test_and_set_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags)) +if (test_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags))return NVME_SC_QID_INVALID |NVME_STATUS_DNR ;if (!(flags &NVME_QUEUE_PHYS_CONTIG ))
@@ -1300,6 +1300,8 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,if (status !=NVME_SC_SUCCESS ) goto err; +set_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags); +dev_dbg (ctrl->dev,"CQ[%u]: %u entries of %zu B, IRQ vector %u\n" , cqid, qsize, cq->qes, cq->vector);
@@ -1307,7 +1309,6 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl, err:clear_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags); -clear_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags);return status; }
@@ -1333,7 +1334,7 @@ static u16 nvmet_pci_epf_create_sq(struct nvmet_ctrl *tctrl,struct nvmet_pci_epf_queue *sq = &ctrl->sq[sqid];u16 status; -if (test_and_set_bit (NVMET_PCI_EPF_Q_LIVE , &sq->flags)) +if (test_bit (NVMET_PCI_EPF_Q_LIVE , &sq->flags))return NVME_SC_QID_INVALID |NVME_STATUS_DNR ;if (!(flags &NVME_QUEUE_PHYS_CONTIG ))
@@ -1355,7 +1356,7 @@ static u16 nvmet_pci_epf_create_sq(struct nvmet_ctrl *tctrl, status =nvmet_sq_create (tctrl, &sq->nvme_sq, sqid, sq->depth);if (status !=NVME_SC_SUCCESS ) - goto out_clear_bit; +return status; sq->iod_wq =alloc_workqueue ("sq%d_wq" ,WQ_UNBOUND ,min_t (int, sq->depth,WQ_MAX_ACTIVE ), sqid);
@@ -1365,6 +1366,8 @@ static u16 nvmet_pci_epf_create_sq(struct nvmet_ctrl *tctrl, goto out_destroy_sq; } +set_bit (NVMET_PCI_EPF_Q_LIVE , &sq->flags); +dev_dbg (ctrl->dev,"SQ[%u]: %u entries of %zu B\n" , sqid, qsize, sq->qes);
@@ -1372,8 +1375,6 @@ static u16 nvmet_pci_epf_create_sq(struct nvmet_ctrl *tctrl, out_destroy_sq:nvmet_sq_destroy (&sq->nvme_sq); -out_clear_bit: -clear_bit (NVMET_PCI_EPF_Q_LIVE , &sq->flags);return status; }
Signature · 1 line
2.48.1
PATCH 2/2 nvmet: pci-epf: Do not add an IRQ vector if not needed
In reply to Damien Le MoalThe function nvmet_pci_epf_create_cq() always unconditionally calls nvmet_pci_epf_add_irq_vector() to add an IRQ vector for a completion queue. But this is not correct if the host requested the creation of a completion queue for polling, without an IRQ vector specified (i.e. the flag NVME_CQ_IRQ_ENABLED is not set).
Fix this by calling nvmet_pci_epf_add_irq_vector() and setting the queue flag NVMET_PCI_EPF_Q_IRQ_ENABLED for the cq only if NVME_CQ_IRQ_ENABLED is set. While at it, also fix the error path to add the missing removal of the added IRQ vector if nvmet_cq_create() fails.
--- drivers/nvme/target/pci-epf.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/nvme/target/pci-epf.c +7 -8
@@ -1271,9 +1271,6 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,if (!(flags &NVME_QUEUE_PHYS_CONTIG ))return NVME_SC_INVALID_QUEUE |NVME_STATUS_DNR ; -if (flags &NVME_CQ_IRQ_ENABLED ) -set_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags); - cq->pci_addr = pci_addr; cq->qid = cqid; cq->depth = qsize +1 ;
@@ -1290,10 +1287,11 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl, cq->qes = ctrl->io_cqes; cq->pci_size = cq->qes * cq->depth; - cq->iv =nvmet_pci_epf_add_irq_vector (ctrl, vector); -if (!cq->iv) { - status =NVME_SC_INTERNAL |NVME_STATUS_DNR ; - goto err; +if (flags &NVME_CQ_IRQ_ENABLED ) { + cq->iv =nvmet_pci_epf_add_irq_vector (ctrl, vector); +if (!cq->iv) +return NVME_SC_INTERNAL |NVME_STATUS_DNR ; +set_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags); } status =nvmet_cq_create (tctrl, &cq->nvme_cq, cqid, cq->depth);
@@ -1308,7 +1306,8 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,return NVME_SC_SUCCESS ; err: -clear_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags); +if (test_and_clear_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags)) +nvmet_pci_epf_remove_irq_vector (ctrl, cq->vector);return status; }
Signature · 1 line
2.48.1