From: Nick Desaulniers <ndesaulniers@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>
Cc: "Michal Marek" <michal.lkml@markovi.net>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
"Kees Cook" <keescook@chromium.org>,
"Tony Luck" <tony.luck@intel.com>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Joe Perches" <joe@perches.com>,
"Joel Fernandes" <joel@joelfernandes.org>,
"Daniel Axtens" <dja@axtens.net>,
"Arvind Sankar" <nivedita@alum.mit.edu>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
"Alexandru Ardelean" <alexandru.ardelean@analog.com>,
"Yury Norov" <yury.norov@gmail.com>,
x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Paul E . McKenney" <paulmck@kernel.org>,
"Daniel Kiper" <daniel.kiper@oracle.com>,
"Bruce Ashfield" <bruce.ashfield@gmail.com>,
"Marco Elver" <elver@google.com>,
"Vamshi K Sthambamkadi" <vamshi.k.sthambamkadi@gmail.com>,
"Andi Kleen" <ak@suse.de>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Dávid Bolvanský" <david.bolvansky@gmail.com>,
"Eli Friedman" <efriedma@quicinc.com>,
"Nick Desaulniers" <ndesaulniers@google.com>
Subject: [PATCH 2/4] Revert "lib/string.c: implement a basic bcmp"
Date: Mon, 17 Aug 2020 15:02:10 -0700 [thread overview]
Message-ID: <20200817220212.338670-3-ndesaulniers@google.com> (raw)
In-Reply-To: <20200817220212.338670-1-ndesaulniers@google.com>
This reverts commit 5f074f3e192f10c9fade898b9b3b8812e3d83342.
Use `-fno-builtin-bcmp` instead.
The issue with using `-fno-builtin-*` flags was that they were not
retained during an LTO link with LLVM. This was fixed in clang-11 by
https://reviews.llvm.org/D71193
(0508c994f0b14144041f2cfd3ba9f9a80f03de08), which is also the minimum
supported version of clang for LTO.
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
Makefile | 1 +
include/linux/string.h | 3 ---
lib/string.c | 20 --------------------
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 211a1b6f6478..722ff5864275 100644
--- a/Makefile
+++ b/Makefile
@@ -964,6 +964,7 @@ endif
# to provide implementations of these routines, then prevent the compiler from
# emitting calls to what will be undefined symbols.
KBUILD_CFLAGS += -fno-builtin-stpcpy
+KBUILD_CFLAGS += -fno-builtin-bcmp
# include additional Makefiles when needed
include-y := scripts/Makefile.extrawarn
diff --git a/include/linux/string.h b/include/linux/string.h
index b1f3894a0a3e..f3bdb74bc230 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -155,9 +155,6 @@ extern void * memscan(void *,int,__kernel_size_t);
#ifndef __HAVE_ARCH_MEMCMP
extern int memcmp(const void *,const void *,__kernel_size_t);
#endif
-#ifndef __HAVE_ARCH_BCMP
-extern int bcmp(const void *,const void *,__kernel_size_t);
-#endif
#ifndef __HAVE_ARCH_MEMCHR
extern void * memchr(const void *,int,__kernel_size_t);
#endif
diff --git a/lib/string.c b/lib/string.c
index 6012c385fb31..69328b8353e1 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -922,26 +922,6 @@ __visible int memcmp(const void *cs, const void *ct, size_t count)
EXPORT_SYMBOL(memcmp);
#endif
-#ifndef __HAVE_ARCH_BCMP
-/**
- * bcmp - returns 0 if and only if the buffers have identical contents.
- * @a: pointer to first buffer.
- * @b: pointer to second buffer.
- * @len: size of buffers.
- *
- * The sign or magnitude of a non-zero return value has no particular
- * meaning, and architectures may implement their own more efficient bcmp(). So
- * while this particular implementation is a simple (tail) call to memcmp, do
- * not rely on anything but whether the return value is zero or non-zero.
- */
-#undef bcmp
-int bcmp(const void *a, const void *b, size_t len)
-{
- return memcmp(a, b, len);
-}
-EXPORT_SYMBOL(bcmp);
-#endif
-
#ifndef __HAVE_ARCH_MEMSCAN
/**
* memscan - Find a character in an area of memory.
--
2.28.0.220.ged08abb693-goog
next prev parent reply other threads:[~2020-08-17 22:02 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 22:02 [PATCH 0/4] -ffreestanding/-fno-builtin-* patches Nick Desaulniers
2020-08-17 22:02 ` [PATCH 1/4] Makefile: add -fno-builtin-stpcpy Nick Desaulniers
2020-08-17 22:31 ` H. Peter Anvin
2020-08-17 23:36 ` Nick Desaulniers
2020-08-18 19:21 ` Kees Cook
2020-08-18 7:10 ` Ard Biesheuvel
2020-08-18 7:25 ` Greg KH
2020-08-18 7:29 ` Ard Biesheuvel
2020-08-18 7:34 ` Greg KH
2020-08-18 19:23 ` Kees Cook
2020-08-17 22:02 ` Nick Desaulniers [this message]
2020-08-18 5:44 ` [PATCH 2/4] Revert "lib/string.c: implement a basic bcmp" Nathan Chancellor
2020-08-18 18:00 ` Nick Desaulniers
2020-08-18 19:24 ` Kees Cook
2020-08-17 22:02 ` [PATCH 3/4] x86/boot: use -fno-builtin-bcmp Nick Desaulniers
2020-08-18 19:24 ` Kees Cook
2020-08-17 22:02 ` [PATCH 4/4] x86: don't build CONFIG_X86_32 as -ffreestanding Nick Desaulniers
2020-08-18 19:24 ` Kees Cook
2021-01-07 0:27 ` Fangrui Song
2022-04-07 15:34 ` [tip: x86/build] x86/build: Don't " tip-bot2 for Nick Desaulniers
2022-04-07 17:01 ` Nick Desaulniers
2022-04-07 22:28 ` Borislav Petkov
2020-08-17 22:44 ` [PATCH 0/4] -ffreestanding/-fno-builtin-* patches H. Peter Anvin
2020-08-18 17:56 ` Nick Desaulniers
2020-08-18 19:02 ` H. Peter Anvin
2020-08-18 19:13 ` Linus Torvalds
2020-08-18 19:25 ` Nick Desaulniers
2020-08-18 19:58 ` Nick Desaulniers
2020-08-19 12:19 ` Clement Courbet
2020-08-18 20:24 ` Arvind Sankar
2020-08-18 20:27 ` Nick Desaulniers
2020-08-18 20:58 ` Nick Desaulniers
2020-08-18 21:41 ` Arvind Sankar
2020-08-18 21:51 ` Dávid Bolvanský
2020-08-18 21:59 ` Nick Desaulniers
2020-08-18 22:05 ` Dávid Bolvanský
2020-08-18 23:22 ` Nick Desaulniers
2020-08-20 14:56 ` Rasmus Villemoes
2020-08-20 17:56 ` Arvind Sankar
2020-08-20 18:05 ` Dávid Bolvanský
2020-08-20 23:33 ` Linus Torvalds
2020-08-21 17:29 ` Arvind Sankar
2020-08-21 17:54 ` Linus Torvalds
2020-08-21 18:02 ` Linus Torvalds
2020-08-21 19:14 ` Arvind Sankar
2020-08-21 19:23 ` Linus Torvalds
2020-08-21 19:57 ` Arvind Sankar
2020-08-21 20:03 ` Peter Zijlstra
2020-08-21 21:39 ` Linus Torvalds
2020-08-22 0:12 ` Nick Desaulniers
2020-08-22 12:20 ` David Laight
2020-08-21 6:45 ` Rasmus Villemoes
2020-08-24 15:57 ` Masahiro Yamada
2020-08-24 17:34 ` Arvind Sankar
2020-08-25 7:10 ` Nick Desaulniers
2020-08-25 7:31 ` Nick Desaulniers
2020-08-25 12:28 ` Masahiro Yamada
2020-08-25 14:02 ` Nick Desaulniers
2020-08-26 13:28 ` Masahiro Yamada
2020-08-18 21:53 ` David Laight
2020-08-20 22:41 ` H. Peter Anvin
2020-08-20 23:17 ` Arvind Sankar
2020-08-18 19:35 ` Nick Desaulniers
2020-08-18 22:25 ` Arvind Sankar
2020-08-18 22:59 ` Nick Desaulniers
2020-08-18 23:51 ` Arvind Sankar
2020-08-19 0:20 ` Arvind Sankar
2020-08-19 8:26 ` David Laight
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=20200817220212.338670-3-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alexandru.ardelean@analog.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=bruce.ashfield@gmail.com \
--cc=daniel.kiper@oracle.com \
--cc=david.bolvansky@gmail.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=efriedma@quicinc.com \
--cc=elver@google.com \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=joel@joelfernandes.org \
--cc=keescook@chromium.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=nivedita@alum.mit.edu \
--cc=paulmck@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=vamshi.k.sthambamkadi@gmail.com \
--cc=x86@kernel.org \
--cc=yury.norov@gmail.com \
/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).