nvmet: pci-epf: Remove nvmet_pci_epf_[un]map_queue()
Subsystems (2)
PATCH 1/1 nvmet: pci-epf: Remove nvmet_pci_epf_[un]map_queue()
The functions nvmet_pci_epf_map_queue() and nvmet_pci_epf_unmap_queue() are called respectively only from nvmet_pci_epf_create_cq() and nvmet_pci_epf_delete_cq(). Remove these functions and open-code them in their call site.
---
Note: this goes on top of the patch "nvmet: pci-epf: Keep completion queues mapped". I can squash these 2 patches together if preferred.
drivers/nvme/target/pci-epf.c | 54 +++++++++++++---------------------- 1 file changed, 20 insertions(+), 34 deletions(-)
drivers/nvme/target/pci-epf.c +20 -34
@@ -271,36 +271,6 @@ static inline void nvmet_pci_epf_mem_unmap(struct nvmet_pci_epf *nvme_epf,pci_epc_mem_unmap (epf->epc, epf->func_no, epf->vfunc_no, map); } -static int nvmet_pci_epf_map_queue (struct nvmet_pci_epf_ctrl *ctrl, -struct nvmet_pci_epf_queue *queue) -{ -struct nvmet_pci_epf *nvme_epf = ctrl->nvme_epf; -int ret; - - ret =nvmet_pci_epf_mem_map (nvme_epf, queue->pci_addr, - queue->pci_size, &queue->pci_map); -if (ret) { -dev_err (ctrl->dev,"Failed to map queue %u (err=%d)\n" , - queue->qid, ret); -return ret; - } - -if (queue->pci_map.pci_size < queue->pci_size) { -dev_err (ctrl->dev,"Invalid partial mapping of queue %u\n" , - queue->qid); -nvmet_pci_epf_mem_unmap (nvme_epf, &queue->pci_map); -return -ENOMEM ; - } - -return 0 ; -} - -static inline void nvmet_pci_epf_unmap_queue (struct nvmet_pci_epf_ctrl *ctrl, -struct nvmet_pci_epf_queue *queue) -{ -nvmet_pci_epf_mem_unmap (ctrl->nvme_epf, &queue->pci_map); -} -struct nvmet_pci_epf_dma_filter {struct device *dev;u32 dma_mask;
@@ -1329,10 +1299,22 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,if (status !=NVME_SC_SUCCESS ) goto err; - ret =nvmet_pci_epf_map_queue (ctrl, cq); +/* +* Map the CQ PCI address space and since PCI endpoint controllers may +* return a partial mapping, check that the mapping is large enough. +*/ + ret =nvmet_pci_epf_mem_map (ctrl->nvme_epf, cq->pci_addr, cq->pci_size, + &cq->pci_map);if (ret) { - status =NVME_SC_INTERNAL |NVME_STATUS_DNR ; - goto err; +dev_err (ctrl->dev,"Failed to map CQ %u (err=%d)\n" , + cq->qid, ret); + goto err_internal; + } + +if (cq->pci_map.pci_size < cq->pci_size) { +dev_err (ctrl->dev,"Invalid partial mapping of queue %u\n" , + cq->qid); + goto err_unmap_queue; }set_bit (NVMET_PCI_EPF_Q_LIVE , &cq->flags);
@@ -1342,6 +1324,10 @@ static u16 nvmet_pci_epf_create_cq(struct nvmet_ctrl *tctrl,return NVME_SC_SUCCESS ; +err_unmap_queue: +nvmet_pci_epf_mem_unmap (ctrl->nvme_epf, &cq->pci_map); +err_internal: + status =NVME_SC_INTERNAL |NVME_STATUS_DNR ; err:if (test_and_clear_bit (NVMET_PCI_EPF_Q_IRQ_ENABLED , &cq->flags))nvmet_pci_epf_remove_irq_vector (ctrl, cq->vector);
@@ -1359,7 +1345,7 @@ static u16 nvmet_pci_epf_delete_cq(struct nvmet_ctrl *tctrl, u16 cqid)cancel_delayed_work_sync (&cq->work);nvmet_pci_epf_drain_queue (cq);nvmet_pci_epf_remove_irq_vector (ctrl, cq->vector); -nvmet_pci_epf_unmap_queue (ctrl, cq); +nvmet_pci_epf_mem_unmap (ctrl->nvme_epf, &cq->pci_map);return NVME_SC_SUCCESS ; }
Signature · 1 line
2.48.1
Christoph Hellwig
maintainerQuoted 10 lines · Damien Le Moal
The functions
nvmet_pci_epf_map_queue()andnvmet_pci_epf_unmap_queue()are called respectively only fromnvmet_pci_epf_create_cq()andnvmet_pci_epf_delete_cq(). Remove these functions and open-code them in their call site.Signed-off-by Damien Le Moal <[email protected]>---
Note: this goes on top of the patch "nvmet: pci-epf: Keep completion queues mapped". I can squash these 2 patches together if preferred.
Yes, I think just squashing them would be best.