nvme-pci: limit max_hw_sectors based on the DMA max mapping size
authorChristoph Hellwig <hch@lst.de>
Wed, 3 Jul 2019 16:54:44 +0000 (09:54 -0700)
committerChristoph Hellwig <hch@lst.de>
Tue, 9 Jul 2019 20:44:44 +0000 (13:44 -0700)
When running a NVMe device that is attached to a addressing
challenged PCIe root port that requires bounce buffering, our
request sizes can easily overflow the swiotlb bounce buffer
size.  Limit the maximum I/O size to the limit exposed by
the DMA mapping subsystem.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Atish Patra <Atish.Patra@wdc.com>
Tested-by: Atish Patra <Atish.Patra@wdc.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
drivers/nvme/host/pci.c

index ac2011b8dac11e2077408416c5f7afd0ccdf87ae..bb970ca82517b1213cb4922225822edb78e23b4d 100644 (file)
@@ -2503,7 +2503,8 @@ static void nvme_reset_work(struct work_struct *work)
         * Limit the max command size to prevent iod->sg allocations going
         * over a single page.
         */
-       dev->ctrl.max_hw_sectors = NVME_MAX_KB_SZ << 1;
+       dev->ctrl.max_hw_sectors = min_t(u32,
+               NVME_MAX_KB_SZ << 1, dma_max_mapping_size(dev->dev) >> 9);
        dev->ctrl.max_segments = NVME_MAX_SEGS;
 
        /*