x86_64: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
Subsystems (2)
PATCH v2 1/1 x86_64: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
Commit 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions") added .weak directives to arch/x86/lib/mem*_64.S instead of changing the existing ENTRY macros to WEAK. This can lead to the assembly snippet .weak memcpy ... .globl memcpy which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.
Commit ef1e03152cb0 ("x86/asm: Make some functions local") changed ENTRY in arch/x86/lib/memcpy_64.S to SYM_FUNC_START_LOCAL, which was ineffective due to the preceding .weak directive.
Use the appropriate SYM_FUNC_START_WEAK instead.
---
Changes in v2
* Correct the message: SYM_FUNC_START_WEAK was not available at commit 393f203f5fd5.
* Mention Fixes: ef1e03152cb0
--- arch/x86/lib/memcpy_64.S | 4 +--- arch/x86/lib/memmove_64.S | 4 +--- arch/x86/lib/memset_64.S | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
arch/x86/lib/memcpy_64.S +1 -3
@@ -16,8 +16,6 @@ * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. */ -.weak memcpy - /* * memcpy - Copy a memory block. *
@@ -30,7 +28,7 @@ * rax original destination */ SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_LOCAL(memcpy) +SYM_FUNC_START_WEAK(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS
arch/x86/lib/memmove_64.S +1 -3
@@ -24,9 +24,7 @@ * Output: * rax: dest */ -.weak memmove - -SYM_FUNC_START_ALIAS(memmove) +SYM_FUNC_START_WEAK(memmove) SYM_FUNC_START(__memmove) mov %rdi, %rax
arch/x86/lib/memset_64.S +1 -3
@@ -6,8 +6,6 @@ #include <asm/alternative-asm.h> #include <asm/export.h> -.weak memset - /* * ISO C memset - set a memory block to a byte value. This function uses fast * string to get better performance than the original function. The code is
@@ -19,7 +17,7 @@ * * rax original destination */ -SYM_FUNC_START_ALIAS(memset) +SYM_FUNC_START_WEAK(memset) SYM_FUNC_START(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended
Signature · 1 line
2.29.1.341.ge80a0c044ae-goog
Quoted 13 lines · Fangrui Song' via Clang Built Linux
Commit
393f203f5fd5("x86_64: kasan: add interceptors for memset/memmove/memcpy functions") added .weak directives toarch/x86/lib/mem*_64.Sinstead of changing the existing ENTRY macros to WEAK. This can lead to the assembly snippet.weak memcpy ... .globl memcpywhich will produce aSTB_WEAKmemcpy with GNU as butSTB_GLOBALmemcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.Commit
ef1e03152cb0("x86/asm: Make some functions local") changed ENTRY inarch/x86/lib/memcpy_64.StoSYM_FUNC_START_LOCAL, which was ineffective due to the preceding .weak directive.
Quoted 7 lines
Use the appropriate
SYM_FUNC_START_WEAKinstead.Fixes 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions")Fixes ef1e03152cb0 ("x86/asm: Make some functions local")Reported-by Sami Tolvanen <[email protected]>Signed-off-by Fangrui Song <[email protected]>Cc <[email protected]>
This resolves the build error I see with LLVM_IAS=1 and ToT LLVM.
Quoted 76 lines
---
Changes in v2
* Correct the message:SYM_FUNC_START_WEAKwas not available at commit393f203f5fd5.
* Mention Fixes:ef1e03152cb0--- arch/x86/lib/memcpy_64.S | 4 +--- arch/x86/lib/memmove_64.S | 4 +--- arch/x86/lib/memset_64.S | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)arch/x86/lib/memcpy_64.S +1
-3@@ -16,8 +16,6 @@ * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. */ -.weak memcpy - /* * memcpy - Copy a memory block. *@@ -30,7 +28,7 @@ * rax original destination */ SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_LOCAL(memcpy) +SYM_FUNC_START_WEAK(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMSarch/x86/lib/memmove_64.S +1
-3@@ -24,9 +24,7 @@ * Output: * rax: dest */ -.weak memmove - -SYM_FUNC_START_ALIAS(memmove) +SYM_FUNC_START_WEAK(memmove) SYM_FUNC_START(__memmove) mov %rdi, %raxarch/x86/lib/memset_64.S +1
-3@@ -6,8 +6,6 @@ #include <asm/alternative-asm.h> #include <asm/export.h> -.weak memset - /* * ISO C memset - set a memory block to a byte value. This function uses fast * string to get better performance than the original function. The code is@@ -19,7 +17,7 @@ * * rax original destination */ -SYM_FUNC_START_ALIAS(memset) +SYM_FUNC_START_WEAK(memset) SYM_FUNC_START(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommendedSignature · 6 lines
2.29.1.341.ge80a0c044ae-goog -- You received this message because you are subscribed to the Google Groups "Clang Built Linux" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/clang-built-linux/20201103012358.168682-1-maskray%40google.com.
+ LKML so I can find this easier to fetch via b4
Quoted 23 lines · Nathan Chancellor
Quoted 13 lines · Fangrui Song' via Clang Built Linux
Commit
393f203f5fd5("x86_64: kasan: add interceptors for memset/memmove/memcpy functions") added .weak directives toarch/x86/lib/mem*_64.Sinstead of changing the existing ENTRY macros to WEAK. This can lead to the assembly snippet.weak memcpy ... .globl memcpywhich will produce aSTB_WEAKmemcpy with GNU as butSTB_GLOBALmemcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.Commit
ef1e03152cb0("x86/asm: Make some functions local") changed ENTRY inarch/x86/lib/memcpy_64.StoSYM_FUNC_START_LOCAL, which was ineffective due to the preceding .weak directive.Quoted 7 lines
Use the appropriate
SYM_FUNC_START_WEAKinstead.Fixes 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions")Fixes ef1e03152cb0 ("x86/asm: Make some functions local")Reported-by Sami Tolvanen <[email protected]>Signed-off-by Fangrui Song <[email protected]>Cc <[email protected]>
Quoted 3 lines
This resolves the build error I see with LLVM_IAS=1 and ToT LLVM.
Tested-by Nathan Chancellor <[email protected]>
Quoted 71 lines
Quoted 71 lines
---
Changes in v2
* Correct the message:SYM_FUNC_START_WEAKwas not available at commit393f203f5fd5.
* Mention Fixes:ef1e03152cb0--- arch/x86/lib/memcpy_64.S | 4 +--- arch/x86/lib/memmove_64.S | 4 +--- arch/x86/lib/memset_64.S | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)arch/x86/lib/memcpy_64.S +1
-3@@ -16,8 +16,6 @@ * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. */ -.weak memcpy - /* * memcpy - Copy a memory block. *@@ -30,7 +28,7 @@ * rax original destination */ SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_LOCAL(memcpy) +SYM_FUNC_START_WEAK(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMSarch/x86/lib/memmove_64.S +1
-3@@ -24,9 +24,7 @@ * Output: * rax: dest */ -.weak memmove - -SYM_FUNC_START_ALIAS(memmove) +SYM_FUNC_START_WEAK(memmove) SYM_FUNC_START(__memmove) mov %rdi, %raxarch/x86/lib/memset_64.S +1
-4@@ -6,8 +6,6 @@ #include <asm/alternative-asm.h> #include <asm/export.h> -.weak memset - /* * ISO C memset - set a memory block to a byte value. This function uses fast * string to get better performance than the original function. The code is@@ -19,7 +17,7 @@ * * rax original destination */ -SYM_FUNC_START_ALIAS(memset) +SYM_FUNC_START_WEAK(memset) SYM_FUNC_START(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended --
Signature · 2 lines
Thanks, ~Nick Desaulniers
[tip: x86/urgent] x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
In reply to Fangrui SongThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 4d6ffa27b8e5116c0abb318790fd01d4e12d75e6 Gitweb: https://git.kernel.org/tip/4d6ffa27b8e5116c0abb318790fd01d4e12d75e6 Author: Fangrui Song <[email protected]> AuthorDate: Mon, 02 Nov 2020 17:23:58 -08:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 04 Nov 2020 12:30:20 +01:00
x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
Commit
393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions")
added .weak directives to arch/x86/lib/mem*_64.S instead of changing the existing ENTRY macros to WEAK. This can lead to the assembly snippet
.weak memcpy
...
.globl memcpy
which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.
Commit
ef1e03152cb0 ("x86/asm: Make some functions local")
changed ENTRY in arch/x86/lib/memcpy_64.S to SYM_FUNC_START_LOCAL, which was ineffective due to the preceding .weak directive.
Use the appropriate SYM_FUNC_START_WEAK instead.
--- arch/x86/lib/memcpy_64.S | 4 +--- arch/x86/lib/memmove_64.S | 4 +--- arch/x86/lib/memset_64.S | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
arch/x86/lib/memcpy_64.S +1 -3
@@ -16,8 +16,6 @@ * to a jmp to memcpy_erms which does the REP; MOVSB mem copy. */ -.weak memcpy - /* * memcpy - Copy a memory block. *
@@ -30,7 +28,7 @@ * rax original destination */ SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_LOCAL(memcpy) +SYM_FUNC_START_WEAK(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS
arch/x86/lib/memmove_64.S +1 -3
@@ -24,9 +24,7 @@ * Output: * rax: dest */ -.weak memmove - -SYM_FUNC_START_ALIAS(memmove) +SYM_FUNC_START_WEAK(memmove) SYM_FUNC_START(__memmove) mov %rdi, %rax
arch/x86/lib/memset_64.S +1 -3
@@ -6,8 +6,6 @@ #include <asm/alternative-asm.h> #include <asm/export.h> -.weak memset - /* * ISO C memset - set a memory block to a byte value. This function uses fast * string to get better performance than the original function. The code is
@@ -19,7 +17,7 @@ * * rax original destination */ -SYM_FUNC_START_ALIAS(memset) +SYM_FUNC_START_WEAK(memset) SYM_FUNC_START(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended