]> www.infradead.org Git - users/dwmw2/linux.git/commit
nvme-pci: don't use dma_alloc_noncontiguous with 0 merge boundary
authorChristoph Hellwig <hch@lst.de>
Wed, 4 Dec 2024 00:42:40 +0000 (09:42 +0900)
committerKeith Busch <kbusch@kernel.org>
Wed, 4 Dec 2024 17:23:11 +0000 (09:23 -0800)
commitad0cf42e1fc4810170a8e8e232e85d69073e4d25
treef5d9c7b6be4965177199269fd65f7e0638bbc9f4
parent41d826c8a9de37af5d1710a37b55720bd5ad8709
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: 63a5c7a4b4c4 ("nvme-pci: use dma_alloc_noncontigous if possible")
Reported-by: Leon Romanovsky <leon@kernel.org>
Reported-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Leon Romanovsky <leon@kernel.org>
Tested-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/pci.c