From: Greg Kroah-Hartman Date: Thu, 13 Oct 2022 09:19:23 +0000 (+0200) Subject: 6.0-stable patches X-Git-Tag: v5.4.218~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=140158e7856619d9e6ab327d994418bba5a31541;p=thirdparty%2Fkernel%2Fstable-queue.git 6.0-stable patches added patches: nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch --- diff --git a/queue-6.0/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch b/queue-6.0/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch new file mode 100644 index 00000000000..4e6b29c6a79 --- /dev/null +++ b/queue-6.0/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch @@ -0,0 +1,40 @@ +From 61ce339f19fabbc3e51237148a7ef6f2270e44fa Mon Sep 17 00:00:00 2001 +From: Rishabh Bhatnagar +Date: Tue, 20 Sep 2022 19:19:32 +0000 +Subject: nvme-pci: set min_align_mask before calculating max_hw_sectors + +From: Rishabh Bhatnagar + +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 +Signed-off-by: Christoph Hellwig +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nvme/host/pci.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -2834,6 +2834,8 @@ static void nvme_reset_work(struct work_ + nvme_start_admin_queue(&dev->ctrl); + } + ++ 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. +@@ -2846,7 +2848,6 @@ static void nvme_reset_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); + diff --git a/queue-6.0/series b/queue-6.0/series index 2ca2890811d..0b34584171e 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -2,3 +2,4 @@ nilfs2-fix-null-pointer-dereference-at-nilfs_bmap_lookup_at_level.patch nilfs2-fix-use-after-free-bug-of-struct-nilfs_root.patch nilfs2-fix-leak-of-nilfs_root-in-case-of-writer-thread-creation-failure.patch nilfs2-replace-warn_ons-by-nilfs_error-for-checkpoint-acquisition-failure.patch +nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch