Skip to content

Commit 258e081

Browse files
committed
percpu: fix clang modpost section mismatch
pcpu_build_alloc_info() is an __init function that makes a call to cpumask_clear_cpu(). With CONFIG_GCOV_PROFILE_ALL enabled, the inline heuristics are modified and such cpumask_clear_cpu() which is marked inline doesn't get inlined. Because it works on mask in __initdata, modpost throws a section mismatch error. Arnd sent a patch with the flatten attribute as an alternative [2]. I've added it to compiler_attributes.h. modpost complaint: WARNING: modpost: vmlinux.o(.text+0x735425): Section mismatch in reference from the function cpumask_clear_cpu() to the variable .init.data:pcpu_build_alloc_info.mask The function cpumask_clear_cpu() references the variable __initdata pcpu_build_alloc_info.mask. This is often because cpumask_clear_cpu lacks a __initdata annotation or the annotation of pcpu_build_alloc_info.mask is wrong. clang output: mm/percpu.c:2724:5: remark: cpumask_clear_cpu not inlined into pcpu_build_alloc_info because too costly to inline (cost=725, threshold=325) [-Rpass-missed=inline] [1] https://lore.kernel.org/linux-mm/202012220454.9F6Bkz9q-lkp@intel.com/ [2] https://lore.kernel.org/lkml/CAK8P3a2ZWfNeXKSm8K_SUhhwkor17jFo3xApLXjzfPqX0eUDUA@mail.gmail.com/ Reported-by: kernel test robot <lkp@intel.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Dennis Zhou <dennis@kernel.org>
1 parent d7d29ac commit 258e081

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

include/linux/compiler_attributes.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@
210210
# define fallthrough do {} while (0) /* fallthrough */
211211
#endif
212212

213+
/*
214+
* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#Common-Function-Attributes
215+
* clang: https://clang.llvm.org/docs/AttributeReference.html#flatten
216+
*/
217+
# define __flatten __attribute__((flatten))
218+
213219
/*
214220
* Note the missing underscores.
215221
*

mm/percpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2663,7 +2663,7 @@ early_param("percpu_alloc", percpu_alloc_setup);
26632663
* On success, pointer to the new allocation_info is returned. On
26642664
* failure, ERR_PTR value is returned.
26652665
*/
2666-
static struct pcpu_alloc_info * __init pcpu_build_alloc_info(
2666+
static struct pcpu_alloc_info * __init __flatten pcpu_build_alloc_info(
26672667
size_t reserved_size, size_t dyn_size,
26682668
size_t atom_size,
26692669
pcpu_fc_cpu_distance_fn_t cpu_distance_fn)

0 commit comments

Comments
 (0)