| Message ID | 20231115203401.2495875-28-iii@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | kmsan: Enable on s390 | expand |
Hi Ilya, kernel test robot noticed the following build errors: [auto build test ERROR on s390/features] [also build test ERROR on akpm-mm/mm-everything linus/master vbabka-slab/for-next v6.7-rc1 next-20231116] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Ilya-Leoshkevich/ftrace-Unpoison-ftrace_regs-in-ftrace_ops_list_func/20231116-045608 base: https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git features patch link: https://lore.kernel.org/r/20231115203401.2495875-28-iii%40linux.ibm.com patch subject: [PATCH 27/32] s390/string: Add KMSAN support config: s390-debug_defconfig (https://download.01.org/0day-ci/archive/20231117/202311170550.bSBo44ix-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231117/202311170550.bSBo44ix-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202311170550.bSBo44ix-lkp@intel.com/ All errors (new ones prefixed by >>): s390-linux-ld: arch/s390/mm/vmem.o: in function `crst_table_init': >> arch/s390/include/asm/pgalloc.h:33:(.text+0x1ba): undefined reference to `memset64' s390-linux-ld: arch/s390/mm/vmem.o: in function `vmem_pte_alloc': >> arch/s390/mm/vmem.c:68:(.ref.text+0x1ec): undefined reference to `memset64' s390-linux-ld: arch/s390/mm/pgalloc.o: in function `base_pgt_alloc': >> arch/s390/mm/pgalloc.c:241:(.text+0x184): undefined reference to `memset64' s390-linux-ld: arch/s390/mm/pgalloc.o: in function `crst_table_init': arch/s390/include/asm/pgalloc.h:33:(.text+0x3e8): undefined reference to `memset64' >> s390-linux-ld: arch/s390/include/asm/pgalloc.h:33:(.text+0x568): undefined reference to `memset64' s390-linux-ld: arch/s390/mm/pgalloc.o:arch/s390/include/asm/pgalloc.h:33: more undefined references to `memset64' follow s390-linux-ld: lib/test_string.o: in function `memset16_selftest': >> lib/test_string.c:19:(.init.text+0x94): undefined reference to `memset16' s390-linux-ld: lib/test_string.o: in function `memset32_selftest': >> lib/test_string.c:55:(.init.text+0x234): undefined reference to `memset32' s390-linux-ld: lib/test_string.o: in function `memset64_selftest': >> lib/test_string.c:91:(.init.text+0x3c2): undefined reference to `memset64' s390-linux-ld: drivers/video/fbdev/core/fbcon.o: in function `scr_memsetw': >> include/linux/vt_buffer.h:36:(.text+0x30f6): undefined reference to `memset16' >> s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x320a): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x32c4): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x33b8): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x4f60): undefined reference to `memset16' s390-linux-ld: drivers/video/fbdev/core/fbcon.o:include/linux/vt_buffer.h:36: more undefined references to `memset16' follow s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_copy_area': >> drivers/tty/vt/vt.c:464:(.text+0x107e): undefined reference to `memset32' >> s390-linux-ld: drivers/tty/vt/vt.c:471:(.text+0x1104): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:471:(.text+0x1118): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:471:(.text+0x1140): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_insert': drivers/tty/vt/vt.c:374:(.text+0x13a4): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o:drivers/tty/vt/vt.c:385: more undefined references to `memset32' follow s390-linux-ld: drivers/tty/vt/vt.o: in function `scr_memsetw': include/linux/vt_buffer.h:36:(.text+0x2844): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x2932): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x2fe8): undefined reference to `memset16' s390-linux-ld: include/linux/vt_buffer.h:36:(.text+0x319c): undefined reference to `memset16' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_line': drivers/tty/vt/vt.c:393:(.text+0x3f78): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_lines': drivers/tty/vt/vt.c:401:(.text+0x3fb8): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x3fe2): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `scr_memsetw': include/linux/vt_buffer.h:36:(.text+0x4018): undefined reference to `memset16' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_lines': drivers/tty/vt/vt.c:401:(.text+0x40de): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x4114): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x4134): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_line': drivers/tty/vt/vt.c:393:(.text+0x417c): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_lines': drivers/tty/vt/vt.c:401:(.text+0x41d6): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o:drivers/tty/vt/vt.c:401: more undefined references to `memset32' follow s390-linux-ld: drivers/tty/vt/vt.o: in function `scr_memsetw': include/linux/vt_buffer.h:36:(.text+0x46d2): undefined reference to `memset16' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_lines': drivers/tty/vt/vt.c:401:(.text+0x4736): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x47b6): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x47f2): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.c:401:(.text+0x482e): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_line': drivers/tty/vt/vt.c:393:(.text+0x7b1a): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `scr_memsetw': include/linux/vt_buffer.h:36:(.text+0x7b30): undefined reference to `memset16' s390-linux-ld: drivers/tty/vt/vt.o: in function `vc_uniscr_clear_line': drivers/tty/vt/vt.c:393:(.text+0x7c7a): undefined reference to `memset32' s390-linux-ld: drivers/tty/vt/vt.o: in function `scr_memsetw': include/linux/vt_buffer.h:36:(.text+0x7c9c): undefined reference to `memset16' s390-linux-ld: drivers/block/zram/zram_drv.o: in function `memset_l': >> include/linux/string.h:168:(.text+0x1860): undefined reference to `memset64' vim +168 include/linux/string.h 3b3c4babd89871 Matthew Wilcox 2017-09-08 161 3b3c4babd89871 Matthew Wilcox 2017-09-08 162 static inline void *memset_l(unsigned long *p, unsigned long v, 3b3c4babd89871 Matthew Wilcox 2017-09-08 163 __kernel_size_t n) 3b3c4babd89871 Matthew Wilcox 2017-09-08 164 { 3b3c4babd89871 Matthew Wilcox 2017-09-08 165 if (BITS_PER_LONG == 32) 3b3c4babd89871 Matthew Wilcox 2017-09-08 166 return memset32((uint32_t *)p, v, n); 3b3c4babd89871 Matthew Wilcox 2017-09-08 167 else 3b3c4babd89871 Matthew Wilcox 2017-09-08 @168 return memset64((uint64_t *)p, v, n); 3b3c4babd89871 Matthew Wilcox 2017-09-08 169 } 3b3c4babd89871 Matthew Wilcox 2017-09-08 170
diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c index faccb33b462c..6d886c84075b 100644 --- a/arch/s390/boot/string.c +++ b/arch/s390/boot/string.c @@ -4,8 +4,14 @@ #include <linux/errno.h> #undef CONFIG_KASAN #undef CONFIG_KASAN_GENERIC +#undef CONFIG_KMSAN #include "../lib/string.c" +/* + * Duplicate some functions from the common lib/string.c + * instead of fully including it. + */ + int strncmp(const char *cs, const char *ct, size_t count) { unsigned char c1, c2; @@ -22,6 +28,15 @@ int strncmp(const char *cs, const char *ct, size_t count) return 0; } +void *memset64(uint64_t *s, uint64_t v, size_t count) +{ + uint64_t *xs = s; + + while (count--) + *xs++ = v; + return s; +} + char *skip_spaces(const char *str) { while (isspace(*str)) diff --git a/arch/s390/include/asm/string.h b/arch/s390/include/asm/string.h index 351685de53d2..94925024cb26 100644 --- a/arch/s390/include/asm/string.h +++ b/arch/s390/include/asm/string.h @@ -15,15 +15,12 @@ #define __HAVE_ARCH_MEMCPY /* gcc builtin & arch function */ #define __HAVE_ARCH_MEMMOVE /* gcc builtin & arch function */ #define __HAVE_ARCH_MEMSET /* gcc builtin & arch function */ -#define __HAVE_ARCH_MEMSET16 /* arch function */ -#define __HAVE_ARCH_MEMSET32 /* arch function */ -#define __HAVE_ARCH_MEMSET64 /* arch function */ void *memcpy(void *dest, const void *src, size_t n); void *memset(void *s, int c, size_t n); void *memmove(void *dest, const void *src, size_t n); -#ifndef CONFIG_KASAN +#if !defined(CONFIG_KASAN) && !defined(CONFIG_KMSAN) #define __HAVE_ARCH_MEMCHR /* inline & arch function */ #define __HAVE_ARCH_MEMCMP /* arch function */ #define __HAVE_ARCH_MEMSCAN /* inline & arch function */ @@ -36,6 +33,9 @@ void *memmove(void *dest, const void *src, size_t n); #define __HAVE_ARCH_STRNCPY /* arch function */ #define __HAVE_ARCH_STRNLEN /* inline & arch function */ #define __HAVE_ARCH_STRSTR /* arch function */ +#define __HAVE_ARCH_MEMSET16 /* arch function */ +#define __HAVE_ARCH_MEMSET32 /* arch function */ +#define __HAVE_ARCH_MEMSET64 /* arch function */ /* Prototypes for non-inlined arch strings functions. */ int memcmp(const void *s1, const void *s2, size_t n); @@ -44,7 +44,7 @@ size_t strlcat(char *dest, const char *src, size_t n); char *strncat(char *dest, const char *src, size_t n); char *strncpy(char *dest, const char *src, size_t n); char *strstr(const char *s1, const char *s2); -#endif /* !CONFIG_KASAN */ +#endif /* !defined(CONFIG_KASAN) && !defined(CONFIG_KMSAN) */ #undef __HAVE_ARCH_STRCHR #undef __HAVE_ARCH_STRNCHR @@ -74,21 +74,6 @@ void *__memset16(uint16_t *s, uint16_t v, size_t count); void *__memset32(uint32_t *s, uint32_t v, size_t count); void *__memset64(uint64_t *s, uint64_t v, size_t count); -static inline void *memset16(uint16_t *s, uint16_t v, size_t count) -{ - return __memset16(s, v, count * sizeof(v)); -} - -static inline void *memset32(uint32_t *s, uint32_t v, size_t count) -{ - return __memset32(s, v, count * sizeof(v)); -} - -static inline void *memset64(uint64_t *s, uint64_t v, size_t count) -{ - return __memset64(s, v, count * sizeof(v)); -} - #if !defined(IN_ARCH_STRING_C) && (!defined(CONFIG_FORTIFY_SOURCE) || defined(__NO_FORTIFY)) #ifdef __HAVE_ARCH_MEMCHR @@ -194,6 +179,27 @@ static inline size_t strnlen(const char * s, size_t n) return end - s; } #endif + +#ifdef __HAVE_ARCH_MEMSET16 +static inline void *memset16(uint16_t *s, uint16_t v, size_t count) +{ + return __memset16(s, v, count * sizeof(v)); +} +#endif + +#ifdef __HAVE_ARCH_MEMSET32 +static inline void *memset32(uint32_t *s, uint32_t v, size_t count) +{ + return __memset32(s, v, count * sizeof(v)); +} +#endif + +#ifdef __HAVE_ARCH_MEMSET64 +static inline void *memset64(uint64_t *s, uint64_t v, size_t count) +{ + return __memset64(s, v, count * sizeof(v)); +} +#endif #else /* IN_ARCH_STRING_C */ void *memchr(const void * s, int c, size_t n); void *memscan(void *s, int c, size_t n); @@ -201,6 +207,9 @@ char *strcat(char *dst, const char *src); char *strcpy(char *dst, const char *src); size_t strlen(const char *s); size_t strnlen(const char * s, size_t n); +void *memset16(uint16_t *s, uint16_t v, size_t count); +void *memset32(uint32_t *s, uint32_t v, size_t count); +void *memset64(uint64_t *s, uint64_t v, size_t count); #endif /* !IN_ARCH_STRING_C */ #endif /* __S390_STRING_H_ */
Add KMSAN support for the s390 implementations of the string functions. Do this similar to how it's already done for KASAN, except that the optimized memset{16,32,64}() functions need to be disabled: it's important for KMSAN to know that they initialized something. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- arch/s390/boot/string.c | 15 +++++++++++ arch/s390/include/asm/string.h | 49 ++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 20 deletions(-)