mirror of https://lore.kernel.org/lkml/
 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,
	brgerst@gmail.com
Subject: [PATCH v2 06/19] objtool: Add a statistics mode
Date: Tue, 17 Mar 2020 18:02:40 +0100	[thread overview]
Message-ID: <20200317170910.118361227@infradead.org> (raw)
In-Reply-To: <20200317170234.897520633@infradead.org>

Have it print a few numbers which can be used to size the hashtables.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
 tools/objtool/builtin-check.c |    3 ++-
 tools/objtool/builtin.h       |    2 +-
 tools/objtool/check.c         |    5 +++++
 tools/objtool/elf.c           |   18 +++++++++++++++++-
 4 files changed, 25 insertions(+), 3 deletions(-)

--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -17,7 +17,7 @@
 #include "builtin.h"
 #include "check.h"
 
-bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess;
+bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats;
 
 static const char * const check_usage[] = {
 	"objtool check [<options>] file.o",
@@ -31,6 +31,7 @@ const struct option check_options[] = {
 	OPT_BOOLEAN('m', "module", &module, "Indicates the object will be part of a kernel module"),
 	OPT_BOOLEAN('b', "backtrace", &backtrace, "unwind on error"),
 	OPT_BOOLEAN('a', "uaccess", &uaccess, "enable uaccess checking"),
+	OPT_BOOLEAN('s', "stats", &stats, "print statistics"),
 	OPT_END(),
 };
 
--- a/tools/objtool/builtin.h
+++ b/tools/objtool/builtin.h
@@ -8,7 +8,7 @@
 #include <subcmd/parse-options.h>
 
 extern const struct option check_options[];
-extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess;
+extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats;
 
 extern int cmd_check(int argc, const char **argv);
 extern int cmd_orc(int argc, const char **argv);
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -239,6 +239,7 @@ static int decode_instructions(struct ob
 	struct symbol *func;
 	unsigned long offset;
 	struct instruction *insn;
+	unsigned long nr_insns = 0;
 	int ret;
 
 	for_each_sec(file, sec) {
@@ -274,6 +275,7 @@ static int decode_instructions(struct ob
 
 			hash_add(file->insn_hash, &insn->hash, insn->offset);
 			list_add_tail(&insn->list, &file->insn_list);
+			nr_insns++;
 		}
 
 		list_for_each_entry(func, &sec->symbol_list, list) {
@@ -291,6 +293,9 @@ static int decode_instructions(struct ob
 		}
 	}
 
+	if (stats)
+		printf("nr_insns: %lu\n", nr_insns);
+
 	return 0;
 
 err:
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include "builtin.h"
 
 #include "elf.h"
 #include "warn.h"
@@ -202,6 +203,9 @@ static int read_sections(struct elf *elf
 		sec->len = sec->sh.sh_size;
 	}
 
+	if (stats)
+		printf("nr_sections: %lu\n", (unsigned long)sections_nr);
+
 	/* sanity check, one more call to elf_nextscn() should return NULL */
 	if (elf_nextscn(elf->elf, s)) {
 		WARN("section entry mismatch");
@@ -299,6 +303,9 @@ static int read_symbols(struct elf *elf)
 		hash_add(elf->symbol_hash, &sym->hash, sym->idx);
 	}
 
+	if (stats)
+		printf("nr_symbols: %lu\n", (unsigned long)symbols_nr);
+
 	/* Create parent/child links for any cold subfunctions */
 	list_for_each_entry(sec, &elf->sections, list) {
 		list_for_each_entry(sym, &sec->symbol_list, list) {
@@ -360,6 +367,7 @@ static int read_relas(struct elf *elf)
 	struct rela *rela;
 	int i;
 	unsigned int symndx;
+	unsigned long nr_rela, max_rela = 0, tot_rela = 0;
 
 	list_for_each_entry(sec, &elf->sections, list) {
 		if (sec->sh.sh_type != SHT_RELA)
@@ -374,6 +382,7 @@ static int read_relas(struct elf *elf)
 
 		sec->base->rela = sec;
 
+		nr_rela = 0;
 		for (i = 0; i < sec->sh.sh_size / sec->sh.sh_entsize; i++) {
 			rela = malloc(sizeof(*rela));
 			if (!rela) {
@@ -401,8 +410,15 @@ static int read_relas(struct elf *elf)
 
 			list_add_tail(&rela->list, &sec->rela_list);
 			hash_add(sec->rela_hash, &rela->hash, rela->offset);
-
+			nr_rela++;
 		}
+		max_rela = max(max_rela, nr_rela);
+		tot_rela += nr_rela;
+	}
+
+	if (stats) {
+		printf("max_rela: %lu\n", max_rela);
+		printf("tot_rela: %lu\n", tot_rela);
 	}
 
 	return 0;



  parent reply	other threads:[~2020-03-17 17:12 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-17 17:02 [PATCH v2 00/19] objtool: vmlinux.o and noinstr validation Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 01/19] objtool: Introduce validate_return() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 02/19] objtool: Rename func_for_each_insn() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 03/19] objtool: Rename func_for_each_insn_all() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 04/19] x86/kexec: Use RIP relative addressing Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 05/19] objtool: Optimize find_symbol_by_index() Peter Zijlstra
2020-03-17 17:02 ` Peter Zijlstra [this message]
2020-03-17 17:02 ` [PATCH v2 07/19] objtool: Optimize find_section_by_index() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 08/19] objtool: Optimize find_section_by_name() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 09/19] objtool: Optimize find_symbol_*() and read_symbols() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 10/19] objtool: Rename find_containing_func() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 11/19] objtool: Resize insn_hash Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 12/19] objtool: Optimize find_symbol_by_name() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 13/19] objtool: Optimize read_sections() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 14/19] objtool: Delete cleanup() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 15/19] objtool: Optimize find_rela_by_dest_range() Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 16/19] objtool: Implement noinstr validation Peter Zijlstra
2020-03-17 21:00   ` Josh Poimboeuf
2020-03-18  9:03     ` Peter Zijlstra
2020-03-18 10:06       ` Peter Zijlstra
2020-03-18 13:21   ` Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 17/19] objtool: Optimize !vmlinux.o again Peter Zijlstra
2020-03-18 13:20   ` Peter Zijlstra
2020-03-20 16:20     ` Miroslav Benes
2020-03-21 15:14       ` Peter Zijlstra
2020-03-21 16:11         ` Peter Zijlstra
2020-03-23  7:27           ` Miroslav Benes
2020-03-17 17:02 ` [PATCH v2 18/19] objtool: Use sec_offset_hash() for insn_hash Peter Zijlstra
2020-03-17 17:02 ` [PATCH v2 19/19] objtool: Detect loading function pointers across noinstr Peter Zijlstra
2020-03-17 23:39   ` kbuild test robot
2020-03-17 23:43     ` Nick Desaulniers
2020-03-18 11:02       ` Peter Zijlstra
2020-03-18  7:18   ` kbuild test robot
2020-03-17 21:05 ` [PATCH v2 00/19] objtool: vmlinux.o and noinstr validation Josh Poimboeuf
2020-03-18 13:18 ` [RFC][PATCH v2 20/19] kbuild/objtool: Add objtool-vmlinux.o pass Peter Zijlstra
2020-03-18 14:13   ` Peter Zijlstra
2020-03-18 18:34   ` Josh Poimboeuf

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=20200317170910.118361227@infradead.org \
    --to=peterz@infradead.org \
    --cc=brgerst@gmail.com \
    --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

all inboxes | Powered by JetHome®