diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-06-05 21:08:24 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-06-05 13:18:39 -0600 |
| commit | a48bc520011ea7a701826a9e3a770b128f283328 (patch) | |
| tree | 1037387fee23197198565f5bcf2d1ebc4125f462 /drivers/nvme | |
| parent | 98d669b49120bad6a09c361daa71c92e6a9f8fbb (diff) | |
| download | linux-stable-a48bc520011ea7a701826a9e3a770b128f283328.tar.gz linux-stable-a48bc520011ea7a701826a9e3a770b128f283328.tar.bz2 linux-stable-a48bc520011ea7a701826a9e3a770b128f283328.zip | |
nvme-pci: don't limit DMA segement size
NVMe uses PRPs (or optionally unlimited SGLs) for data transfers and
has no specific limit for a single DMA segement. Limiting the size
will cause problems because the block layer assumes PRP-ish devices
using a virt boundary mask don't have a segment limit. And while this
is true, we also really need to tell the DMA mapping layer about it,
otherwise dma-debug will trip over it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index f562154551ce..524d6bd6d095 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2513,6 +2513,12 @@ static void nvme_reset_work(struct work_struct *work) */ dev->ctrl.max_hw_sectors = NVME_MAX_KB_SZ << 1; dev->ctrl.max_segments = NVME_MAX_SEGS; + + /* + * Don't limit the IOMMU merged segment size. + */ + dma_set_max_seg_size(dev->dev, 0xffffffff); + mutex_unlock(&dev->shutdown_lock); /* |