linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: tglx@linutronix.de, jpoimboe@redhat.com
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
	peterz@infradead.org, mhiramat@kernel.org, mbenes@suse.cz
Subject: [PATCH v4 01/13] objtool: Remove CFI save/restore special case
Date: Wed, 25 Mar 2020 18:45:26 +0100	[thread overview]
Message-ID: <20200325174605.369570202@infradead.org> (raw)
In-Reply-To: 20200325174525.772641599@infradead.org

There is a special case in the UNWIND_HINT_RESTORE code. When, upon
looking for the UNWIND_HINT_SAVE instruction to restore from, it finds
the instruction hasn't been visited yet, it normally issues a WARN,
except when this HINT_SAVE instruction is the first instruction of
this branch.

This special case is of dubious correctness and is certainly unused
(verified with an allmodconfig build), the two sites that employ
UNWIND_HINT_SAVE/RESTORE (sync_core() and ftrace_regs_caller()) have
the SAVE on unconditional instructions at the start of the function.
It is therefore impossible for the save_insn not to have been visited
when we do hit the RESTORE.

Remove this.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 tools/objtool/check.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2040,15 +2040,14 @@ static int validate_return(struct symbol
  * tools/objtool/Documentation/stack-validation.txt.
  */
 static int validate_branch(struct objtool_file *file, struct symbol *func,
-			   struct instruction *first, struct insn_state state)
+			   struct instruction *insn, struct insn_state state)
 {
+	struct instruction *next_insn;
 	struct alternative *alt;
-	struct instruction *insn, *next_insn;
 	struct section *sec;
 	u8 visited;
 	int ret;
 
-	insn = first;
 	sec = insn->sec;
 
 	if (insn->alt_group && list_empty(&insn->alts)) {
@@ -2101,16 +2100,6 @@ static int validate_branch(struct objtoo
 				}
 
 				if (!save_insn->visited) {
-					/*
-					 * Oops, no state to copy yet.
-					 * Hopefully we can reach this
-					 * instruction from another branch
-					 * after the save insn has been
-					 * visited.
-					 */
-					if (insn == first)
-						return 0;
-
 					WARN_FUNC("objtool isn't smart enough to handle this CFI save/restore combo",
 						  sec, insn->offset);
 					return 1;



  reply	other threads:[~2020-03-25 17:48 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25 17:45 [PATCH v4 00/13] objtool: vmlinux.o and moinstr validation Peter Zijlstra
2020-03-25 17:45 ` Peter Zijlstra [this message]
2020-03-26 11:30   ` [PATCH v4 01/13] objtool: Remove CFI save/restore special case Peter Zijlstra
2020-03-26 12:58     ` Peter Zijlstra
2020-03-26 13:44       ` Josh Poimboeuf
2020-03-26 15:38         ` Peter Zijlstra
2020-03-27  4:19           ` Josh Poimboeuf
2020-03-26 14:44       ` Miroslav Benes
2020-03-26 15:04         ` Miroslav Benes
2020-03-26 13:00     ` Peter Zijlstra
2020-03-26 13:56     ` Josh Poimboeuf
2020-03-26 15:49       ` Peter Zijlstra
2020-03-26 19:57         ` Peter Zijlstra
2020-03-27  1:00           ` Josh Poimboeuf
2020-03-30 17:02             ` Peter Zijlstra
2020-03-30 19:02               ` Josh Poimboeuf
2020-03-30 20:02                 ` Peter Zijlstra
2020-03-30 20:29                   ` Peter Zijlstra
2020-03-31 11:16                   ` [RFC][PATCH] objtool,ftrace: Implement UNWIND_HINT_RET_OFFSET Peter Zijlstra
2020-03-31 15:31                     ` Steven Rostedt
2020-03-31 16:06                       ` [RFC][PATCH] x86,ftrace: Shrink ftrace_regs_caller() by one byte Peter Zijlstra
2020-03-31 19:58                       ` [RFC][PATCH] objtool,ftrace: Implement UNWIND_HINT_RET_OFFSET Peter Zijlstra
2020-03-31 20:26                         ` Josh Poimboeuf
2020-03-31 20:23                     ` Josh Poimboeuf
2020-03-31 20:40                       ` Peter Zijlstra
2020-03-31 21:07                         ` Peter Zijlstra
2020-03-31 21:17                         ` Josh Poimboeuf
2020-03-31 21:20                           ` Josh Poimboeuf
2020-03-31 22:27                             ` [PATCH v2] " Peter Zijlstra
2020-04-01 14:14                               ` Josh Poimboeuf
2020-04-01 14:22                                 ` Peter Zijlstra
2020-04-01 14:39                                   ` Josh Poimboeuf
2020-04-01 15:38                                     ` Peter Zijlstra
2020-04-01 15:39                                     ` Steven Rostedt
2020-04-01 15:43                               ` Julien Thierry
2020-04-01 17:09                                 ` Peter Zijlstra
2020-04-01 17:33                                   ` Steven Rostedt
2020-04-01 17:45                                     ` Peter Zijlstra
2020-04-01 18:20                                       ` Steven Rostedt
2020-04-01 20:20                                         ` Peter Zijlstra
2020-04-01 17:37                                   ` Josh Poimboeuf
2020-04-02  6:41                                   ` Julien Thierry
2020-04-02  6:56                                     ` Julien Thierry
2020-04-02  7:50                                     ` Peter Zijlstra
2020-04-02  8:16                                       ` Julien Thierry
2020-04-02  8:17                                       ` Peter Zijlstra
2020-04-02  8:29                                         ` Julien Thierry
2020-04-02  8:58                                           ` Miroslav Benes
2020-03-25 17:45 ` [PATCH v4 02/13] objtool: Factor out CFI hints Peter Zijlstra
2020-03-25 18:26   ` Miroslav Benes
2020-03-25 19:41     ` Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 03/13] objtool: Rename struct cfi_state Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 04/13] objtool: Fix !CFI insn_state propagation Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 05/13] objtool: Implement noinstr validation Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 06/13] objtool: Optimize !vmlinux.o again Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 07/13] objtool: Use sec_offset_hash() for insn_hash Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 08/13] objtool: Detect loading function pointers across noinstr Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 09/13] kbuild/objtool: Add objtool-vmlinux.o pass Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 10/13] objtool: Avoid iterating !text section symbols Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 11/13] objtool: Rearrange validate_section() Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 12/13] objtool: Add STT_NOTYPE noinstr validation Peter Zijlstra
2020-03-25 17:45 ` [PATCH v4 13/13] objtool: Also consider .entry.text as noinstr Peter Zijlstra
2020-03-25 19:03 ` [PATCH v4 00/13] objtool: vmlinux.o and moinstr validation Miroslav Benes

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=20200325174605.369570202@infradead.org \
    --to=peterz@infradead.org \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mbenes@suse.cz \
    --cc=mhiramat@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@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).