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

nvme-pci: don't use dma_alloc_noncontiguous with 0 merge boundary 



Only call into nvme_alloc_host_mem_single which uses
dma_alloc_noncontiguous when there is non-null dma merge boundary.
Without this we'll call into dma_alloc_noncontiguous for device using
dma-direct, which can work fine as long as the preferred size is below the
MAX_ORDER of the page allocator, but blows up with a warning if it is
too large.

Fixes: 63a5c7a4 ("nvme-pci: use dma_alloc_noncontigous if possible")
Reported-by: default avatarLeon Romanovsky <leon@kernel.org>
Reported-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLeon Romanovsky <leon@kernel.org>
Tested-by: default avatarChaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 41d826c8

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -2172,6 +2172,7 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred, 


static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred)

{

	unsigned long dma_merge_boundary = dma_get_merge_boundary(dev->dev);

	u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);

	u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);

	u64 chunk_size;
@@ -2180,7 +2181,7 @@ static int nvme_alloc_host_mem(struct nvme_dev *dev, u64 min, u64 preferred) 
	 * If there is an IOMMU that can merge pages, try a virtually

	 * non-contiguous allocation for a single segment first.

	 */

	if (!(PAGE_SIZE & dma_get_merge_boundary(dev->dev))) {

	if (dma_merge_boundary && (PAGE_SIZE & dma_merge_boundary) == 0) {

		if (!nvme_alloc_host_mem_single(dev, preferred))

			return 0;

	}