Commit 2f859441 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Christoph Hellwig
Browse files

nvme-pci: check DMA ops when indicating support for PCI P2PDMA 



Introduce a supports_pci_p2pdma() operation in nvme_ctrl_ops to
replace the fixed NVME_F_PCI_P2PDMA flag such that the dma_map_ops
flags can be checked for PCI P2PDMA support.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 30280eee

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -3982,7 +3982,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
		blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, ns->queue);



	blk_queue_flag_set(QUEUE_FLAG_NONROT, ns->queue);

	if (ctrl->ops->flags & NVME_F_PCI_P2PDMA)

	if (ctrl->ops->supports_pci_p2pdma &&

	    ctrl->ops->supports_pci_p2pdma(ctrl))

		blk_queue_flag_set(QUEUE_FLAG_PCI_P2PDMA, ns->queue);



	ns->ctrl = ctrl;

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,6 @@ struct nvme_ctrl_ops { 
	unsigned int flags;

#define NVME_F_FABRICS			(1 << 0)

#define NVME_F_METADATA_SUPPORTED	(1 << 1)

#define NVME_F_PCI_P2PDMA		(1 << 2)

	int (*reg_read32)(struct nvme_ctrl *ctrl, u32 off, u32 *val);

	int (*reg_write32)(struct nvme_ctrl *ctrl, u32 off, u32 val);

	int (*reg_read64)(struct nvme_ctrl *ctrl, u32 off, u64 *val);
@@ -504,6 +503,7 @@ struct nvme_ctrl_ops { 
	void (*delete_ctrl)(struct nvme_ctrl *ctrl);

	int (*get_address)(struct nvme_ctrl *ctrl, char *buf, int size);

	void (*print_device_info)(struct nvme_ctrl *ctrl);

	bool (*supports_pci_p2pdma)(struct nvme_ctrl *ctrl);

};



/*

drivers/nvme/host/pci.c

+9 −3
Original line number Diff line number Diff line
@@ -2984,7 +2984,6 @@ static int nvme_pci_get_address(struct nvme_ctrl *ctrl, char *buf, int size) 
	return snprintf(buf, size, "%s\n", dev_name(&pdev->dev));

}





static void nvme_pci_print_device_info(struct nvme_ctrl *ctrl)

{

	struct pci_dev *pdev = to_pci_dev(to_nvme_dev(ctrl)->dev);
@@ -2999,11 +2998,17 @@ static void nvme_pci_print_device_info(struct nvme_ctrl *ctrl) 
		subsys->firmware_rev);

}



static bool nvme_pci_supports_pci_p2pdma(struct nvme_ctrl *ctrl)

{

	struct nvme_dev *dev = to_nvme_dev(ctrl);



	return dma_pci_p2pdma_supported(dev->dev);

}



static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {

	.name			= "pcie",

	.module			= THIS_MODULE,

	.flags			= NVME_F_METADATA_SUPPORTED |

				  NVME_F_PCI_P2PDMA,

	.flags			= NVME_F_METADATA_SUPPORTED,

	.reg_read32		= nvme_pci_reg_read32,

	.reg_write32		= nvme_pci_reg_write32,

	.reg_read64		= nvme_pci_reg_read64,
@@ -3011,6 +3016,7 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = { 
	.submit_async_event	= nvme_pci_submit_async_event,

	.get_address		= nvme_pci_get_address,

	.print_device_info	= nvme_pci_print_device_info,

	.supports_pci_p2pdma	= nvme_pci_supports_pci_p2pdma,

};



static int nvme_dev_map(struct nvme_dev *dev)