Commit 96eceff3 authored by Josh Poimboeuf's avatar Josh Poimboeuf
Browse files

objtool: Convert elf iterator macros to use 'struct elf' 



'struct objtool_file' is specific to the check code and doesn't belong
in the elf code which is supposed to be objtool_file-agnostic.  Convert
the elf iterator macros to use 'struct elf' instead.

Acked-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
parent 72e4b6b4

tools/objtool/check.c

+12 −12
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct instruction *prev_insn_same_sym(struct objtool_file *file, 
#define for_each_insn(file, insn)					\

	for (struct section *__sec, *__fake = (struct section *)1;	\

	     __fake; __fake = NULL)					\

		for_each_sec(file, __sec)				\

		for_each_sec(file->elf, __sec)				\

			sec_for_each_insn(file, __sec, insn)



#define func_for_each_insn(file, func, insn)				\
@@ -431,7 +431,7 @@ static int decode_instructions(struct objtool_file *file) 
	unsigned long offset;

	struct instruction *insn;



	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		struct instruction *insns = NULL;

		u8 prev_len = 0;

		u8 idx = 0;
@@ -857,7 +857,7 @@ static int create_cfi_sections(struct objtool_file *file) 
	}



	idx = 0;

	for_each_sym(file, sym) {

	for_each_sym(file->elf, sym) {

		if (sym->type != STT_FUNC)

			continue;
@@ -873,7 +873,7 @@ static int create_cfi_sections(struct objtool_file *file) 
		return -1;



	idx = 0;

	for_each_sym(file, sym) {

	for_each_sym(file->elf, sym) {

		if (sym->type != STT_FUNC)

			continue;
@@ -2145,7 +2145,7 @@ static int add_jump_table_alts(struct objtool_file *file) 
	if (!file->rodata)

		return 0;



	for_each_sym(file, func) {

	for_each_sym(file->elf, func) {

		if (func->type != STT_FUNC)

			continue;
@@ -2451,7 +2451,7 @@ static int classify_symbols(struct objtool_file *file) 
{

	struct symbol *func;



	for_each_sym(file, func) {

	for_each_sym(file->elf, func) {

		if (func->type == STT_NOTYPE && strstarts(func->name, ".L"))

			func->local_label = true;
@@ -2496,7 +2496,7 @@ static void mark_rodata(struct objtool_file *file) 
	 *

	 * .rodata.str1.* sections are ignored; they don't contain jump tables.

	 */

	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		if ((!strncmp(sec->name, ".rodata", 7) &&

		     !strstr(sec->name, ".str1.")) ||

		    !strncmp(sec->name, ".data.rel.ro", 12)) {
@@ -4178,7 +4178,7 @@ static int add_prefix_symbols(struct objtool_file *file) 
	struct section *sec;

	struct symbol *func;



	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		if (!(sec->sh.sh_flags & SHF_EXECINSTR))

			continue;
@@ -4270,7 +4270,7 @@ static int validate_functions(struct objtool_file *file) 
	struct section *sec;

	int warnings = 0;



	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		if (!(sec->sh.sh_flags & SHF_EXECINSTR))

			continue;
@@ -4449,7 +4449,7 @@ static int validate_ibt(struct objtool_file *file) 
	for_each_insn(file, insn)

		warnings += validate_ibt_insn(file, insn);



	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {



		/* Already done by validate_ibt_insn() */

		if (sec->sh.sh_flags & SHF_EXECINSTR)
@@ -4610,7 +4610,7 @@ static void disas_warned_funcs(struct objtool_file *file) 
	struct symbol *sym;

	char *funcs = NULL, *tmp;



	for_each_sym(file, sym) {

	for_each_sym(file->elf, sym) {

		if (sym->warned) {

			if (!funcs) {

				funcs = malloc(strlen(sym->name) + 1);
@@ -4650,7 +4650,7 @@ static int check_abs_references(struct objtool_file *file) 
	struct reloc *reloc;

	int ret = 0;



	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		/* absolute references in non-loadable sections are fine */

		if (!(sec->sh.sh_flags & SHF_ALLOC))

			continue;

tools/objtool/include/objtool/elf.h

+4 −4
Original line number Diff line number Diff line
@@ -325,16 +325,16 @@ static inline void set_sym_next_reloc(struct reloc *reloc, struct reloc *next) 
	reloc->_sym_next_reloc = (unsigned long)next | bit;

}



#define for_each_sec(file, sec)						\

	list_for_each_entry(sec, &file->elf->sections, list)

#define for_each_sec(elf, sec)						\

	list_for_each_entry(sec, &elf->sections, list)



#define sec_for_each_sym(sec, sym)					\

	list_for_each_entry(sym, &sec->symbol_list, list)



#define for_each_sym(file, sym)						\

#define for_each_sym(elf, sym)						\

	for (struct section *__sec, *__fake = (struct section *)1;	\

	     __fake; __fake = NULL)					\

		for_each_sec(file, __sec)				\

		for_each_sec(elf, __sec)				\

			sec_for_each_sym(__sec, sym)



#define for_each_reloc(rsec, reloc)					\

tools/objtool/orc_gen.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int orc_create(struct objtool_file *file) 


	/* Build a deduplicated list of ORC entries: */

	INIT_LIST_HEAD(&orc_list);

	for_each_sec(file, sec) {

	for_each_sec(file->elf, sec) {

		struct orc_entry orc, prev_orc = {0};

		struct instruction *insn;

		bool empty = true;