Commit 7cd0ff82 authored by Rishabh Bhatnagar's avatar Rishabh Bhatnagar Committed by Yong Hu
Browse files

nvme-pci: set min_align_mask before calculating max_hw_sectors 

stable inclusion
from stable-v5.10.150
commit 303436e301ba72021c3894c7a44bcfc1dcf17122
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0XA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=303436e301ba72021c3894c7a44bcfc1dcf17122



--------------------------------

commit 61ce339f 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: default avatarRishabh Bhatnagar <risbhat@amazon.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarYong Hu <yong.hu@windriver.com>
parent 7b1a5167

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -2624,6 +2624,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.
@@ -2636,7 +2638,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);