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;
From:   Josh Poimboeuf <jpoimboe@redhat.com>
To:     x86@kernel.org
Cc:     linux-kernel@vger.kernel.org, Borislav Petkov <bp@suse.de>,
        Julien Thierry <jthierry@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 2/3] objtool: Add is_static_jump() helper
Date:   Mon, 10 Feb 2020 12:32:39 -0600
Message-Id: <9b8b438df918276315e4765c60d2587f3c7ad698.1581359535.git.jpoimboe@redhat.com>
In-Reply-To: <cover.1581359535.git.jpoimboe@redhat.com>
References: <cover.1581359535.git.jpoimboe@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

There are several places where objtool tests for a non-dynamic (aka
direct) jump.  Move the check to a helper function.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 tools/objtool/check.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 61d2d1877fd2..5ea2ce7ed8a3 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -97,14 +97,19 @@ static struct instruction *next_insn_same_func(struct=
 objtool_file *file,
 	for (insn =3D next_insn_same_sec(file, insn); insn;		\
 	     insn =3D next_insn_same_sec(file, insn))
=20
+static bool is_static_jump(struct instruction *insn)
+{
+	return insn->type =3D=3D INSN_JUMP_CONDITIONAL ||
+	       insn->type =3D=3D INSN_JUMP_UNCONDITIONAL;
+}
+
 static bool is_sibling_call(struct instruction *insn)
 {
 	/* An indirect jump is either a sibling call or a jump to a table. */
 	if (insn->type =3D=3D INSN_JUMP_DYNAMIC)
 		return list_empty(&insn->alts);
=20
-	if (insn->type !=3D INSN_JUMP_CONDITIONAL &&
-	    insn->type !=3D INSN_JUMP_UNCONDITIONAL)
+	if (!is_static_jump(insn))
 		return false;
=20
 	/* add_jump_destinations() sets insn->call_dest for sibling calls. */
@@ -571,8 +576,7 @@ static int add_jump_destinations(struct objtool_file =
*file)
 	unsigned long dest_off;
=20
 	for_each_insn(file, insn) {
-		if (insn->type !=3D INSN_JUMP_CONDITIONAL &&
-		    insn->type !=3D INSN_JUMP_UNCONDITIONAL)
+		if (!is_static_jump(insn))
 			continue;
=20
 		if (insn->ignore || insn->offset =3D=3D FAKE_JUMP_OFFSET)
@@ -782,8 +786,7 @@ static int handle_group_alt(struct objtool_file *file=
,
 		insn->ignore =3D orig_insn->ignore_alts;
 		insn->func =3D orig_insn->func;
=20
-		if (insn->type !=3D INSN_JUMP_CONDITIONAL &&
-		    insn->type !=3D INSN_JUMP_UNCONDITIONAL)
+		if (!is_static_jump(insn))
 			continue;
=20
 		if (!insn->immediate)
--=20
2.21.1