From b8c7b1dc68baea8259aa2f30066de2277518dc20 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Oct 2022 11:19:14 +0200 Subject: [PATCH] 5.19-stable patches added patches: nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch --- ...sk-before-calculating-max_hw_sectors.patch | 40 +++++++++++++++++++ queue-5.19/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-5.19/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch diff --git a/queue-5.19/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch b/queue-5.19/nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch new file mode 100644 index 00000000000..0856c3f2c38 --- /dev/null +++ b/queue-5.19/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 +@@ -2825,6 +2825,8 @@ static void nvme_reset_work(struct work_ + goto out; + } + ++ dma_set_min_align_mask(dev->dev, NVME_CTRL_PAGE_SIZE - 1); ++ + /* + * If we're called to reset a live controller first shut it down before + * moving on. +@@ -2858,7 +2860,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-5.19/series b/queue-5.19/series index caa06034619..e04e906ad6f 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -3,3 +3,4 @@ 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 ceph-don-t-truncate-file-in-atomic_open.patch +nvme-pci-set-min_align_mask-before-calculating-max_hw_sectors.patch -- 2.47.3