forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

nvme-pci: set min_align_mask before calculating max_hw_sectors

Browse source 
commit 61ce339f19 upstream.

If swiotlb is force enabled dma_max_mapping_size ends up calling
swiotlb_max_mapping_size which takes into account the min align mask for
the device.  Set the min align mask for nvme driver before calling
dma_max_mapping_size while calculating max hw sectors.

Signed-off-by: Rishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Rishabh Bhatnagar 2022-09-20 19:19:32 +00:00 • committed by Greg Kroah-Hartman
commit 303436e301
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/nvme/host/pci.c
View file

@ -2624,6 +2624,8 @@ static void nvme_reset_work(struct work_struct *work)
if (result) if (result)
goto out_unlock; goto out_unlock;
dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);
/* /*
* Limit the max command size to prevent iod->sg allocations going * Limit the max command size to prevent iod->sg allocations going
* over a single page. * over a single page.
@ -2636,7 +2638,6 @@ static void nvme_reset_work(struct work_struct *work)
* Don't limit the IOMMU merged segment size. * Don't limit the IOMMU merged segment size.
*/ */
dma_set_max_seg_size(dev->dev, 0xffffffff); dma_set_max_seg_size(dev->dev, 0xffffffff);
dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1);
mutex_unlock(&dev->shutdown_lock); mutex_unlock(&dev->shutdown_lock);