Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1501431

[tip:core/urgent] objtool: Improve rare switch jump table pattern detection

Show all headers | View raw

Commit-ID:  3732710ff6f2ce2b1b7f044937a422b717d4f953
Gitweb:     http://git.kernel.org/tip/3732710ff6f2ce2b1b7f044937a422b717d4f953
Author:     Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Thu, 13 Oct 2016 16:22:52 -0500
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 16 Oct 2016 09:12:35 +0200

objtool: Improve rare switch jump table pattern detection

GCC 6 added a new switch statement jump table optimization which makes
objtool's life harder.  It looks like:

  mov [rodata addr],%reg1
  ... some instructions ...
  jmpq *(%reg1,%reg2,8)

The optimization is quite rare, but objtool still needs to be able to
identify the pattern so that it can follow all possible control flow
paths related to the switch statement.

In order to detect the pattern, objtool starts from the indirect jump
and scans backwards through the function until it finds the first
instruction in the pattern.  If it encounters an unconditional jump
along the way, it stops and considers the pattern to be not found.

As it turns out, unconditional jumps can happen, as long as they are
small forward jumps within the range being scanned.

This fixes the following warnings:

  drivers/infiniband/sw/rxe/rxe_comp.o: warning: objtool: rxe_completer()+0x2f4: sibling call from callable instruction with changed frame pointer
  drivers/infiniband/sw/rxe/rxe_resp.o: warning: objtool: rxe_responder()+0x10f: sibling call from callable instruction with changed frame pointer

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/8a9ed68ae1780e8d3963e4ee13f2f257fe3a3c33.1476393584.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 tools/objtool/builtin-check.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 143b6cd..a00a05d 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -713,6 +713,7 @@ static struct rela *find_switch_table(struct objtool_file *file,
 				      struct instruction *insn)
 {
 	struct rela *text_rela, *rodata_rela;
+	struct instruction *orig_insn = insn;
 
 	text_rela = find_rela_by_dest_range(insn->sec, insn->offset, insn->len);
 	if (text_rela && text_rela->sym == file->rodata->sym) {
@@ -733,10 +734,16 @@ static struct rela *find_switch_table(struct objtool_file *file,
 
 	/* case 3 */
 	func_for_each_insn_continue_reverse(file, func, insn) {
-		if (insn->type == INSN_JUMP_UNCONDITIONAL ||
-		    insn->type == INSN_JUMP_DYNAMIC)
+		if (insn->type == INSN_JUMP_DYNAMIC)
 			break;
 
+		/* allow small jumps within the range */
+		if (insn->type == INSN_JUMP_UNCONDITIONAL &&
+		    insn->jump_dest &&
+		    (insn->jump_dest->offset <= insn->offset ||
+		     insn->jump_dest->offset >= orig_insn->offset))
+		    break;
+
 		text_rela = find_rela_by_dest_range(insn->sec, insn->offset,
 						    insn->len);
 		if (text_rela && text_rela->sym == file->rodata->sym)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] objtool: a couple of minor fixes Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-13 23:30 +0200
  [PATCH 2/2] objtool: skip all "unreachable instruction" warnings for gcov kernels Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-14 00:20 +0200
    [tip:core/urgent] objtool: Skip all "unreachable instruction"  warnings for gcov kernels tip-bot for Josh Poimboeuf <tipbot@zytor.com> - 2016-10-16 13:30 +0200
  [PATCH 1/2] objtool: improve rare switch jump table pattern detection Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-14 00:20 +0200
    [tip:core/urgent] objtool: Improve rare switch jump table pattern  detection tip-bot for Josh Poimboeuf <tipbot@zytor.com> - 2016-10-16 13:30 +0200
  Re: [PATCH 0/2] objtool: a couple of minor fixes Arnd Bergmann <arnd@arndb.de> - 2016-10-26 11:20 +0200
  Re: [PATCH 0/2] objtool: a couple of minor fixes Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-26 14:50 +0200
    Re: [PATCH 0/2] objtool: a couple of minor fixes Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-26 15:20 +0200
  Re: [PATCH 0/2] objtool: a couple of minor fixes Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-26 14:50 +0200
  [PATCH] objtool: fix rare switch jump table pattern detection Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-26 17:40 +0200
    Re: [PATCH] objtool: fix rare switch jump table pattern detection Arnd Bergmann <arnd@arndb.de> - 2016-10-26 18:10 +0200
      Re: [PATCH] objtool: fix rare switch jump table pattern detection Josh Poimboeuf <jpoimboe@redhat.com> - 2016-10-26 18:50 +0200

csiph-web