From: Nick Desaulniers <ndesaulniers@google.com>
To: miguel.ojeda.sandonis@gmail.com
Cc: sedat.dilek@gmail.com, will@kernel.org, jpoimboe@redhat.com,
naveen.n.rao@linux.vnet.ibm.com, davem@davemloft.net,
paul.burton@mips.com, clang-built-linux@googlegroups.com,
linux-kernel@vger.kernel.org,
Nick Desaulniers <ndesaulniers@google.com>,
stable@vger.kernel.org
Subject: [PATCH v2 02/14] include/linux/compiler.h: prefer __section from compiler_attributes.h
Date: Tue, 27 Aug 2019 13:39:55 -0700 [thread overview]
Message-ID: <20190827204007.201890-3-ndesaulniers@google.com> (raw)
In-Reply-To: <20190827204007.201890-1-ndesaulniers@google.com>
GCC unescapes escaped string section names while Clang does not. Because
__section uses the `#` stringification operator for the section name, it
doesn't need to be escaped.
This fixes an Oops observed in distro's that use systemd and not
net.core.bpf_jit_enable=1, when their kernels are compiled with Clang.
Instead, we should:
1. Prefer __section(.section_name_no_quotes).
2. Only use __attribute__((__section(".section"))) when creating the
section name via C preprocessor (see the definition of __define_initcall
in arch/um/include/shared/init.h).
This antipattern was found with:
$ grep -e __section\(\" -e __section__\(\" -r
See the discussions in:
Link: https://bugs.llvm.org/show_bug.cgi?id=42950
Link: https://marc.info/?l=linux-netdev&m=156412960619946&w=2
Link: Link: https://github.com/ClangBuiltLinux/linux/issues/619
Cc: <stable@vger.kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Suggested-by: Josh Poimboeuf <jpoimboe@redhat.com>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
include/linux/compiler.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index f0fd5636fddb..5e88e7e33abe 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -24,7 +24,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
long ______r; \
static struct ftrace_likely_data \
__aligned(4) \
- __section("_ftrace_annotated_branch") \
+ __section(_ftrace_annotated_branch) \
______f = { \
.data.func = __func__, \
.data.file = __FILE__, \
@@ -60,7 +60,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
#define __trace_if_value(cond) ({ \
static struct ftrace_branch_data \
__aligned(4) \
- __section("_ftrace_branch") \
+ __section(_ftrace_branch) \
__if_trace = { \
.func = __func__, \
.file = __FILE__, \
@@ -118,7 +118,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
".popsection\n\t"
/* Annotate a C jump table to allow objtool to follow the code flow */
-#define __annotate_jump_table __section(".rodata..c_jump_table")
+#define __annotate_jump_table __section(.rodata..c_jump_table)
#else
#define annotate_reachable()
@@ -298,7 +298,7 @@ unsigned long read_word_at_a_time(const void *addr)
* visible to the compiler.
*/
#define __ADDRESSABLE(sym) \
- static void * __section(".discard.addressable") __used \
+ static void * __section(.discard.addressable) __used \
__PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
/**
--
2.23.0.187.g17f5b7556c-goog
next prev parent reply other threads:[~2019-08-27 20:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 20:39 [PATCH v2 00/14] treewide: prefer __section from compiler_attributes.h Nick Desaulniers
2019-08-27 20:39 ` [PATCH v2 01/14] s390/boot: perfer " Nick Desaulniers
2019-08-27 20:39 ` Nick Desaulniers [this message]
2019-08-27 20:39 ` [PATCH v2 03/14] parisc: prefer " Nick Desaulniers
2019-08-27 20:39 ` [PATCH v2 04/14] um: " Nick Desaulniers
2019-08-27 20:39 ` [PATCH v2 05/14] ia64: " Nick Desaulniers
2019-08-27 20:39 ` [PATCH v2 06/14] arm: " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 07/14] mips: " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 08/14] sparc: " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 09/14] powerpc: prefer __section and __printf " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 10/14] x86: prefer __section " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 11/14] include/asm-generic: " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 12/14] include/linux: " Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 13/14] include/linux/compiler.h: remove unused KENTRY macro Nick Desaulniers
2019-08-27 20:40 ` [PATCH v2 14/14] compiler_attributes.h: add note about __section Nick Desaulniers
2019-08-28 2:47 ` [PATCH v2 00/14] treewide: prefer __section from compiler_attributes.h Joe Perches
2019-08-28 22:44 ` Nick Desaulniers
2019-08-28 9:59 ` Sedat Dilek
2019-08-28 22:44 ` Nick Desaulniers
2019-08-29 9:05 ` Sedat Dilek
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=20190827204007.201890-3-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=clang-built-linux@googlegroups.com \
--cc=davem@davemloft.net \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=paul.burton@mips.com \
--cc=sedat.dilek@gmail.com \
--cc=stable@vger.kernel.org \
--cc=will@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).