From patchwork Mon Aug 12 21:50:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 171132 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp77186ily; Mon, 12 Aug 2019 14:53:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxBnrUhTrBtcYnimpPp7xpaXinT09Oyi4P+tEL8aQJybn2+Cmk/URW63Zsz8F4FCl4Pb+Pb X-Received: by 2002:aa7:8a99:: with SMTP id a25mr37889226pfc.127.1565646786530; Mon, 12 Aug 2019 14:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565646786; cv=none; d=google.com; s=arc-20160816; b=HQGm7TYW0x3linoamf6DN6r4Z/5rZxJlZ5IPYzEQvjhGShYeNL1tWMcXBLTCum+5eG 6cHtysMqHCBJ79zi6Jwyw9d70HXHIKdvyZZrdXn/tpzx4qGxhDlL0DTYDlWYaYP2CQtf 2lHhc0oBi/pIPRBM6srwrNzDQPgNkq6hxpcHb8hMgfOFNQ30a/rD1MwI8qW2LFcJELC1 2SNjkWFDGGWtIqiF6L/tjnwX0QxjWphSBo0fcQ//JuSfbH/3ayCs70T5Rd/q2BJdofQo D2budEt3HyGFZfJPbGUOOiFYSWMiMWFvv5nezOcnMPrpPeEfsLD5zaVofMm0RJIGIeA5 4prg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=BvdjllFJec+jnIcbVyaNPdSiqXqeyTxUF0Oq2y0JBBs=; b=sVxF9dvE55VRVsAwM0wLUJmxueXEsEOhnvHM3kdKkSNbT5f4POdUL+J7qMhcVurJE4 e9Eh45Z6GV++l1L41/BCv8NDTHBTd01IFuKwEv4X+YOFA1ByyzQtbl+5dwrXoyZgAm+p 0lmv0UttS+ATjNojRAVMNEpCf9ql42SnU0a/Vk8GhrQysVH1ZHyLudtn+LOXe0sXo+XS NFZvKU9j0YDCQEBV9QOxBXXmm6ueo6iwbVqnpGYLqN5cav3x3/NLXis/9LU/37/Rd7V/ lzq4oP2KuBrQqak22URCOL3mgByTSZ6Xvi95s4XmyaOc/fUWWxzsYHNnEJTppSCSOIEb 6T6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=trJf4uh3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u128si59345081pgu.389.2019.08.12.14.53.06; Mon, 12 Aug 2019 14:53:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=trJf4uh3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728000AbfHLVxF (ORCPT + 28 others); Mon, 12 Aug 2019 17:53:05 -0400 Received: from mail-yb1-f202.google.com ([209.85.219.202]:52624 "EHLO mail-yb1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727724AbfHLVxE (ORCPT ); Mon, 12 Aug 2019 17:53:04 -0400 Received: by mail-yb1-f202.google.com with SMTP id e66so72439164ybe.19 for ; Mon, 12 Aug 2019 14:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BvdjllFJec+jnIcbVyaNPdSiqXqeyTxUF0Oq2y0JBBs=; b=trJf4uh35Q+jM8xrFmCBx5akz0qigqRqbkG0gq6EWNOOLO/cOfUvRg1zYN5Krgv3CZ Tp1oZIRrBLfLcNZzy6SSSUo71Csv7Y3cFXPmmR7rvXmaWdO9mbsawI7DguqmCmrmbVpj OelkWG7IFbyN9AnUs4BQf674u45J6BxNK95owQBiAxsnXJTFtmC3i4b2KMu/kGOCGuWe ZqNuQbhRnOMtQHz25dSaqwt4Ubu+FdRkdDanK3J5max+fpx6beFdYmlXC9cOmr4gj4af p2l+5noMg0PDkQDUNn0/RkENSN49fNvUA25zUQaYBr0wEjs6uYeq7Va+qoI/9WmON+TA 96Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BvdjllFJec+jnIcbVyaNPdSiqXqeyTxUF0Oq2y0JBBs=; b=Y8tIR1GgaZXobs6MeYSEbFVgQDjU0QUToOQq/JSH4npM2dsqsWkMFOic77kuGPktFf /625vcEz/Y+wS21V4idIdnR7HWYWS6mkgdC8oul7kJTpqIYOCwfXO+TI3aNTUjKBBgWl 9ArwJpG4iuQg3IaAlGgN1YJLErLKVSoebBjIUjo7p+gAU8WATDH/sUx2xbyDTJR697Y8 8JsXFYa4lUzzhFBcerHEhrN5yvryg50atlOY2UqlbjPl31AVbH2kc36Mojs2Xr1Ytd1j 1TPVMQtKu/Hg00UXklC17wem6bzEFzVC0O22B3NIeBOAoR8DdCxa1544kiDb7bca9x2m EOAA== X-Gm-Message-State: APjAAAWa/NHSBDl4f+Bg4KhitdzVPY3UKcV2qC8Bm6uK5soSTmxV7kj4 SNjN5+uN3cPL/RTFKiZy2wV4LlwLthXFKLbl5oI= X-Received: by 2002:a81:4858:: with SMTP id v85mr13462571ywa.370.1565646782523; Mon, 12 Aug 2019 14:53:02 -0700 (PDT) Date: Mon, 12 Aug 2019 14:50:47 -0700 In-Reply-To: <20190812215052.71840-1-ndesaulniers@google.com> Message-Id: <20190812215052.71840-14-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190812215052.71840-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH 14/16] include/linux: prefer __section from compiler_attributes.h From: Nick Desaulniers To: akpm@linux-foundation.org Cc: sedat.dilek@gmail.com, jpoimboe@redhat.com, yhs@fb.com, miguel.ojeda.sandonis@gmail.com, clang-built-linux@googlegroups.com, Nick Desaulniers , Luc Van Oostenryck , Lai Jiangshan , "Paul E. McKenney" , Josh Triplett , Steven Rostedt , Mathieu Desnoyers , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Thomas Gleixner , Ingo Molnar , "Peter Zijlstra (Intel)" , Nicholas Piggin , Jiri Kosina , Will Deacon , Ard Biesheuvel , Michael Ellerman , Masahiro Yamada , Hans Liljestrand , Elena Reshetova , David Windsor , Marc Zyngier , Ming Lei , Dou Liyang , Julien Thierry , Mauro Carvalho Chehab , Jens Axboe , linux-kernel@vger.kernel.org, linux-sparse@vger.kernel.org, rcu@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Link: https://github.com/ClangBuiltLinux/linux/issues/619 Reported-by: Sedat Dilek Suggested-by: Josh Poimboeuf Signed-off-by: Nick Desaulniers --- include/linux/cache.h | 6 +++--- include/linux/compiler.h | 8 ++++---- 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 +- 8 files changed, 15 insertions(+), 16 deletions(-) -- 2.23.0.rc1.153.gdeed80330f-goog Tested-by: Sedat Dilek [ Linux v5.3-rc5 ] diff --git a/include/linux/cache.h b/include/linux/cache.h index 750621e41d1c..3f4df9eef1e1 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h @@ -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 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; /** diff --git a/include/linux/cpu.h b/include/linux/cpu.h index fcb1386bb0d4..186bbd79d6ce 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -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); diff --git a/include/linux/export.h b/include/linux/export.h index fd8711ed9ac4..808c1a0c2ef9 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -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); \ diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 6049baa5b8bc..50139505da34 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -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 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 5b8328a99b2a..29debfe4dd0f 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -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 diff --git a/include/linux/sched/debug.h b/include/linux/sched/debug.h index 95fb9e025247..e17b66221fdd 100644 --- a/include/linux/sched/debug.h +++ b/include/linux/sched/debug.h @@ -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[]; diff --git a/include/linux/srcutree.h b/include/linux/srcutree.h index 9cfcc8a756ae..9de652f4e1bd 100644 --- a/include/linux/srcutree.h +++ b/include/linux/srcutree.h @@ -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); \