2022-10-13 19:28:26

by Bhatnagar, Rishabh

Subject: [PATCH 5.15 5.10] nvme-pci: set min_align_mask before calculating max_hw_sectors

commit 61ce339f19fabbc3e51237148a7ef6f2270e44fa 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 <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
---
drivers/nvme/host/pci.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index d820131d39b2..e9f3701dda3f 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2732,6 +2732,8 @@ static void nvme_reset_work(struct work_struct *work)
if (result)
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
* over a single page.
@@ -2744,7 +2746,6 @@ static void nvme_reset_work(struct work_struct *work)
* Don't limit the IOMMU merged segment size.
*/
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);

--
2.37.1

2022-10-16 10:51:38

by Greg KH

Subject: Re: [PATCH 5.15 5.10] nvme-pci: set min_align_mask before calculating max_hw_sectors

On Thu, Oct 13, 2022 at 05:58:27PM +0000, Rishabh Bhatnagar wrote:
> commit 61ce339f19fabbc3e51237148a7ef6f2270e44fa 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 <[email protected]>
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> drivers/nvme/host/pci.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Now queued up, thanks.

greg k-h