lib: bitmap: Mute some odd section mismatch warning in xtensa kernel build
PATCH 1/1 lib: bitmap: Mute some odd section mismatch warning in xtensa kernel build
From: Barry Song <[email protected]>
Constanly there are some section mismatch issues reported in test_bitmap for xtensa platform such as:
Section mismatch in reference from the function bitmap_equal() to the variable .init.data:initcall_level_names
The function bitmap_equal() references the variable __initconst __setup_str_initcall_blacklist. This is often because bitmap_equal lacks a __initconst annotation or the annotation of __setup_str_initcall_blacklist is wrong.
Section mismatch in reference from the function bitmap_copy_clear_tail() to the variable .init.rodata:__setup_str_initcall_blacklist The function bitmap_copy_clear_tail() references the variable __initconst __setup_str_initcall_blacklist.
This is often because bitmap_copy_clear_tail lacks a __initconst annotation or the annotation of __setup_str_initcall_blacklist is wrong.
To be honest, hardly to believe kernel code is wrong since bitmap_equal is always called in __init function in test_bitmap.c just like __bitmap_equal. But gcc doesn't report any issue for __bitmap_equal even when bitmap_equal and __bitmap_equal show in the same function such as:
static void noinline __init test_mem_optimisations(void)
{
...
for (start = 0; start < 1024; start += 8) {
for (nbits = 0; nbits < 1024 - start; nbits += 8) {
if (!bitmap_equal(bmap1, bmap2, 1024)) {
failed_tests++;
}
if (!__bitmap_equal(bmap1, bmap2, 1024)) {
failed_tests++;
}
...
}
}}
The different between __bitmap_equal() and bitmap_equal() is that the former is extern and a EXPORT_SYMBOL. So noinline, and probably in fact noclone. But the later is static and unfortunately not inlined at this time though it has a "inline" flag.
bitmap_copy_clear_tail(), on the other hand, seems more innocent as it is accessing stack only by its wrapper bitmap_from_arr32() in function test_bitmap_arr32():
static void __init test_bitmap_arr32(void)
{
unsigned int nbits, next_bit;
u32 arr[EXP1_IN_BITS / 32];
DECLARE_BITMAP(bmap2, EXP1_IN_BITS);
memset(arr, 0xa5, sizeof(arr));
for (nbits = 0; nbits < EXP1_IN_BITS; ++nbits) {
bitmap_to_arr32(arr, exp1, nbits);
bitmap_from_arr32(bmap2, arr, nbits);
expect_eq_bitmap(bmap2, exp1, nbits);
...
}
}Looks like gcc optimized arr, bmap2 things to .init.data but it seems nothing is wrong in kernel since test_bitmap_arr32() is __init.
Max Filippov reported a bug to gcc but gcc people don't ack. So here this patch removes the involved symbols by forcing inline. It might not be that elegant but I don't see any harm as bitmap_equal() and bitmap_copy_clear_tail() are both quite small. In addition, kernel doc also backs this modification "We don't use the 'inline' keyword because it's broken": www.kernel.org/doc/local/inline.html
Another possible way to "fix" the warning is moving the involved symboms to lib/bitmap.c:
+int bitmap_equal(const unsigned long *src1,
+ const unsigned long *src2, unsigned int nbits)
+{
+ if (small_const_nbits(nbits))
+ return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
+ if (__builtin_constant_p(nbits & BITMAP_MEM_MASK) &&
+ IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
+ return !memcmp(src1, src2, nbits / 8);
+ return __bitmap_equal(src1, src2, nbits);
+}
+EXPORT_SYMBOL(bitmap_equal);
This is harmful to the performance.
--- include/linux/bitmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/bitmap.h +2 -2
@@ -258,7 +258,7 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,/* * Copy bitmap and clear tail bits in last word. */ -static inline void bitmap_copy_clear_tail (unsigned long *dst, +static __always_inline void bitmap_copy_clear_tail(unsigned long *dst,const unsigned long *src,unsigned int nbits) {bitmap_copy (dst, src, nbits);
@@ -334,7 +334,7 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr#endif #define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1) -static inline int bitmap_equal (const unsigned long *src1, +static __always_inline int bitmap_equal(const unsigned long *src1,const unsigned long *src2,unsigned int nbits) {if (small_const_nbits (nbits))
Signature · 1 line
2.25.1
Quoted 4 lines · Barry Song
From: Barry Song <[email protected]>
Constanly there are some section mismatch issues reported in
test_bitmap
Constantly
Quoted 9 lines
for xtensa platform such as:
Section mismatch in reference from the function
bitmap_equal()to the variable .init.data:initcall_level_names
The functionbitmap_equal()references the variable__initconst__setup_str_initcall_blacklist. This is often becausebitmap_equallacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistis wrong.
Quoted 8 lines
Section mismatch in reference from the function
bitmap_copy_clear_tail()to the variable .init.rodata:__setup_str_initcall_blacklist The functionbitmap_copy_clear_tail()references the variable__initconst__setup_str_initcall_blacklist.
This is often becausebitmap_copy_clear_taillacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistis wrong.To be honest, hardly to believe kernel code is wrong since
bitmap_equalis
bitmap_equal()
Quoted 1 line
always called in
__initfunction intest_bitmap.cjust like__bitmap_equal.
__bitmap_equal()
Quoted 2 lines
But gcc doesn't report any issue for
__bitmap_equaleven whenbitmap_equaland__bitmap_equalshow in the same function such as:
Ditto as above in both lines.
Quoted 16 lines
static void noinline __init test_mem_optimisations(void)
{
...
for (start = 0; start < 1024; start += 8) {
for (nbits = 0; nbits < 1024 - start; nbits += 8) {
if (!bitmap_equal(bmap1, bmap2, 1024)) {
failed_tests++;
}
if (!__bitmap_equal(bmap1, bmap2, 1024)) {
failed_tests++;
}
...
}
}
}Quoted 2 lines
The different between
__bitmap_equal()andbitmap_equal()is that the former is extern and aEXPORT_SYMBOL. So noinline, and probably in fact
and an EXPORT_SYMBOL
Quoted 1 line
noclone. But the later is static and unfortunately not inlined at this
latter
Quoted 1 line
time though it has a "inline" flag.
has an "inline"
Quoted 18 lines
bitmap_copy_clear_tail(), on the other hand, seems more innocent as it is accessing stack only by its wrapperbitmap_from_arr32()in functiontest_bitmap_arr32():
static void__inittest_bitmap_arr32(void){ unsigned int nbits, next_bit; u32 arr[EXP1_IN_BITS / 32]; DECLARE_BITMAP(bmap2, EXP1_IN_BITS); memset(arr, 0xa5, sizeof(arr)); for (nbits = 0; nbits < EXP1_IN_BITS; ++nbits) { bitmap_to_arr32(arr, exp1, nbits); bitmap_from_arr32(bmap2, arr, nbits); expect_eq_bitmap(bmap2, exp1, nbits); ... } }
Quoted 2 lines
Looks like gcc optimized arr, bmap2 things to .init.data but it seems nothing is wrong in kernel since
test_bitmap_arr32()is__init.
in the kernel
Quoted 9 lines
Max Filippov reported a bug to gcc but gcc people don't ack. So here this patch removes the involved symbols by forcing inline. It might not be that elegant but I don't see any harm as
bitmap_equal()andbitmap_copy_clear_tail()are both quite small. In addition, kernel doc also backs this modification "We don't use the 'inline' keyword because it's broken": www.kernel.org/doc/local/inline.htmlAnother possible way to "fix" the warning is moving the involved symboms to
lib/bitmap.c:
symbols
Quoted 13 lines
+int bitmap_equal(const unsigned long *src1,
+ const unsigned long *src2, unsigned int nbits)
+{
+ if (small_const_nbits(nbits))
+ return !((*src1 ^ *src2) &BITMAP_LAST_WORD_MASK(nbits));
+ if (__builtin_constant_p(nbits & BITMAP_MEM_MASK)&&
+IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
+ return !memcmp(src1, src2, nbits / 8);
+ return__bitmap_equal(src1, src2, nbits);
+}
+EXPORT_SYMBOL(bitmap_equal);
Quoted 1 line
This is harmful to the performance.
I'm afraid it's a bit of a slippery road. These two are currently being used in tests, what if somebody extends tests with something else similar? Will we need to __always_inline more symbols because of that? What about non-bitmap APIs?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 121 lines · Barry Song
Quoted 4 lines
From: Barry Song <[email protected]>
Constanly there are some section mismatch issues reported in
test_bitmapConstantly
Quoted 10 lines
for xtensa platform such as:
Section mismatch in reference from the function
bitmap_equal()to the variable .init.data:initcall_level_names
The functionbitmap_equal()references the variable__initconst__setup_str_initcall_blacklist. This is often becausebitmap_equallacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistis wrong.Section mismatch in reference from the function
bitmap_copy_clear_tail()Quoted 2 lines
to the variable .init.rodata:__setup_str_initcall_blacklist The function
bitmap_copy_clear_tail()references the variable
__initconstQuoted 3 lines
__setup_str_initcall_blacklist.
This is often becausebitmap_copy_clear_taillacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistiswrong.
Quoted 2 lines
To be honest, hardly to believe kernel code is wrong since
bitmap_equalis
bitmap_equal()Quoted 1 line
always called in
__initfunction intest_bitmap.cjust like
__bitmap_equal.
__bitmap_equal()Quoted 1 line
But gcc doesn't report any issue for
__bitmap_equaleven when
bitmap_equalQuoted 1 line
and
__bitmap_equalshow in the same function such as:Ditto as above in both lines.
Quoted 16 lines
static void noinline __init test_mem_optimisations(void) { ... for (start = 0; start < 1024; start += 8) { for (nbits = 0; nbits < 1024 - start; nbits += 8) { if (!bitmap_equal(bmap1, bmap2, 1024)) { failed_tests++; } if (!__bitmap_equal(bmap1, bmap2, 1024)) { failed_tests++; } ... } } }Quoted 2 lines
The different between
__bitmap_equal()andbitmap_equal()is that the former is extern and aEXPORT_SYMBOL. So noinline, and probably in factand an
EXPORT_SYMBOLQuoted 1 line
noclone. But the later is static and unfortunately not inlined at this
latter
Quoted 1 line
time though it has a "inline" flag.
has an "inline"
Quoted 18 lines
bitmap_copy_clear_tail(), on the other hand, seems more innocent as it is accessing stack only by its wrapperbitmap_from_arr32()in functiontest_bitmap_arr32():
static void__inittest_bitmap_arr32(void){ unsigned int nbits, next_bit; u32 arr[EXP1_IN_BITS / 32]; DECLARE_BITMAP(bmap2, EXP1_IN_BITS); memset(arr, 0xa5, sizeof(arr)); for (nbits = 0; nbits < EXP1_IN_BITS; ++nbits) { bitmap_to_arr32(arr, exp1, nbits); bitmap_from_arr32(bmap2, arr, nbits); expect_eq_bitmap(bmap2, exp1, nbits); ... } }Quoted 2 lines
Looks like gcc optimized arr, bmap2 things to .init.data but it seems nothing is wrong in kernel since
test_bitmap_arr32()is__init.in the kernel
Quoted 9 lines
Max Filippov reported a bug to gcc but gcc people don't ack. So here this patch removes the involved symbols by forcing inline. It might not be that elegant but I don't see any harm as
bitmap_equal()andbitmap_copy_clear_tail()are both quite small. In addition, kernel doc also backs this modification "We don't use the 'inline' keyword because it's broken": www.kernel.org/doc/local/inline.htmlAnother possible way to "fix" the warning is moving the involved symboms to
lib/bitmap.c:symbols
Quoted 6 lines
+int bitmap_equal(const unsigned long *src1,
+ const unsigned long *src2, unsigned int nbits)
+{
+ if (small_const_nbits(nbits))
+ return !((*src1 ^ *src2) &
BITMAP_LAST_WORD_MASK(nbits));Quoted 7 lines
+ if (
__builtin_constant_p(nbits & BITMAP_MEM_MASK)&&
+IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
+ return !memcmp(src1, src2, nbits / 8);
+ return__bitmap_equal(src1, src2, nbits);
+}
+EXPORT_SYMBOL(bitmap_equal);
Quoted 7 lines
Quoted 1 line
This is harmful to the performance.
I'm afraid it's a bit of a slippery road. These two are currently being used in tests, what if somebody extends tests with something else similar? Will we need to
__always_inlinemore symbols because of that? What about non-bitmap APIs?
you are right. Andy, we will have to mark those functions one by one if gcc doesn't want to change. actually i am seeing the same issue in lib/find_bit_benchmark.c whose __init functions are also calling static inline bitmap api.
not quite issue if it is specific to xentas. i'd welcome a global gcc option to disable this kind of clone for xentas or i would be happy to see gcc people ack this is a gcc issue.
Quoted 4 lines
--
With Best Regards,
Andy Shevchenko
Thanks
Barry
Yury Norov
maintainerQuoted 66 lines · Barry Song
From: Barry Song <[email protected]>
Constanly there are some section mismatch issues reported in
test_bitmapfor xtensa platform such as:Section mismatch in reference from the function
bitmap_equal()to the variable .init.data:initcall_level_names
The functionbitmap_equal()references the variable__initconst__setup_str_initcall_blacklist. This is often becausebitmap_equallacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistis wrong.Section mismatch in reference from the function
bitmap_copy_clear_tail()to the variable .init.rodata:__setup_str_initcall_blacklist The functionbitmap_copy_clear_tail()references the variable__initconst__setup_str_initcall_blacklist.
This is often becausebitmap_copy_clear_taillacks a__initconstannotation or the annotation of__setup_str_initcall_blacklistis wrong.To be honest, hardly to believe kernel code is wrong since
bitmap_equalis always called in__initfunction intest_bitmap.cjust like__bitmap_equal. But gcc doesn't report any issue for__bitmap_equaleven whenbitmap_equaland__bitmap_equalshow in the same function such as:static void noinline
__inittest_mem_optimisations(void){ ... for (start = 0; start < 1024; start += 8) { for (nbits = 0; nbits < 1024 - start; nbits += 8) { if (!bitmap_equal(bmap1, bmap2, 1024)) { failed_tests++; } if (!__bitmap_equal(bmap1, bmap2, 1024)) { failed_tests++; } ... } }}
The different between
__bitmap_equal()andbitmap_equal()is that the former is extern and aEXPORT_SYMBOL. So noinline, and probably in fact noclone. But the later is static and unfortunately not inlined at this time though it has a "inline" flag.
bitmap_copy_clear_tail(), on the other hand, seems more innocent as it is accessing stack only by its wrapperbitmap_from_arr32()in functiontest_bitmap_arr32():
static void__inittest_bitmap_arr32(void){ unsigned int nbits, next_bit; u32 arr[EXP1_IN_BITS / 32]; DECLARE_BITMAP(bmap2, EXP1_IN_BITS); memset(arr, 0xa5, sizeof(arr)); for (nbits = 0; nbits < EXP1_IN_BITS; ++nbits) { bitmap_to_arr32(arr, exp1, nbits); bitmap_from_arr32(bmap2, arr, nbits); expect_eq_bitmap(bmap2, exp1, nbits); ... } }Looks like gcc optimized arr, bmap2 things to .init.data but it seems nothing is wrong in kernel since
test_bitmap_arr32()is__init.
Quoted 6 lines
Max Filippov reported a bug to gcc but gcc people don't ack. So here this patch removes the involved symbols by forcing inline. It might not be that elegant but I don't see any harm as
bitmap_equal()andbitmap_copy_clear_tail()are both quite small. In addition, kernel doc also backs this modification "We don't use the 'inline' keyword because it's broken": www.kernel.org/doc/local/inline.html
This is a 2006 article. Are you sure nothing has been changed over the last 15 years?
Quoted 2 lines
Another possible way to "fix" the warning is moving the involved symboms to
lib/bitmap.c:
So, it's a GCC issue already reported to GCC? For me it sounds like nothing to fix in kernel. If I was a GCC developer, I'd prefer to have all bugs clearly reproducible.
Let's wait for GCC and xtensa people comments. (CC xtensa and GCC lists)
Yury
Quoted 48 lines
+int bitmap_equal(const unsigned long *src1,
+ const unsigned long *src2, unsigned int nbits)
+{
+ if (small_const_nbits(nbits))
+ return !((*src1 ^ *src2) &BITMAP_LAST_WORD_MASK(nbits));
+ if (__builtin_constant_p(nbits & BITMAP_MEM_MASK)&&
+IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
+ return !memcmp(src1, src2, nbits / 8);
+ return__bitmap_equal(src1, src2, nbits);
+}
+EXPORT_SYMBOL(bitmap_equal);This is harmful to the performance.
Reported-by kernel test robot <[email protected]>Cc Andy Shevchenko <[email protected]>Cc Max Filippov <[email protected]>Cc Andrew Pinski <[email protected]>Signed-off-by Barry Song <[email protected]>--- include/linux/bitmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/bitmap.h +2
-2@@ -258,7 +258,7 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,/* * Copy bitmap and clear tail bits in last word. */ -static inline void bitmap_copy_clear_tail (unsigned long *dst, +static __always_inline void bitmap_copy_clear_tail(unsigned long *dst,const unsigned long *src,unsigned int nbits) {bitmap_copy (dst, src, nbits);@@ -334,7 +334,7 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr#endif #define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1) -static inline int bitmap_equal (const unsigned long *src1, +static __always_inline int bitmap_equal(const unsigned long *src1,const unsigned long *src2,unsigned int nbits) {if (small_const_nbits (nbits))Signature · 1 line
2.25.1