mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-19 00:54:41 +08:00
7786032e52
Currently objtool headers are being included either by their base name or included via ../ from a parent directory. In case of a base name usage: #include "warn.h" #include "arch_elf.h" it does not make it apparent from which directory the file comes from. To make it slightly better, and actually to avoid name clashes some arch specific files have "arch_" suffix. And files from an arch folder have to revert to including via ../ e.g: #include "../../elf.h" With additional architectures support and the code base growth there is a need for clearer headers naming scheme for multiple reasons: 1. to make it instantly obvious where these files come from (objtool itself / objtool arch|generic folders / some other external files), 2. to avoid name clashes of objtool arch specific headers, potential obtool arch generic headers and the system header files (there is /usr/include/elf.h already), 3. to avoid ../ includes and improve code readability. 4. to give a warm fuzzy feeling to developers who are mostly kernel developers and are accustomed to linux kernel headers arranging scheme. Doesn't this make it instantly obvious where are these files come from? #include <objtool/warn.h> #include <arch/elf.h> And doesn't it look nicer to avoid ugly ../ includes? Which also guarantees this is elf.h from the objtool and not /usr/include/elf.h. #include <objtool/elf.h> This patch defines and implements new objtool headers arranging scheme. Which is: - all generic headers go to include/objtool (similar to include/linux) - all arch headers go to arch/$(SRCARCH)/include/arch (to get arch prefix). This is similar to linux arch specific "asm/*" headers but we are not abusing "asm" name and calling it what it is. This also helps to prevent name clashes (arch is not used in system headers or kernel exports). To bring objtool to this state the following things are done: 1. current top level tools/objtool/ headers are moved into include/objtool/ subdirectory, 2. arch specific headers, currently only arch/x86/include/ are moved into arch/x86/include/arch/ and were stripped of "arch_" suffix, 3. new -I$(srctree)/tools/objtool/include include path to make includes like <objtool/warn.h> possible, 4. rewriting file includes, 5. make git not to ignore include/objtool/ subdirectory. Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
71 lines
1.9 KiB
C
71 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2015-2017 Josh Poimboeuf <jpoimboe@redhat.com>
|
|
*/
|
|
|
|
/*
|
|
* objtool check:
|
|
*
|
|
* This command analyzes every .o file and ensures the validity of its stack
|
|
* trace metadata. It enforces a set of rules on asm code and C inline
|
|
* assembly code so that stack traces can be reliable.
|
|
*
|
|
* For more information, see tools/objtool/Documentation/stack-validation.txt.
|
|
*/
|
|
|
|
#include <subcmd/parse-options.h>
|
|
#include <string.h>
|
|
#include <objtool/builtin.h>
|
|
#include <objtool/objtool.h>
|
|
|
|
bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
|
|
|
|
static const char * const check_usage[] = {
|
|
"objtool check [<options>] file.o",
|
|
NULL,
|
|
};
|
|
|
|
const struct option check_options[] = {
|
|
OPT_BOOLEAN('f', "no-fp", &no_fp, "Skip frame pointer validation"),
|
|
OPT_BOOLEAN('u', "no-unreachable", &no_unreachable, "Skip 'unreachable instruction' warnings"),
|
|
OPT_BOOLEAN('r', "retpoline", &retpoline, "Validate retpoline assumptions"),
|
|
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_BOOLEAN('d', "duplicate", &validate_dup, "duplicate validation for vmlinux.o"),
|
|
OPT_BOOLEAN('l', "vmlinux", &vmlinux, "vmlinux.o validation"),
|
|
OPT_END(),
|
|
};
|
|
|
|
int cmd_check(int argc, const char **argv)
|
|
{
|
|
const char *objname, *s;
|
|
struct objtool_file *file;
|
|
int ret;
|
|
|
|
argc = parse_options(argc, argv, check_options, check_usage, 0);
|
|
|
|
if (argc != 1)
|
|
usage_with_options(check_usage, check_options);
|
|
|
|
objname = argv[0];
|
|
|
|
s = strstr(objname, "vmlinux.o");
|
|
if (s && !s[9])
|
|
vmlinux = true;
|
|
|
|
file = objtool_open_read(objname);
|
|
if (!file)
|
|
return 1;
|
|
|
|
ret = check(file);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (file->elf->changed)
|
|
return elf_write(file->elf);
|
|
|
|
return 0;
|
|
}
|