Commit 55d2a473 authored by Alexandre Chartre's avatar Alexandre Chartre Committed by Peter Zijlstra
Browse files

objtool: Move disassembly functions to a separated file 



objtool disassembles functions which have warnings. Move the code
to do that to a dedicated file. The code is just moved, it is not
changed.

Signed-off-by: default avatarAlexandre Chartre <alexandre.chartre@oracle.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Link: https://patch.msgid.link/20251121095340.464045-2-alexandre.chartre@oracle.com
parent 11991999

tools/objtool/Build

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ objtool-y += special.o 
objtool-y += builtin-check.o

objtool-y += elf.o

objtool-y += objtool.o

objtool-y += disas.o



objtool-$(BUILD_ORC) += orc_gen.o orc_dump.o

objtool-$(BUILD_KLP) += builtin-klp.o klp-diff.o klp-post-link.o

tools/objtool/check.c

+0 −81
Original line number Diff line number Diff line
@@ -4731,87 +4731,6 @@ static int validate_reachable_instructions(struct objtool_file *file) 
	return warnings;

}



/* 'funcs' is a space-separated list of function names */

static void disas_funcs(const char *funcs)

{

	const char *objdump_str, *cross_compile;

	int size, ret;

	char *cmd;



	cross_compile = getenv("CROSS_COMPILE");

	if (!cross_compile)

		cross_compile = "";



	objdump_str = "%sobjdump -wdr %s | gawk -M -v _funcs='%s' '"

			"BEGIN { split(_funcs, funcs); }"

			"/^$/ { func_match = 0; }"

			"/<.*>:/ { "

				"f = gensub(/.*<(.*)>:/, \"\\\\1\", 1);"

				"for (i in funcs) {"

					"if (funcs[i] == f) {"

						"func_match = 1;"

						"base = strtonum(\"0x\" $1);"

						"break;"

					"}"

				"}"

			"}"

			"{"

				"if (func_match) {"

					"addr = strtonum(\"0x\" $1);"

					"printf(\"%%04x \", addr - base);"

					"print;"

				"}"

			"}' 1>&2";



	/* fake snprintf() to calculate the size */

	size = snprintf(NULL, 0, objdump_str, cross_compile, objname, funcs) + 1;

	if (size <= 0) {

		WARN("objdump string size calculation failed");

		return;

	}



	cmd = malloc(size);



	/* real snprintf() */

	snprintf(cmd, size, objdump_str, cross_compile, objname, funcs);

	ret = system(cmd);

	if (ret) {

		WARN("disassembly failed: %d", ret);

		return;

	}

}



static void disas_warned_funcs(struct objtool_file *file)

{

	struct symbol *sym;

	char *funcs = NULL, *tmp;



	for_each_sym(file->elf, sym) {

		if (sym->warned) {

			if (!funcs) {

				funcs = malloc(strlen(sym->name) + 1);

				if (!funcs) {

					ERROR_GLIBC("malloc");

					return;

				}

				strcpy(funcs, sym->name);

			} else {

				tmp = malloc(strlen(funcs) + strlen(sym->name) + 2);

				if (!tmp) {

					ERROR_GLIBC("malloc");

					return;

				}

				sprintf(tmp, "%s %s", funcs, sym->name);

				free(funcs);

				funcs = tmp;

			}

		}

	}



	if (funcs)

		disas_funcs(funcs);

}



__weak bool arch_absolute_reloc(struct elf *elf, struct reloc *reloc)

{

	unsigned int type = reloc_type(reloc);

tools/objtool/disas.c

0 → 100644
+90 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (C) 2015-2017 Josh Poimboeuf <jpoimboe@redhat.com>

 */



#include <objtool/arch.h>

#include <objtool/warn.h>



#include <linux/string.h>



/* 'funcs' is a space-separated list of function names */

static void disas_funcs(const char *funcs)

{

	const char *objdump_str, *cross_compile;

	int size, ret;

	char *cmd;



	cross_compile = getenv("CROSS_COMPILE");

	if (!cross_compile)

		cross_compile = "";



	objdump_str = "%sobjdump -wdr %s | gawk -M -v _funcs='%s' '"

			"BEGIN { split(_funcs, funcs); }"

			"/^$/ { func_match = 0; }"

			"/<.*>:/ { "

				"f = gensub(/.*<(.*)>:/, \"\\\\1\", 1);"

				"for (i in funcs) {"

					"if (funcs[i] == f) {"

						"func_match = 1;"

						"base = strtonum(\"0x\" $1);"

						"break;"

					"}"

				"}"

			"}"

			"{"

				"if (func_match) {"

					"addr = strtonum(\"0x\" $1);"

					"printf(\"%%04x \", addr - base);"

					"print;"

				"}"

			"}' 1>&2";



	/* fake snprintf() to calculate the size */

	size = snprintf(NULL, 0, objdump_str, cross_compile, objname, funcs) + 1;

	if (size <= 0) {

		WARN("objdump string size calculation failed");

		return;

	}



	cmd = malloc(size);



	/* real snprintf() */

	snprintf(cmd, size, objdump_str, cross_compile, objname, funcs);

	ret = system(cmd);

	if (ret) {

		WARN("disassembly failed: %d", ret);

		return;

	}

}



void disas_warned_funcs(struct objtool_file *file)

{

	struct symbol *sym;

	char *funcs = NULL, *tmp;



	for_each_sym(file->elf, sym) {

		if (sym->warned) {

			if (!funcs) {

				funcs = malloc(strlen(sym->name) + 1);

				if (!funcs) {

					ERROR_GLIBC("malloc");

					return;

				}

				strcpy(funcs, sym->name);

			} else {

				tmp = malloc(strlen(funcs) + strlen(sym->name) + 2);

				if (!tmp) {

					ERROR_GLIBC("malloc");

					return;

				}

				sprintf(tmp, "%s %s", funcs, sym->name);

				free(funcs);

				funcs = tmp;

			}

		}

	}



	if (funcs)

		disas_funcs(funcs);

}

tools/objtool/include/objtool/objtool.h

+2 −0
Original line number Diff line number Diff line
@@ -49,4 +49,6 @@ int check(struct objtool_file *file); 
int orc_dump(const char *objname);

int orc_create(struct objtool_file *file);



void disas_warned_funcs(struct objtool_file *file);



#endif /* _OBJTOOL_H */