Skip to contentSkip to conversation

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

PATCH [email protected] 1 participant 1 message Jul 21, 2023

Subsystems (2)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

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.1-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.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <[email protected]>
Date: Tue, 21 Feb 2023 23:04:11 -0800
Subject: swiotlb: mark swiotlb_memblock_alloc() as __init

From: Randy Dunlap <[email protected]>

commit 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 upstream.

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")
Cc Alexey Kardashevskiy <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Mike Rapoport <[email protected]>
---
 kernel/dma/swiotlb.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/dma/swiotlb.c +2 -1
@@ -324,7 +324,8 @@ static void swiotlb_init_io_tlb_mem(stru
 	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);

Patches currently in stable-queue which might be from [email protected] are

queue-6.1/swiotlb-mark-swiotlb_memblock_alloc-as-__init.patch queue-6.1/wifi-airo-avoid-uninitialized-warning-in-airo_get_ra.patch queue-6.1/scsi-ufs-ufs-mediatek-add-dependency-for-reset_contr.patch