From: Greg Kroah-Hartman Date: Sat, 31 Aug 2024 05:32:20 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v4.19.321~45 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82562766585d741048579398d38c874e00d57bec;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: revert-change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch --- diff --git a/queue-6.6/revert-change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch b/queue-6.6/revert-change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch new file mode 100644 index 00000000000..978bfc0605d --- /dev/null +++ b/queue-6.6/revert-change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch @@ -0,0 +1,207 @@ +From b3ead0651a61a75b1296916c71f7db3df8dcfbe0 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Sat, 31 Aug 2024 07:29:34 +0200 +Subject: Revert "change alloc_pages name in dma_map_ops to avoid name conflicts" + +From: Greg Kroah-Hartman + +This reverts commit 983e6b2636f0099dbac1874c9e885bbe1cf2df05 which is +commit 8a2f11878771da65b8ac135c73b47dae13afbd62 upstream. + +It wasn't needed and caused a build break on s390, so just revert it +entirely. + +Reported-by: Nathan Chancellor +Link: https://lore.kernel.org/r/20240830221217.GA3837758@thelio-3990X +Cc: Suren Baghdasaryan +Cc: Kees Cook +Cc: Alexander Viro +Cc: Alex Gaynor +Cc: Alice Ryhl +Cc: Andreas Hindborg +Cc: Benno Lossin +Cc: "Björn Roy Baron" +Cc: Boqun Feng +Cc: Christoph Lameter +Cc: Dennis Zhou +Cc: Gary Guo +Cc: Kent Overstreet +Cc: Miguel Ojeda +Cc: Pasha Tatashin +Cc: Peter Zijlstra +Cc: Tejun Heo +Cc: Vlastimil Babka +Cc: Wedson Almeida Filho +Cc: Andrew Morton +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 ++-- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/x86/kernel/amd_gart_64.c | 2 +- + drivers/iommu/dma-iommu.c | 2 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/xen/grant-dma-ops.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/dma-map-ops.h | 2 +- + kernel/dma/mapping.c | 4 ++-- + 13 files changed, 15 insertions(+), 15 deletions(-) + +--- a/arch/alpha/kernel/pci_iommu.c ++++ b/arch/alpha/kernel/pci_iommu.c +@@ -929,7 +929,7 @@ const struct dma_map_ops alpha_pci_ops = + .dma_supported = alpha_pci_supported, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + EXPORT_SYMBOL(alpha_pci_ops); +--- a/arch/mips/jazz/jazzdma.c ++++ b/arch/mips/jazz/jazzdma.c +@@ -617,7 +617,7 @@ const struct dma_map_ops jazz_dma_ops = + .sync_sg_for_device = jazz_dma_sync_sg_for_device, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + EXPORT_SYMBOL(jazz_dma_ops); +--- a/arch/powerpc/kernel/dma-iommu.c ++++ b/arch/powerpc/kernel/dma-iommu.c +@@ -216,6 +216,6 @@ const struct dma_map_ops dma_iommu_ops = + .get_required_mask = dma_iommu_get_required_mask, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; +--- a/arch/powerpc/platforms/ps3/system-bus.c ++++ b/arch/powerpc/platforms/ps3/system-bus.c +@@ -695,7 +695,7 @@ static const struct dma_map_ops ps3_sb_d + .unmap_page = ps3_unmap_page, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + +@@ -709,7 +709,7 @@ static const struct dma_map_ops ps3_ioc0 + .unmap_page = ps3_unmap_page, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + +--- a/arch/powerpc/platforms/pseries/vio.c ++++ b/arch/powerpc/platforms/pseries/vio.c +@@ -611,7 +611,7 @@ static const struct dma_map_ops vio_dma_ + .get_required_mask = dma_iommu_get_required_mask, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + +--- a/arch/x86/kernel/amd_gart_64.c ++++ b/arch/x86/kernel/amd_gart_64.c +@@ -676,7 +676,7 @@ static const struct dma_map_ops gart_dma + .get_sgtable = dma_common_get_sgtable, + .dma_supported = dma_direct_supported, + .get_required_mask = dma_direct_get_required_mask, +- .alloc_pages_op = dma_direct_alloc_pages, ++ .alloc_pages = dma_direct_alloc_pages, + .free_pages = dma_direct_free_pages, + }; + +--- a/drivers/iommu/dma-iommu.c ++++ b/drivers/iommu/dma-iommu.c +@@ -1614,7 +1614,7 @@ static const struct dma_map_ops iommu_dm + .flags = DMA_F_PCI_P2PDMA_SUPPORTED, + .alloc = iommu_dma_alloc, + .free = iommu_dma_free, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + .alloc_noncontiguous = iommu_dma_alloc_noncontiguous, + .free_noncontiguous = iommu_dma_free_noncontiguous, +--- a/drivers/parisc/ccio-dma.c ++++ b/drivers/parisc/ccio-dma.c +@@ -1022,7 +1022,7 @@ static const struct dma_map_ops ccio_ops + .map_sg = ccio_map_sg, + .unmap_sg = ccio_unmap_sg, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + +--- a/drivers/parisc/sba_iommu.c ++++ b/drivers/parisc/sba_iommu.c +@@ -1090,7 +1090,7 @@ static const struct dma_map_ops sba_ops + .map_sg = sba_map_sg, + .unmap_sg = sba_unmap_sg, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + }; + +--- a/drivers/xen/grant-dma-ops.c ++++ b/drivers/xen/grant-dma-ops.c +@@ -282,7 +282,7 @@ static int xen_grant_dma_supported(struc + static const struct dma_map_ops xen_grant_dma_ops = { + .alloc = xen_grant_dma_alloc, + .free = xen_grant_dma_free, +- .alloc_pages_op = xen_grant_dma_alloc_pages, ++ .alloc_pages = xen_grant_dma_alloc_pages, + .free_pages = xen_grant_dma_free_pages, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +--- a/drivers/xen/swiotlb-xen.c ++++ b/drivers/xen/swiotlb-xen.c +@@ -403,7 +403,7 @@ const struct dma_map_ops xen_swiotlb_dma + .dma_supported = xen_swiotlb_dma_supported, + .mmap = dma_common_mmap, + .get_sgtable = dma_common_get_sgtable, +- .alloc_pages_op = dma_common_alloc_pages, ++ .alloc_pages = dma_common_alloc_pages, + .free_pages = dma_common_free_pages, + .max_mapping_size = swiotlb_max_mapping_size, + }; +--- a/include/linux/dma-map-ops.h ++++ b/include/linux/dma-map-ops.h +@@ -28,7 +28,7 @@ struct dma_map_ops { + unsigned long attrs); + void (*free)(struct device *dev, size_t size, void *vaddr, + dma_addr_t dma_handle, unsigned long attrs); +- struct page *(*alloc_pages_op)(struct device *dev, size_t size, ++ struct page *(*alloc_pages)(struct device *dev, size_t size, + dma_addr_t *dma_handle, enum dma_data_direction dir, + gfp_t gfp); + void (*free_pages)(struct device *dev, size_t size, struct page *vaddr, +--- a/kernel/dma/mapping.c ++++ b/kernel/dma/mapping.c +@@ -570,9 +570,9 @@ static struct page *__dma_alloc_pages(st + size = PAGE_ALIGN(size); + if (dma_alloc_direct(dev, ops)) + return dma_direct_alloc_pages(dev, size, dma_handle, dir, gfp); +- if (!ops->alloc_pages_op) ++ if (!ops->alloc_pages) + return NULL; +- return ops->alloc_pages_op(dev, size, dma_handle, dir, gfp); ++ return ops->alloc_pages(dev, size, dma_handle, dir, gfp); + } + + struct page *dma_alloc_pages(struct device *dev, size_t size, diff --git a/queue-6.6/series b/queue-6.6/series index 31334bf251b..c42b9422a6a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -38,3 +38,4 @@ ovl-fix-wrong-lowerdir-number-check-for-parameter-op.patch ovl-ovl_parse_param_lowerdir-add-missed-n-for-pr_err.patch mm-fix-missing-folio-invalidation-calls-during-trunc.patch cifs-fix-falloc_fl_punch_hole-support.patch +revert-change-alloc_pages-name-in-dma_map_ops-to-avoid-name-conflicts.patch