2020-06-08 07:15:43

by Julien Thierry

Subject: [PATCH v2 2/4] objtool: Move orc outside of check

Now that the objtool_file can be obtained outside of the check function,
orc generation builtin no longer requires check to explicitly call its
orc related functions.

Signed-off-by: Julien Thierry <[email protected]>
---
tools/objtool/builtin-check.c | 2 +-
tools/objtool/builtin-orc.c | 18 +++++++++++++++++-
tools/objtool/check.c | 16 +---------------
tools/objtool/objtool.h | 2 +-
tools/objtool/weak.c | 2 +-
5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 9f525d497308..2bd520446ef8 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -58,5 +58,5 @@ int cmd_check(int argc, const char **argv)
if (!file)
return 1;

- return check(file, false);
+ return check(file);
}
diff --git a/tools/objtool/builtin-orc.c b/tools/objtool/builtin-orc.c
index 3b700f477a11..833ce587c3d4 100644
--- a/tools/objtool/builtin-orc.c
+++ b/tools/objtool/builtin-orc.c
@@ -32,6 +32,7 @@ int cmd_orc(int argc, const char **argv)

if (!strncmp(argv[0], "gen", 3)) {
struct objtool_file *file;
+ int ret;

argc = parse_options(argc, argv, check_options, orc_usage, 0);
if (argc != 1)
@@ -43,7 +44,22 @@ int cmd_orc(int argc, const char **argv)
if (!file)
return 1;

- return check(file, true);
+ ret = check(file);
+ if (ret)
+ return ret;
+
+ if (list_empty(&file->insn_list))
+ return 0;
+
+ ret = create_orc(file);
+ if (ret < 0)
+ return ret;
+
+ ret = create_orc_sections(file);
+ if (ret < 0)
+ return ret;
+
+ return elf_write(file->elf);
}

if (!strcmp(argv[0], "dump")) {
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 1638428df454..3fbb60fe94df 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -2709,7 +2709,7 @@ static int validate_reachable_instructions(struct objtool_file *file)
return 0;
}

-int check(struct objtool_file *file, bool orc)
+int check(struct objtool_file *file)
{
int ret, warnings = 0;

@@ -2756,20 +2756,6 @@ int check(struct objtool_file *file, bool orc)
warnings += ret;
}

- if (orc) {
- ret = create_orc(file);
- if (ret < 0)
- goto out;
-
- ret = create_orc_sections(file);
- if (ret < 0)
- goto out;
-
- ret = elf_write(file->elf);
- if (ret < 0)
- goto out;
- }
-
out:
if (ret < 0) {
/*
diff --git a/tools/objtool/objtool.h b/tools/objtool/objtool.h
index e4f0ab5a4094..be526f3d294d 100644
--- a/tools/objtool/objtool.h
+++ b/tools/objtool/objtool.h
@@ -21,7 +21,7 @@ struct objtool_file {

struct objtool_file *objtool_setup_file(const char *_objname, bool writable);

-int check(struct objtool_file *file, bool orc);
+int check(struct objtool_file *file);
int orc_dump(const char *objname);
int create_orc(struct objtool_file *file);
int create_orc_sections(struct objtool_file *file);
diff --git a/tools/objtool/weak.c b/tools/objtool/weak.c
index 82698319f008..29180d599b08 100644
--- a/tools/objtool/weak.c
+++ b/tools/objtool/weak.c
@@ -17,7 +17,7 @@
return ENOSYS; \
})

-int __weak check(struct objtool_file *file, bool orc)
+int __weak check(struct objtool_file *file)
{
UNSUPPORTED("check subcommand");
}
--
2.21.1

2020-06-08 18:55:54

by Matt Helsley

Subject: Re: [PATCH v2 2/4] objtool: Move orc outside of check

On Mon, Jun 08, 2020 at 08:12:01AM +0100, Julien Thierry wrote:
> Now that the objtool_file can be obtained outside of the check function,
> orc generation builtin no longer requires check to explicitly call its
> orc related functions.
>
> Signed-off-by: Julien Thierry <[email protected]>

Reviewed-by: Matt Helsley <[email protected]>

> ---
> tools/objtool/builtin-check.c | 2 +-
> tools/objtool/builtin-orc.c | 18 +++++++++++++++++-
> tools/objtool/check.c | 16 +---------------
> tools/objtool/objtool.h | 2 +-
> tools/objtool/weak.c | 2 +-
> 5 files changed, 21 insertions(+), 19 deletions(-)