From: Peter Zijlstra <peterz@infradead.org>
To: David Woodhouse <dwmw2@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Josh Poimboeuf <jpoimboe@redhat.com>
Cc: linux-kernel@vger.kernel.org, Dave Hansen <dave.hansen@intel.com>,
Ashok Raj <ashok.raj@intel.com>,
Tim Chen <tim.c.chen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg KH <gregkh@linuxfoundation.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Andi Kleen <ak@linux.intel.com>,
Arjan Van De Ven <arjan.van.de.ven@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Jun Nakajima <jun.nakajima@intel.com>,
Asit Mallick <asit.k.mallick@intel.com>,
Jason Baron <jbaron@akamai.com>
Subject: Re: [PATCH 00/24] objtool: retpoline and asm-goto validation
Date: Tue, 23 Jan 2018 16:42:36 +0100 [thread overview]
Message-ID: <20180123154236.GJ2228@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20180123152539.374360046@infradead.org>
On Tue, Jan 23, 2018 at 04:25:39PM +0100, Peter Zijlstra wrote:
> This series adds two features to objtool:
>
> - retpoline validation; it verifies no indirect jumps/calls are left in
> CONFIG_RETPOLINE=y builds.
>
> includes fixups for kvm and others
>
> - asm-goto validation; allows asserting that a block of code is not reachable
> through a dynamic branch.
>
> After this it forces an asm-goto capable compiler to build arch/x86 and removes
> the fallback code for static_cpu_has(). After which we can use static_cpu_has()
> to guarantee a lack of dynamic branches, which is a requested feature for
> various spectre related things.
x86_64-allmodconfig -KCOV -KASAN +patch gives:
drivers/infiniband/hw/bnxt_re/.tmp_qplib_fp.o: warning: objtool: bnxt_qplib_poll_cq()+0xf8: sibling call from callable instruction with modified stack frame
drivers/watchdog/.tmp_hpwdt.o: warning: objtool: .text+0x24: indirect call found in RETPOLINE build
---
Subject: jump_label: Add static assertion to every static_branch
From: Peter Zijlstra <peterz@infradead.org>
Date: Tue Jan 16 15:27:36 CET 2018
For testing only.. can't use in general because people do:
static_branch() || more-cond
which confuses the living daylight out of objtool validation and
really isn't fixable.
DO NOT MERGE
Not-signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/jump_label.h | 1 +
include/linux/cgroup.h | 2 +-
include/linux/jump_label.h | 15 +++++++++++++--
3 files changed, 15 insertions(+), 3 deletions(-)
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -76,6 +76,7 @@ static __always_inline bool arch_static_
*
* Also works with static_cpu_has().
*/
+#define arch_static_assert arch_static_assert
static __always_inline void arch_static_assert(void)
{
asm volatile ("1:\n\t"
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -88,7 +88,7 @@ extern struct css_set init_css_set;
* @ss: subsystem in question
*/
#define cgroup_subsys_on_dfl(ss) \
- static_branch_likely(&ss ## _on_dfl_key)
+ __static_branch_likely(&ss ## _on_dfl_key)
bool css_has_online_children(struct cgroup_subsys_state *css);
struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss);
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -323,6 +323,10 @@ extern bool ____wrong_branch_error(void)
#ifdef HAVE_JUMP_LABEL
+#ifndef arch_static_assert
+#define arch_static_assert (void)
+#endif
+
/*
* Combine the right initial value (type) with the right branch order
* to generate the desired result.
@@ -379,7 +383,7 @@ extern bool ____wrong_branch_error(void)
* See jump_label_type() / jump_label_init_type().
*/
-#define static_branch_likely(x) \
+#define __static_branch_likely(x) \
({ \
bool branch; \
if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
@@ -391,7 +395,9 @@ extern bool ____wrong_branch_error(void)
likely(branch); \
})
-#define static_branch_unlikely(x) \
+#define static_branch_likely(x) (__static_branch_likely(x) && (arch_static_assert(), true))
+
+#define __static_branch_unlikely(x) \
({ \
bool branch; \
if (__builtin_types_compatible_p(typeof(*x), struct static_key_true)) \
@@ -403,11 +409,16 @@ extern bool ____wrong_branch_error(void)
unlikely(branch); \
})
+#define static_branch_unlikely(x) (__static_branch_unlikely(x) && (arch_static_assert(), true))
+
#else /* !HAVE_JUMP_LABEL */
#define static_branch_likely(x) likely(static_key_enabled(&(x)->key))
#define static_branch_unlikely(x) unlikely(static_key_enabled(&(x)->key))
+#define __static_branch_likely(x) likely(static_key_enabled(&(x)->key))
+#define __static_branch_unlikely(x) unlikely(static_key_enabled(&(x)->key))
+
#endif /* HAVE_JUMP_LABEL */
/*
next prev parent reply other threads:[~2018-01-23 15:42 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 15:25 [PATCH 00/24] objtool: retpoline and asm-goto validation Peter Zijlstra
2018-01-23 15:25 ` [PATCH 01/24] objtool: Use existing global variables for options Peter Zijlstra
2018-01-23 15:25 ` [PATCH 02/24] objtool: Add retpoline validation Peter Zijlstra
2018-01-23 18:21 ` Borislav Petkov
2018-01-26 9:54 ` David Woodhouse
2018-01-23 15:25 ` [PATCH 03/24] x86/paravirt: Annotate indirect calls Peter Zijlstra
2018-01-25 10:02 ` David Woodhouse
2018-01-25 10:22 ` Peter Zijlstra
2018-01-25 10:26 ` Juergen Gross
2018-01-25 10:52 ` David Woodhouse
2018-01-25 11:35 ` Peter Zijlstra
2018-01-26 9:57 ` David Woodhouse
2018-01-29 17:58 ` Josh Poimboeuf
2018-01-29 18:09 ` David Woodhouse
2018-01-29 18:17 ` Peter Zijlstra
2018-01-29 18:38 ` Josh Poimboeuf
2018-01-29 19:21 ` Peter Zijlstra
2018-01-30 16:02 ` Josh Poimboeuf
2018-01-31 4:13 ` [PATCH] x86/paravirt: Remove 'noreplace-paravirt' cmdline option Josh Poimboeuf
2018-01-31 5:59 ` Juergen Gross
2018-01-31 9:42 ` [tip:x86/pti] " tip-bot for Josh Poimboeuf
2018-01-23 15:25 ` [PATCH 04/24] x86,nospec: Annotate indirect calls/jumps Peter Zijlstra
2018-01-26 10:19 ` David Woodhouse
2018-01-29 17:44 ` Peter Zijlstra
2018-01-23 15:25 ` [PATCH 05/24] x86: Annotate indirect jump in head_64.S Peter Zijlstra
2018-01-26 10:24 ` David Woodhouse
2018-01-23 15:25 ` [PATCH 06/24] x86,kvm: Fix indirect calls in emulator Peter Zijlstra
2018-01-23 20:28 ` Borislav Petkov
2018-01-23 20:48 ` David Woodhouse
2018-01-24 10:35 ` Peter Zijlstra
2018-01-24 10:43 ` Paolo Bonzini
2018-01-25 9:34 ` Peter Zijlstra
2018-01-25 9:49 ` David Woodhouse
2018-01-26 10:57 ` Paolo Bonzini
2018-01-23 15:25 ` [PATCH 07/24] x86,vmx: Fix indirect call Peter Zijlstra
2018-01-25 9:36 ` Peter Zijlstra
2018-01-23 15:25 ` [PATCH 08/24] x86,sme: Annotate " Peter Zijlstra
2018-01-26 10:37 ` David Woodhouse
2018-01-29 17:49 ` Peter Zijlstra
2018-01-29 17:50 ` Peter Zijlstra
2018-01-31 9:29 ` Peter Zijlstra
2018-01-31 15:04 ` Josh Poimboeuf
2018-01-31 16:00 ` Peter Zijlstra
2018-01-23 15:25 ` [PATCH 09/24] jump_label: Add branch hints to static_branch_{un,}likely() Peter Zijlstra
2018-01-24 18:46 ` Borislav Petkov
2018-01-23 15:25 ` [PATCH 10/24] sched: Optimize ttwu_stat() Peter Zijlstra
2018-01-23 15:25 ` [PATCH 11/24] x86: Reindent _static_cpu_has Peter Zijlstra
2018-01-23 15:25 ` [PATCH 12/24] x86: Update _static_cpu_has to use all named variables Peter Zijlstra
2018-01-25 19:31 ` Borislav Petkov
2018-01-23 15:25 ` [PATCH 13/24] objtool: Implement base jump_assert support Peter Zijlstra
2018-01-26 10:45 ` David Woodhouse
2018-01-23 15:25 ` [PATCH 14/24] x86: Add a type field to alt_instr Peter Zijlstra
2018-01-23 15:25 ` [PATCH 15/24] x86: Annotate static_cpu_has alternative Peter Zijlstra
2018-01-23 15:25 ` [PATCH 16/24] objtool: Implement jump_assert for _static_cpu_has() Peter Zijlstra
2018-01-23 15:25 ` [PATCH 17/24] objtool: Introduce special_type Peter Zijlstra
2018-01-23 15:25 ` [PATCH 18/24] objtool: More complex static jump implementation Peter Zijlstra
2018-01-23 15:25 ` [PATCH 19/24] objtool: Even more complex static block checks Peter Zijlstra
2018-01-23 15:25 ` [PATCH 20/24] objtool: Another static block fail Peter Zijlstra
2018-01-29 22:52 ` Josh Poimboeuf
2018-01-30 9:56 ` Peter Zijlstra
2018-01-31 3:12 ` Josh Poimboeuf
2018-01-31 10:01 ` Peter Zijlstra
2018-01-31 10:07 ` David Woodhouse
2018-01-31 10:27 ` Peter Zijlstra
2018-01-23 15:26 ` [PATCH 21/24] objtool: Skip static assert when KCOV/KASAN Peter Zijlstra
2018-01-23 15:26 ` [PATCH 22/24] x86/jump_label: Implement arch_static_assert() Peter Zijlstra
2018-01-23 15:26 ` [PATCH 23/24] x86: Force asm-goto Peter Zijlstra
2018-01-23 15:26 ` [PATCH 24/24] x86: Remove FAST_FEATURE_TESTS Peter Zijlstra
2018-01-23 15:42 ` Peter Zijlstra [this message]
2018-01-23 15:57 ` [PATCH 00/24] objtool: retpoline and asm-goto validation David Woodhouse
2018-01-23 16:03 ` Peter Zijlstra
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=20180123154236.GJ2228@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=arjan.van.de.ven@intel.com \
--cc=ashok.raj@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=dwmw2@infradead.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=jpoimboe@redhat.com \
--cc=jun.nakajima@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pbonzini@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.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).