Skip to contentSkip to conversation

treewide: prefer __section from compiler_attributes.h

PATCH In review Nick Desaulniers 3 participants 20 messages Aug 28, 2019 – Aug 29, 2019

Subsystems (16)
Arm (32-bit) x86 PowerPC MIPS +12 more subsystems
lore
Share & tools
lore
#0 lore raw

v3 cover treewide: prefer __section from compiler_attributes.h

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:
https://bugs.llvm.org/show_bug.cgi?id=42950
https://marc.info/?l=linux-netdev&m=156412960619946&w=2
https://github.com/ClangBuiltLinux/linux/issues/619

Changes V2 -> V3:
* s/__attribute__((__section/__attribute__((__section__ in commit messages as per Joe.
Changes V1 -> V2:
* drop arm64, arc, and sh patches as they were picked up by their maintainers.
* Split the previous V1 hunk from include/linux that touched include/linux/compiler.h off into its own patch for inclusion in stable, as it fixes a user visible issue.
* Collect Acks and Tested by tags.

Nick Desaulniers (14):
s390/boot: fix section name escaping include/linux/compiler.h: prefer __section from compiler_attributes.h
parisc: prefer __section from compiler_attributes.h
um: prefer __section from compiler_attributes.h
ia64: prefer __section from compiler_attributes.h
arm: prefer __section from compiler_attributes.h
mips: prefer __section from compiler_attributes.h
sparc: prefer __section from compiler_attributes.h
powerpc: prefer __section and __printf from compiler_attributes.h
x86: prefer __section from compiler_attributes.h include/asm-generic: prefer __section from compiler_attributes.h include/linux: prefer __section from compiler_attributes.h include/linux/compiler.h: remove unused KENTRY macro compiler_attributes.h: add note about __section

 arch/arm/include/asm/cache.h          |  2 +-
 arch/arm/include/asm/mach/arch.h      |  4 ++--
 arch/arm/include/asm/setup.h          |  2 +-
 arch/ia64/include/asm/cache.h         |  2 +-
 arch/mips/include/asm/cache.h         |  2 +-
 arch/parisc/include/asm/cache.h       |  2 +-
 arch/parisc/include/asm/ldcw.h        |  2 +-
 arch/powerpc/boot/main.c              |  3 +--
 arch/powerpc/boot/ps3.c               |  6 ++----
 arch/powerpc/include/asm/cache.h      |  2 +-
 arch/powerpc/kernel/btext.c           |  2 +-
 arch/s390/boot/startup.c              |  2 +-
 arch/sparc/include/asm/cache.h        |  2 +-
 arch/sparc/kernel/btext.c             |  2 +-
 arch/um/kernel/um_arch.c              |  6 +++---
 arch/x86/include/asm/cache.h          |  2 +-
 arch/x86/include/asm/intel-mid.h      |  2 +-
 arch/x86/include/asm/iommu_table.h    |  5 ++---
 arch/x86/include/asm/irqflags.h       |  2 +-
 arch/x86/include/asm/mem_encrypt.h    |  2 +-
 arch/x86/kernel/cpu/cpu.h             |  3 +--
 include/asm-generic/error-injection.h |  2 +-
 include/asm-generic/kprobes.h         |  5 ++---
 include/linux/cache.h                 |  6 +++---
 include/linux/compiler.h              | 31 ++++-----------------------
 include/linux/compiler_attributes.h   | 10 +++++++++
 include/linux/cpu.h                   |  2 +-
 include/linux/export.h                |  2 +-
 include/linux/init_task.h             |  4 ++--
 include/linux/interrupt.h             |  5 ++---
 include/linux/sched/debug.h           |  2 +-
 include/linux/srcutree.h              |  2 +-
 32 files changed, 54 insertions(+), 74 deletions(-)
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#1 lore raw

PATCH v3 1/14 s390/boot: fix section name escaping

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.

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:

---
 arch/s390/boot/startup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/boot/startup.c +1 -1
index 7b0d05414618..26493c4ff04b 100644
@@ -46,7 +46,7 @@ struct diag_ops __bootdata_preserved(diag_dma_ops) = {
 	.diag0c = _diag0c_dma,
 	.diag308_reset = _diag308_reset_dma
 };
-static struct diag210 _diag210_tmp_dma __section(".dma.data");
+static struct diag210 _diag210_tmp_dma __section(.dma.data);
 struct diag210 *__bootdata_preserved(__diag210_tmp_dma) = &_diag210_tmp_dma;
 void _swsusp_reset_dma(void);
 unsigned long __bootdata_preserved(__swsusp_reset_dma) = __pa(_swsusp_reset_dma);
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#2 lore raw

PATCH v3 2/14 include/linux/compiler.h: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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:

---
 include/linux/compiler.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/compiler.h +4 -4
index f0fd5636fddb..5e88e7e33abe 100644
@@ -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;
 
 /**
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#3 lore raw

PATCH v3 3/14 parisc: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/parisc/include/asm/cache.h | 2 +-
 arch/parisc/include/asm/ldcw.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/parisc/include/asm/cache.h +1 -1
index 73ca89a47f49..e5de3f897633 100644
@@ -22,7 +22,7 @@
 
 #define ARCH_DMA_MINALIGN	L1_CACHE_BYTES
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 void parisc_cache_init(void);	/* initializes cache-flushing */
 void disable_sr_hashing_asm(int); /* low level support for above */
arch/parisc/include/asm/ldcw.h +1 -1
index 3eb4bfc1fb36..e080143e79a3 100644
@@ -52,7 +52,7 @@
 })
 
 #ifdef CONFIG_SMP
-# define __lock_aligned __attribute__((__section__(".data..lock_aligned")))
+# define __lock_aligned __section(.data..lock_aligned)
 #endif
 
 #endif /* __PARISC_LDCW_H */
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#4 lore raw

PATCH v3 4/14 um: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/um/kernel/um_arch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/um/kernel/um_arch.c +3 -3
index a818ccef30ca..18e0287dd97e 100644
@@ -52,9 +52,9 @@ struct cpuinfo_um boot_cpu_data = {
 	.ipi_pipe		= { -1, -1 }
 };
 
-union thread_union cpu0_irqstack
-	__attribute__((__section__(".data..init_irqstack"))) =
-		{ .thread_info = INIT_THREAD_INFO(init_task) };
+union thread_union cpu0_irqstack __section(.data..init_irqstack) = {
+	.thread_info = INIT_THREAD_INFO(init_task)
+};
 
 /* Changed in setup_arch, which is called in early boot */
 static char host_info[(__NEW_UTS_LEN + 1) * 5];
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#5 lore raw

PATCH v3 5/14 ia64: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/ia64/include/asm/cache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/include/asm/cache.h +1 -1
index 4eb6f742d14f..7decf91ca11a 100644
@@ -25,6 +25,6 @@
 # define SMP_CACHE_BYTES	(1 << 3)
 #endif
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #endif /* _ASM_IA64_CACHE_H */
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#6 lore raw

PATCH v3 6/14 arm: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/arm/include/asm/cache.h     | 2 +-
 arch/arm/include/asm/mach/arch.h | 4 ++--
 arch/arm/include/asm/setup.h     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/include/asm/cache.h +1 -1
index 1d65ed3a2755..cc06079600e0 100644
@@ -24,6 +24,6 @@
 #define ARCH_SLAB_MINALIGN 8
 #endif
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #endif
arch/arm/include/asm/mach/arch.h +2 -2
index e7df5a822cab..2986f6b4862d 100644
@@ -81,7 +81,7 @@ extern const struct machine_desc __arch_info_begin[], __arch_info_end[];
 #define MACHINE_START(_type,_name)			\
 static const struct machine_desc __mach_desc_##_type	\
  __used							\
- __attribute__((__section__(".arch.info.init"))) = {	\
+ __section(.arch.info.init) = {	\
 	.nr		= MACH_TYPE_##_type,		\
 	.name		= _name,
 
@@ -91,7 +91,7 @@ static const struct machine_desc __mach_desc_##_type	\
 #define DT_MACHINE_START(_name, _namestr)		\
 static const struct machine_desc __mach_desc_##_name	\
  __used							\
- __attribute__((__section__(".arch.info.init"))) = {	\
+ __section(.arch.info.init) = {	\
 	.nr		= ~0,				\
 	.name		= _namestr,
 
arch/arm/include/asm/setup.h +1 -1
index 67d20712cb48..00190f1f0574 100644
@@ -14,7 +14,7 @@
 #include <uapi/asm/setup.h>
 
 
-#define __tag __used __attribute__((__section__(".taglist.init")))
+#define __tag __used __section(.taglist.init)
 #define __tagtable(tag, fn) \
 static const struct tagtable __tagtable_##fn __tag = { tag, fn }
 
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#7 lore raw

PATCH v3 7/14 mips: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/mips/include/asm/cache.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/asm/cache.h +1 -1
index 8b14c2706aa5..af2d943580ee 100644
@@ -14,6 +14,6 @@
 #define L1_CACHE_SHIFT		CONFIG_MIPS_L1_CACHE_SHIFT
 #define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #endif /* _ASM_CACHE_H */
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#8 lore raw

PATCH v3 8/14 sparc: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/sparc/include/asm/cache.h | 2 +-
 arch/sparc/kernel/btext.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sparc/include/asm/cache.h +1 -1
index dcfd58118c11..9a9effdd01e2 100644
@@ -21,6 +21,6 @@
 
 #define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT)
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #endif /* !(_SPARC_CACHE_H) */
arch/sparc/kernel/btext.c +1 -1
index 5869773f3dc4..b2eff8f8f27b 100644
@@ -24,7 +24,7 @@ static void draw_byte_32(unsigned char *bits, unsigned int *base, int rb);
 static void draw_byte_16(unsigned char *bits, unsigned int *base, int rb);
 static void draw_byte_8(unsigned char *bits, unsigned int *base, int rb);
 
-#define __force_data __attribute__((__section__(".data")))
+#define __force_data __section(.data)
 
 static int g_loc_X __force_data;
 static int g_loc_Y __force_data;
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#9 lore raw

PATCH v3 9/14 powerpc: prefer __section and __printf from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/powerpc/boot/main.c         | 3 +--
 arch/powerpc/boot/ps3.c          | 6 ++----
 arch/powerpc/include/asm/cache.h | 2 +-
 arch/powerpc/kernel/btext.c      | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
arch/powerpc/boot/main.c +1 -2
index 102cc546444d..3ccc84e06fc4 100644
@@ -150,8 +150,7 @@ static struct addr_range prep_initrd(struct addr_range vmlinux, void *chosen,
  * edit the command line passed to vmlinux (by setting /chosen/bootargs).
  * The buffer is put in it's own section so that tools may locate it easier.
  */
-static char cmdline[BOOT_COMMAND_LINE_SIZE]
-	__attribute__((__section__("__builtin_cmdline")));
+static char cmdline[BOOT_COMMAND_LINE_SIZE] __section(__builtin_cmdline);
 
 static void prep_cmdline(void *chosen)
 {
arch/powerpc/boot/ps3.c +2 -4
index c52552a681c5..70b2ed82d2de 100644
@@ -24,8 +24,7 @@ extern int lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
 #ifdef DEBUG
 #define DBG(fmt...) printf(fmt)
 #else
-static inline int __attribute__ ((format (printf, 1, 2))) DBG(
-	const char *fmt, ...) {return 0;}
+static inline int __printf(1, 2) DBG(const char *fmt, ...) { return 0; }
 #endif
 
 BSS_STACK(4096);
@@ -35,8 +34,7 @@ BSS_STACK(4096);
  * The buffer is put in it's own section so that tools may locate it easier.
  */
 
-static char cmdline[BOOT_COMMAND_LINE_SIZE]
-	__attribute__((__section__("__builtin_cmdline")));
+static char cmdline[BOOT_COMMAND_LINE_SIZE] __section(__builtin_cmdline);
 
 static void prep_cmdline(void *chosen)
 {
arch/powerpc/include/asm/cache.h +1 -1
index 45e3137ccd71..9114495855eb 100644
@@ -91,7 +91,7 @@ static inline u32 l1_cache_bytes(void)
 	isync
 
 #else
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #ifdef CONFIG_PPC_BOOK3S_32
 extern long _get_L2CR(void);
arch/powerpc/kernel/btext.c +1 -1
index 6dfceaa820e4..f57712a55815 100644
@@ -26,7 +26,7 @@
 static void scrollscreen(void);
 #endif
 
-#define __force_data __attribute__((__section__(".data")))
+#define __force_data __section(.data)
 
 static int g_loc_X __force_data;
 static int g_loc_Y __force_data;
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#10 lore raw

PATCH v3 10/14 x86: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 arch/x86/include/asm/cache.h       | 2 +-
 arch/x86/include/asm/intel-mid.h   | 2 +-
 arch/x86/include/asm/iommu_table.h | 5 ++---
 arch/x86/include/asm/irqflags.h    | 2 +-
 arch/x86/include/asm/mem_encrypt.h | 2 +-
 arch/x86/kernel/cpu/cpu.h          | 3 +--
 6 files changed, 7 insertions(+), 9 deletions(-)
arch/x86/include/asm/cache.h +1 -1
index abe08690a887..bb9f4bf4ec02 100644
@@ -8,7 +8,7 @@
 #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
 #define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
 
-#define __read_mostly __attribute__((__section__(".data..read_mostly")))
+#define __read_mostly __section(.data..read_mostly)
 
 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
 #define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
arch/x86/include/asm/intel-mid.h +1 -1
index 8e5af119dc2d..f51f04aefe1b 100644
@@ -43,7 +43,7 @@ struct devs_id {
 
 #define sfi_device(i)								\
 	static const struct devs_id *const __intel_mid_sfi_##i##_dev __used	\
-	__attribute__((__section__(".x86_intel_mid_dev.init"))) = &i
+	__section(.x86_intel_mid_dev.init) = &i
 
 /**
 * struct mid_sd_board_info - template for SD device creation
arch/x86/include/asm/iommu_table.h +2 -3
index 1fb3fd1a83c2..7d190710eb92 100644
@@ -50,9 +50,8 @@ struct iommu_table_entry {
 
 #define __IOMMU_INIT(_detect, _depend, _early_init, _late_init, _finish)\
 	static const struct iommu_table_entry				\
-		__iommu_entry_##_detect __used				\
-	__attribute__ ((unused, __section__(".iommu_table"),		\
-			aligned((sizeof(void *)))))	\
+		__iommu_entry_##_detect __used __section(.iommu_table)	\
+		__aligned((sizeof(void *)))				\
 	= {_detect, _depend, _early_init, _late_init,			\
 	   _finish ? IOMMU_FINISH_IF_DETECTED : 0}
 /*
arch/x86/include/asm/irqflags.h +1 -1
index 8a0e56e1dcc9..68db90bca813 100644
@@ -9,7 +9,7 @@
 #include <asm/nospec-branch.h>
 
 /* Provide __cpuidle; we can't safely include <linux/cpu.h> */
-#define __cpuidle __attribute__((__section__(".cpuidle.text")))
+#define __cpuidle __section(.cpuidle.text)
 
 /*
  * Interrupt control:
arch/x86/include/asm/mem_encrypt.h +1 -1
index 0c196c47d621..db2cd3709148 100644
@@ -50,7 +50,7 @@ void __init mem_encrypt_free_decrypted_mem(void);
 bool sme_active(void);
 bool sev_active(void);
 
-#define __bss_decrypted __attribute__((__section__(".bss..decrypted")))
+#define __bss_decrypted __section(.bss..decrypted)
 
 #else	/* !CONFIG_AMD_MEM_ENCRYPT */
 
arch/x86/kernel/cpu/cpu.h +1 -2
index c0e2407abdd6..7ff9dc41a603 100644
@@ -38,8 +38,7 @@ struct _tlb_table {
 
 #define cpu_dev_register(cpu_devX) \
 	static const struct cpu_dev *const __cpu_dev_##cpu_devX __used \
-	__attribute__((__section__(".x86_cpu_dev.init"))) = \
-	&cpu_devX;
+	__section(.x86_cpu_dev.init) = &cpu_devX;
 
 extern const struct cpu_dev *const __x86_cpu_dev_start[],
 			    *const __x86_cpu_dev_end[];
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#11 lore raw

Re: [PATCH v3 10/14] x86: prefer __section from compiler_attributes.h

Quoted 7 lines · Nick Desaulniers
arch/x86/include/asm/iommu_table.h +0 -0
index 1fb3fd1a83c2..7d190710eb92 100644
@@ -50,9 +50,8 @@ struct iommu_table_entry {
 

arch/x86/include/asm/iommu_table.h struct iommu_table_entry { · line 57

Quoted 10 lines
arch/x86/include/asm/iommu_table.h +2 -3
 #define __IOMMU_INIT(_detect, _depend, _early_init, _late_init, _finish)\
        static const struct iommu_table_entry                           \
-               __iommu_entry_##_detect __used                          \
-       __attribute__ ((unused, __section__(".iommu_table"),            \
-                       aligned((sizeof(void *)))))     \
+               __iommu_entry_##_detect __used __section(.iommu_table)  \
+               __aligned((sizeof(void *)))                             \
        = {_detect, _depend, _early_init, _late_init,                   \
           _finish ? IOMMU_FINISH_IF_DETECTED : 0}
 /*

I see other patches that reduce unused -> to __unused, but is this unused -> __used intended?

Cheers,
Miguel

#12 lore raw

Re: [PATCH v3 10/14] x86: prefer __section from compiler_attributes.h

Quoted 10 lines · Miguel Ojeda
Quoted 7 lines · Nick Desaulniers
arch/x86/include/asm/iommu_table.h +0 -0
index 1fb3fd1a83c2..7d190710eb92 100644
@@ -50,9 +50,8 @@ struct iommu_table_entry {
 
Quoted 12 lines

arch/x86/include/asm/iommu_table.h struct iommu_table_entry { · line 57

Quoted 10 lines
arch/x86/include/asm/iommu_table.h +2 -3
 #define __IOMMU_INIT(_detect, _depend, _early_init, _late_init, _finish)\
        static const struct iommu_table_entry                           \
-               __iommu_entry_##_detect __used                          \
-       __attribute__ ((unused, __section__(".iommu_table"),            \
-                       aligned((sizeof(void *)))))     \
+               __iommu_entry_##_detect __used __section(.iommu_table)  \
+               __aligned((sizeof(void *)))                             \
        = {_detect, _depend, _early_init, _late_init,                   \
           _finish ? IOMMU_FINISH_IF_DETECTED : 0}
 /*

I see other patches that reduce unused -> to __unused, but is this

s/unused/other attrs like aligned and print/

Cheers,
Miguel

#13 lore raw

PATCH v3 11/14 include/asm-generic: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 include/asm-generic/error-injection.h | 2 +-
 include/asm-generic/kprobes.h         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
include/asm-generic/error-injection.h +1 -1
index 95a159a4137f..a593a50b33e3 100644
@@ -23,7 +23,7 @@ struct error_injection_entry {
  */
 #define ALLOW_ERROR_INJECTION(fname, _etype)				\
 static struct error_injection_entry __used				\
-	__attribute__((__section__("_error_injection_whitelist")))	\
+	__section(_error_injection_whitelist)				\
 	_eil_addr_##fname = {						\
 		.addr = (unsigned long)fname,				\
 		.etype = EI_ETYPE_##_etype,				\
include/asm-generic/kprobes.h +2 -3
index 4a982089c95c..20d69719270f 100644
@@ -9,12 +9,11 @@
  * by using this macro.
  */
 # define __NOKPROBE_SYMBOL(fname)				\
-static unsigned long __used					\
-	__attribute__((__section__("_kprobe_blacklist")))	\
+static unsigned long __used __section(_kprobe_blacklist)	\
 	_kbl_addr_##fname = (unsigned long)fname;
 # define NOKPROBE_SYMBOL(fname)	__NOKPROBE_SYMBOL(fname)
 /* Use this to forbid a kprobes attach on very low level functions */
-# define __kprobes	__attribute__((__section__(".kprobes.text")))
+# define __kprobes	__section(.kprobes.text)
 # define nokprobe_inline	__always_inline
 #else
 # define NOKPROBE_SYMBOL(fname)
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#14 lore raw

PATCH v3 12/14 include/linux: prefer __section from compiler_attributes.h

In reply to Nick Desaulniers

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.

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:

---
 include/linux/cache.h       | 6 +++---
 include/linux/cpu.h         | 2 +-
 include/linux/export.h      | 2 +-
 include/linux/init_task.h   | 4 ++--
 include/linux/interrupt.h   | 5 ++---
 include/linux/sched/debug.h | 2 +-
 include/linux/srcutree.h    | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)
include/linux/cache.h +3 -3
index 750621e41d1c..3f4df9eef1e1 100644
@@ -28,7 +28,7 @@
  * but may get written to during init, so can't live in .rodata (via "const").
  */
 #ifndef __ro_after_init
-#define __ro_after_init __attribute__((__section__(".data..ro_after_init")))
+#define __ro_after_init __section(.data..ro_after_init)
 #endif
 
 #ifndef ____cacheline_aligned
@@ -45,8 +45,8 @@
 
 #ifndef __cacheline_aligned
 #define __cacheline_aligned					\
-  __attribute__((__aligned__(SMP_CACHE_BYTES),			\
-		 __section__(".data..cacheline_aligned")))
+	__aligned(SMP_CACHE_BYTES)				\
+	__section(.data..cacheline_aligned)
 #endif /* __cacheline_aligned */
 
 #ifndef __cacheline_aligned_in_smp
include/linux/cpu.h +1 -1
index fcb1386bb0d4..186bbd79d6ce 100644
@@ -166,7 +166,7 @@ void cpu_startup_entry(enum cpuhp_state state);
 void cpu_idle_poll_ctrl(bool enable);
 
 /* Attach to any functions which should be considered cpuidle. */
-#define __cpuidle	__attribute__((__section__(".cpuidle.text")))
+#define __cpuidle	__section(.cpuidle.text)
 
 bool cpu_in_idle(unsigned long pc);
 
include/linux/export.h +1 -1
index fd8711ed9ac4..808c1a0c2ef9 100644
@@ -104,7 +104,7 @@ struct kernel_symbol {
  * discarded in the final link stage.
  */
 #define __ksym_marker(sym)	\
-	static int __ksym_marker_##sym[0] __section(".discard.ksym") __used
+	static int __ksym_marker_##sym[0] __section(.discard.ksym) __used
 
 #define __EXPORT_SYMBOL(sym, sec)				\
 	__ksym_marker(sym);					\
include/linux/init_task.h +2 -2
index 6049baa5b8bc..50139505da34 100644
@@ -51,12 +51,12 @@ extern struct cred init_cred;
 
 /* Attach to the init_task data structure for proper alignment */
 #ifdef CONFIG_ARCH_TASK_STRUCT_ON_STACK
-#define __init_task_data __attribute__((__section__(".data..init_task")))
+#define __init_task_data __section(.data..init_task)
 #else
 #define __init_task_data /**/
 #endif
 
 /* Attach to the thread_info data structure for proper alignment */
-#define __init_thread_info __attribute__((__section__(".data..init_thread_info")))
+#define __init_thread_info __section(.data..init_thread_info)
 
 #endif
include/linux/interrupt.h +2 -3
index 5b8328a99b2a..29debfe4dd0f 100644
@@ -741,8 +741,7 @@ extern int arch_early_irq_init(void);
 /*
  * We want to know which function is an entrypoint of a hardirq or a softirq.
  */
-#define __irq_entry		 __attribute__((__section__(".irqentry.text")))
-#define __softirq_entry  \
-	__attribute__((__section__(".softirqentry.text")))
+#define __irq_entry	__section(.irqentry.text)
+#define __softirq_entry	__section(.softirqentry.text)
 
 #endif
include/linux/sched/debug.h +1 -1
index 95fb9e025247..e17b66221fdd 100644
@@ -42,7 +42,7 @@ extern void proc_sched_set_task(struct task_struct *p);
 #endif
 
 /* Attach to any functions which should be ignored in wchan output. */
-#define __sched		__attribute__((__section__(".sched.text")))
+#define __sched		__section(.sched.text)
 
 /* Linker adds these: start and end of __sched functions */
 extern char __sched_text_start[], __sched_text_end[];
include/linux/srcutree.h +1 -1
index 9cfcc8a756ae..9de652f4e1bd 100644
@@ -124,7 +124,7 @@ struct srcu_struct {
 # define __DEFINE_SRCU(name, is_static)					\
 	is_static struct srcu_struct name;				\
 	struct srcu_struct * const __srcu_struct_##name			\
-		__section("___srcu_struct_ptrs") = &name
+		__section(___srcu_struct_ptrs) = &name
 #else
 # define __DEFINE_SRCU(name, is_static)					\
 	static DEFINE_PER_CPU(struct srcu_data, name##_srcu_data);	\
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#15 lore raw

PATCH v3 13/14 include/linux/compiler.h: remove unused KENTRY macro

In reply to Nick Desaulniers

This macro is not used throughout the kernel. Delete it rather than update the __section to be a fully spelled out __attribute__((__section__())) to avoid
https://bugs.llvm.org/show_bug.cgi?id=42950.

---
 include/linux/compiler.h | 23 -----------------------
 1 file changed, 23 deletions(-)
include/linux/compiler.h +0 -23
index 5e88e7e33abe..f01c1e527f85 100644
@@ -136,29 +136,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 } while (0)
 #endif
 
-/*
- * KENTRY - kernel entry point
- * This can be used to annotate symbols (functions or data) that are used
- * without their linker symbol being referenced explicitly. For example,
- * interrupt vector handlers, or functions in the kernel image that are found
- * programatically.
- *
- * Not required for symbols exported with EXPORT_SYMBOL, or initcalls. Those
- * are handled in their own way (with KEEP() in linker scripts).
- *
- * KENTRY can be avoided if the symbols in question are marked as KEEP() in the
- * linker script. For example an architecture could KEEP() its entire
- * boot/exception vector code rather than annotate each function and data.
- */
-#ifndef KENTRY
-# define KENTRY(sym)						\
-	extern typeof(sym) sym;					\
-	static const unsigned long __kentry_##sym		\
-	__used							\
-	__section("___kentry" "+" #sym )			\
-	= (unsigned long)&sym;
-#endif
-
 #ifndef RELOC_HIDE
 # define RELOC_HIDE(ptr, off)					\
   ({ unsigned long __ptr;					\
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#16 lore raw

PATCH v3 14/14 compiler_attributes.h: add note about __section

In reply to Nick Desaulniers

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.

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:

---
 include/linux/compiler_attributes.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
include/linux/compiler_attributes.h +10 -0
index 6b318efd8a74..f8c008d7f616 100644
@@ -225,6 +225,16 @@
 #define __pure                          __attribute__((__pure__))
 
 /*
+ *  Note: Since this macro makes use of the "stringification operator" `#`, a
+ *        quoted string literal should not be passed to it. eg.
+ *        prefer:
+ *        __section(.foo)
+ *        to:
+ *        __section(".foo")
+ *        unless the section name is dynamically built up, in which case the
+ *        verbose __attribute__((__section__(".foo" x))) should be preferred.
+ *        See also: https://bugs.llvm.org/show_bug.cgi?id=42950
+ *
  *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-section-function-attribute
  *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-section-variable-attribute
  * clang: https://clang.llvm.org/docs/AttributeReference.html#section-declspec-allocate
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
#17 lore raw
In reply to Nick Desaulniers
Quoted 4 lines · Nick Desaulniers

Changes V2 -> V3:
* s/__attribute__((__section/__attribute__((__section__ in commit messages as per Joe.

I have uploaded to -next v3 so that we get some feedback tomorrow rather than waiting for Monday.

I added a few changes, please take a look at the commits:

https://github.com/ojeda/linux/commits/compiler-attributes

and let me know if you agree (look for the [...] text before my signature). Specially this one since it is the one I re-added the unused attribute as __maybe_unused:

https://github.com/ojeda/linux/commit/a103a32ac6a2c8bbb8fb217af92c9f6bd08e138c

Cheers,
Miguel

#18 lore raw
Quoted 8 lines · Miguel Ojeda
Quoted 4 lines · Nick Desaulniers

Changes V2 -> V3:
* s/__attribute__((__section/__attribute__((__section__ in commit messages as per Joe.

Quoted 7 lines

I have uploaded to -next v3 so that we get some feedback tomorrow rather than waiting for Monday.

I added a few changes, please take a look at the commits:

https://github.com/ojeda/linux/commits/compiler-attributes

Thanks for taking care and bringing this to linux-next asap.

- Sedat -

#19 lore raw
Quoted 14 lines · Sedat Dilek
Quoted 11 lines · Miguel Ojeda
Quoted 4 lines · Nick Desaulniers

Changes V2 -> V3:
* s/__attribute__((__section/__attribute__((__section__ in commit messages as per Joe.

I have uploaded to -next v3 so that we get some feedback tomorrow rather than waiting for Monday.

Quoted 6 lines
Quoted 4 lines

I added a few changes, please take a look at the commits:

https://github.com/ojeda/linux/commits/compiler-attributes

Thanks for taking care and bringing this to linux-next asap.

LGTM, thanks Miguel, ship it!

Signature · 2 lines
Thanks,
~Nick Desaulniers