Commit 88a041f4 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme-pci: remove q_dmadev from nvme_queue 



We don't need to save the dma device as it's not used in the hot path
and hasn't in a long time. Shrink the struct nvme_queue removing this
unnecessary member.

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 7c349dde

drivers/nvme/host/pci.c

+3 −5
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static inline struct nvme_dev *to_nvme_dev(struct nvme_ctrl *ctrl) 
 * commands and one for I/O commands).

 */

struct nvme_queue {

	struct device *q_dmadev;

	struct nvme_dev *dev;

	spinlock_t sq_lock;

	struct nvme_command *sq_cmds;
@@ -1369,16 +1368,16 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) 


static void nvme_free_queue(struct nvme_queue *nvmeq)

{

	dma_free_coherent(nvmeq->q_dmadev, CQ_SIZE(nvmeq->q_depth),

	dma_free_coherent(nvmeq->dev->dev, CQ_SIZE(nvmeq->q_depth),

				(void *)nvmeq->cqes, nvmeq->cq_dma_addr);

	if (!nvmeq->sq_cmds)

		return;



	if (test_and_clear_bit(NVMEQ_SQ_CMB, &nvmeq->flags)) {

		pci_free_p2pmem(to_pci_dev(nvmeq->q_dmadev),

		pci_free_p2pmem(to_pci_dev(nvmeq->dev->dev),

				nvmeq->sq_cmds, SQ_SIZE(nvmeq->q_depth));

	} else {

		dma_free_coherent(nvmeq->q_dmadev, SQ_SIZE(nvmeq->q_depth),

		dma_free_coherent(nvmeq->dev->dev, SQ_SIZE(nvmeq->q_depth),

				nvmeq->sq_cmds, nvmeq->sq_dma_addr);

	}

}
@@ -1494,7 +1493,6 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, int depth) 
	if (nvme_alloc_sq_cmds(dev, nvmeq, qid, depth))

		goto free_cqdma;



	nvmeq->q_dmadev = dev->dev;

	nvmeq->dev = dev;

	spin_lock_init(&nvmeq->sq_lock);

	spin_lock_init(&nvmeq->cq_poll_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE