Patch "swiotlb: mark swiotlb_memblock_alloc() as __init" has been added to the 6.2-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    swiotlb: mark swiotlb_memblock_alloc() as __init

to the 6.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     swiotlb-mark-swiotlb_memblock_alloc-as-__init.patch
and it can be found in the queue-6.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit dd7cff6757d2df49f0115934bd41ae613288f7b9
Author: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Date:   Tue Feb 21 23:04:11 2023 -0800

    swiotlb: mark swiotlb_memblock_alloc() as __init
    
    [ Upstream commit 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 ]
    
    swiotlb_memblock_alloc() calls memblock_alloc(), which calls
    (__init) memblock_alloc_try_nid(). However, swiotlb_membloc_alloc()
    can be marked as __init since it is only called by swiotlb_init_remap(),
    which is already marked as __init. This prevents a modpost build
    warning/error:
    
    WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text)
    WARNING: modpost: vmlinux.o: section mismatch in reference: swiotlb_memblock_alloc (section: .text) -> memblock_alloc_try_nid (section: .init.text)
    
    This fixes the build warning/error seen on ARM64, PPC64, S390, i386,
    and x86_64.
    
    Fixes: 8d58aa484920 ("swiotlb: reduce the swiotlb buffer size on allocation failure")
    Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
    Cc: Alexey Kardashevskiy <aik@xxxxxxx>
    Cc: Christoph Hellwig <hch@xxxxxx>
    Cc: iommu@xxxxxxxxxxxxxxx
    Cc: Mike Rapoport <rppt@xxxxxxxxxx>
    Cc: linux-mm@xxxxxxxxx
    Signed-off-by: Christoph Hellwig <hch@xxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index a34c38bbe28f1..ef3bc3a5bbed3 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -300,7 +300,8 @@ static void swiotlb_init_io_tlb_mem(struct io_tlb_mem *mem, phys_addr_t start,
 	return;
 }
 
-static void *swiotlb_memblock_alloc(unsigned long nslabs, unsigned int flags,
+static void __init *swiotlb_memblock_alloc(unsigned long nslabs,
+		unsigned int flags,
 		int (*remap)(void *tlb, unsigned long nslabs))
 {
 	size_t bytes = PAGE_ALIGN(nslabs << IO_TLB_SHIFT);