2020-03-24 16:15:51

by Peter Zijlstra

Subject: [PATCH v3 03/26] objtool: Rename func_for_each_insn_all()

Now that func_for_each_insn() is available, rename
func_for_each_insn_all(). This gets us:

sym_for_each_insn() - iterate on symbol offset/len
func_for_each_insn() - iterate on insn->func

Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Acked-by: Josh Poimboeuf <[email protected]>
---
tools/objtool/check.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -72,7 +72,7 @@ static struct instruction *next_insn_sam
return find_insn(file, func->cfunc->sec, func->cfunc->offset);
}

-#define func_for_each_insn_all(file, func, insn) \
+#define func_for_each_insn(file, func, insn) \
for (insn = find_insn(file, func->sec, func->offset); \
insn; \
insn = next_insn_same_func(file, insn))
@@ -165,7 +165,7 @@ static bool __dead_end_function(struct o
if (!insn->func)
return false;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
empty = false;

if (insn->type == INSN_RETURN)
@@ -180,7 +180,7 @@ static bool __dead_end_function(struct o
* case, the function's dead-end status depends on whether the target
* of the sibling call returns.
*/
- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (is_sibling_call(insn)) {
struct instruction *dest = insn->jump_dest;

@@ -425,7 +425,7 @@ static void add_ignores(struct objtool_f
continue;
}

- func_for_each_insn_all(file, func, insn)
+ func_for_each_insn(file, func, insn)
insn->ignore = true;
}
}
@@ -1082,7 +1082,7 @@ static void mark_func_jump_tables(struct
struct instruction *insn, *last = NULL;
struct rela *rela;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (!last)
last = insn;

@@ -1117,7 +1117,7 @@ static int add_func_jump_tables(struct o
struct instruction *insn;
int ret;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (!insn->jump_table)
continue;

2020-03-25 08:46:39

by Miroslav Benes

Subject: Re: [PATCH v3 03/26] objtool: Rename func_for_each_insn_all()

On Tue, 24 Mar 2020, Peter Zijlstra wrote:

> Now that func_for_each_insn() is available, rename
> func_for_each_insn_all(). This gets us:
>
> sym_for_each_insn() - iterate on symbol offset/len
> func_for_each_insn() - iterate on insn->func
>
> Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
> Acked-by: Josh Poimboeuf <[email protected]>

Reviewed-by: Miroslav Benes <[email protected]>

M

2020-03-26 10:09:51

by tip-bot2 for Alexey Makhalov

Subject: [tip: core/objtool] objtool: Rename func_for_each_insn_all()

The following commit has been merged into the core/objtool branch of tip:

Commit-ID: f0f70adb78108a0cbc321a07133cd78ea4f84699
Gitweb: https://git.kernel.org/tip/f0f70adb78108a0cbc321a07133cd78ea4f84699
Author: Peter Zijlstra <[email protected]>
AuthorDate: Tue, 10 Mar 2020 18:27:24 +01:00
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Wed, 25 Mar 2020 18:28:27 +01:00

objtool: Rename func_for_each_insn_all()

Now that func_for_each_insn() is available, rename
func_for_each_insn_all(). This gets us:

sym_for_each_insn() - iterate on symbol offset/len
func_for_each_insn() - iterate on insn->func

Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Miroslav Benes <[email protected]>
Acked-by: Josh Poimboeuf <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
tools/objtool/check.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 564ea1d..43f7d3c 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -72,7 +72,7 @@ static struct instruction *next_insn_same_func(struct objtool_file *file,
return find_insn(file, func->cfunc->sec, func->cfunc->offset);
}

-#define func_for_each_insn_all(file, func, insn) \
+#define func_for_each_insn(file, func, insn) \
for (insn = find_insn(file, func->sec, func->offset); \
insn; \
insn = next_insn_same_func(file, insn))
@@ -170,7 +170,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
if (!insn->func)
return false;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
empty = false;

if (insn->type == INSN_RETURN)
@@ -185,7 +185,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
* case, the function's dead-end status depends on whether the target
* of the sibling call returns.
*/
- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (is_sibling_call(insn)) {
struct instruction *dest = insn->jump_dest;

@@ -430,7 +430,7 @@ static void add_ignores(struct objtool_file *file)
continue;
}

- func_for_each_insn_all(file, func, insn)
+ func_for_each_insn(file, func, insn)
insn->ignore = true;
}
}
@@ -1122,7 +1122,7 @@ static void mark_func_jump_tables(struct objtool_file *file,
struct instruction *insn, *last = NULL;
struct rela *rela;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (!last)
last = insn;

@@ -1157,7 +1157,7 @@ static int add_func_jump_tables(struct objtool_file *file,
struct instruction *insn;
int ret;

- func_for_each_insn_all(file, func, insn) {
+ func_for_each_insn(file, func, insn) {
if (!insn->jump_table)
continue;