From: Nick Desaulniers <ndesaulniers@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Jakub Jelinek <jakub@redhat.com>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-toolchains@vger.kernel.org,
clang-built-linux <clang-built-linux@googlegroups.com>,
Fangrui Song <maskray@google.com>,
Nathan Chancellor <natechancellor@gmail.com>,
Sedat Dilek <sedat.dilek@gmail.com>,
Dmitry Golovin <dima@golovin.in>,
Alistair Delva <adelva@google.com>,
Sami Tolvanen <samitolvanen@google.com>,
stable@vger.kernel.org
Subject: [PATCH v2 1/4] x86_64: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
Date: Tue, 3 Nov 2020 16:53:40 -0800 [thread overview]
Message-ID: <20201104005343.4192504-2-ndesaulniers@google.com> (raw)
In-Reply-To: <20201104005343.4192504-1-ndesaulniers@google.com>
From: Fangrui Song <maskray@google.com>
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.
Fixes: 393f203f5fd5 ("x86_64: kasan: add interceptors for memset/memmove/memcpy functions")
Fixes: ef1e03152cb0 ("x86/asm: Make some functions local")
Reported-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Fangrui Song <maskray@google.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Cc: <stable@vger.kernel.org>
---
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(-)
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index 037faac46b0c..1e299ac73c86 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -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
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
index 7ff00ea64e4f..41902fe8b859 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -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
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index 9ff15ee404a4..0bfd26e4ca9e 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -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
--
2.29.1.341.ge80a0c044ae-goog
next prev parent reply other threads:[~2020-11-04 0:53 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 1:21 [PATCH] Kbuild: implement support for DWARF5 Nick Desaulniers
2020-10-22 1:44 ` Fangrui Song
2020-11-03 22:27 ` Nick Desaulniers
2020-10-28 18:18 ` Nick Desaulniers
2020-11-02 2:20 ` Masahiro Yamada
2020-11-02 8:18 ` Jakub Jelinek
2020-11-03 22:21 ` Nick Desaulniers
2020-11-04 12:19 ` Jakub Jelinek
2020-11-03 22:13 ` Nick Desaulniers
2020-11-04 0:53 ` [PATCH v2 0/4] Kbuild: DWARF v5 support Nick Desaulniers
2020-11-04 0:53 ` Nick Desaulniers [this message]
2020-11-04 0:53 ` [PATCH v2 2/4] Kbuild: do not emit debug info for assembly with LLVM_IAS=1 Nick Desaulniers
2020-11-05 6:58 ` Nathan Chancellor
2020-11-05 7:26 ` Fangrui Song
2020-11-09 18:28 ` Nick Desaulniers
2020-11-09 18:35 ` [PATCH v3] " Nick Desaulniers
2020-11-16 23:41 ` Nick Desaulniers
[not found] ` <CA+SOCLJTg6U+Ddop_5O-baVR42va3vGAvMQ62o9H6rd+10aKrw@mail.gmail.com>
2020-11-23 18:42 ` Nick Desaulniers
2020-11-24 18:44 ` Masahiro Yamada
2020-11-04 0:53 ` [PATCH v2 3/4] Kbuild: make DWARF version a choice Nick Desaulniers
2020-11-05 5:58 ` kernel test robot
2020-11-23 23:22 ` Arvind Sankar
2020-11-24 0:33 ` Segher Boessenkool
2020-11-24 16:56 ` Arvind Sankar
2020-11-24 17:46 ` Segher Boessenkool
2020-11-30 18:04 ` Masahiro Yamada
2020-11-30 20:27 ` Fāng-ruì Sòng
2020-12-01 3:38 ` Masahiro Yamada
2020-12-01 9:32 ` Segher Boessenkool
2020-12-02 1:08 ` Fāng-ruì Sòng
2020-11-30 20:45 ` Nick Desaulniers
2020-12-01 4:17 ` Masahiro Yamada
2020-11-04 0:53 ` [PATCH v2 4/4] Kbuild: implement support for DWARF v5 Nick Desaulniers
2020-11-24 17:28 ` Arvind Sankar
2020-12-03 23:22 ` Nick Desaulniers
2020-12-03 23:28 ` Nick Desaulniers
2020-12-04 17:06 ` Arvind Sankar
2020-12-10 23:18 ` Nick Desaulniers
2020-12-11 0:29 ` Arvind Sankar
2020-12-01 1:56 ` Masahiro Yamada
2020-11-04 0:00 ` [PATCH] Kbuild: implement support for DWARF5 Arvind Sankar
2020-11-04 0:05 ` Nick Desaulniers
2020-11-04 0:17 ` Arvind Sankar
2020-12-03 22:56 ` Nick Desaulniers
2020-12-04 0:17 ` Nick Desaulniers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104005343.4192504-2-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=adelva@google.com \
--cc=clang-built-linux@googlegroups.com \
--cc=dima@golovin.in \
--cc=jakub@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-toolchains@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=maskray@google.com \
--cc=natechancellor@gmail.com \
--cc=samitolvanen@google.com \
--cc=sedat.dilek@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).