Messages in this thread | | | Date | Fri, 12 Mar 2021 12:07:47 +0900 | From | Masami Hiramatsu <> | Subject | Re: [PATCH v3 03/21] x86/insn: Add a __ignore_sync_check__ marker |
| |
On Thu, 4 Mar 2021 18:42:19 +0100 Borislav Petkov <bp@alien8.de> wrote:
> From: Borislav Petkov <bp@suse.de> > > Add an explicit __ignore_sync_check__ marker which will be used to mark > lines which are supposed to be ignored by file synchronization check > scripts, its advantage being that it explicitly denotes such lines in > the code. >
Looks good to me.
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Thanks,
> Signed-off-by: Borislav Petkov <bp@suse.de> > --- > arch/x86/include/asm/inat.h | 2 +- > arch/x86/include/asm/insn.h | 2 +- > arch/x86/lib/inat.c | 2 +- > arch/x86/lib/insn.c | 6 +++--- > tools/arch/x86/include/asm/inat.h | 2 +- > tools/arch/x86/include/asm/insn.h | 2 +- > tools/arch/x86/lib/inat.c | 2 +- > tools/arch/x86/lib/insn.c | 6 +++--- > tools/objtool/sync-check.sh | 17 +++++++++++++---- > tools/perf/check-headers.sh | 15 +++++++++++---- > 10 files changed, 36 insertions(+), 20 deletions(-) > > diff --git a/arch/x86/include/asm/inat.h b/arch/x86/include/asm/inat.h > index 4cf2ad521f65..b56c5741581a 100644 > --- a/arch/x86/include/asm/inat.h > +++ b/arch/x86/include/asm/inat.h > @@ -6,7 +6,7 @@ > * > * Written by Masami Hiramatsu <mhiramat@redhat.com> > */ > -#include <asm/inat_types.h> > +#include <asm/inat_types.h> /* __ignore_sync_check__ */ > > /* > * Internal bits. Don't use bitmasks directly, because these bits are > diff --git a/arch/x86/include/asm/insn.h b/arch/x86/include/asm/insn.h > index 95a448fbb44c..93f84600ac2c 100644 > --- a/arch/x86/include/asm/insn.h > +++ b/arch/x86/include/asm/insn.h > @@ -9,7 +9,7 @@ > > #include <asm/byteorder.h> > /* insn_attr_t is defined in inat.h */ > -#include <asm/inat.h> > +#include <asm/inat.h> /* __ignore_sync_check__ */ > > #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) > > diff --git a/arch/x86/lib/inat.c b/arch/x86/lib/inat.c > index 12539fca75c4..b0f3b2a62ae2 100644 > --- a/arch/x86/lib/inat.c > +++ b/arch/x86/lib/inat.c > @@ -4,7 +4,7 @@ > * > * Written by Masami Hiramatsu <mhiramat@redhat.com> > */ > -#include <asm/insn.h> > +#include <asm/insn.h> /* __ignore_sync_check__ */ > > /* Attribute tables are generated from opcode map */ > #include "inat-tables.c" > diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c > index 4d1640dc7882..ed1e0335aa14 100644 > --- a/arch/x86/lib/insn.c > +++ b/arch/x86/lib/insn.c > @@ -11,10 +11,10 @@ > #else > #include <string.h> > #endif > -#include <asm/inat.h> > -#include <asm/insn.h> > +#include <asm/inat.h> /*__ignore_sync_check__ */ > +#include <asm/insn.h> /* __ignore_sync_check__ */ > > -#include <asm/emulate_prefix.h> > +#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */ > > #define leXX_to_cpu(t, r) \ > ({ \ > diff --git a/tools/arch/x86/include/asm/inat.h b/tools/arch/x86/include/asm/inat.h > index 877827b7c2c3..a61051400311 100644 > --- a/tools/arch/x86/include/asm/inat.h > +++ b/tools/arch/x86/include/asm/inat.h > @@ -6,7 +6,7 @@ > * > * Written by Masami Hiramatsu <mhiramat@redhat.com> > */ > -#include "inat_types.h" > +#include "inat_types.h" /* __ignore_sync_check__ */ > > /* > * Internal bits. Don't use bitmasks directly, because these bits are > diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h > index cc777c185212..7e1239aa7dd9 100644 > --- a/tools/arch/x86/include/asm/insn.h > +++ b/tools/arch/x86/include/asm/insn.h > @@ -9,7 +9,7 @@ > > #include <asm/byteorder.h> > /* insn_attr_t is defined in inat.h */ > -#include "inat.h" > +#include "inat.h" /* __ignore_sync_check__ */ > > #if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN) > > diff --git a/tools/arch/x86/lib/inat.c b/tools/arch/x86/lib/inat.c > index 4f5ed49e1b4e..dfbcc6405941 100644 > --- a/tools/arch/x86/lib/inat.c > +++ b/tools/arch/x86/lib/inat.c > @@ -4,7 +4,7 @@ > * > * Written by Masami Hiramatsu <mhiramat@redhat.com> > */ > -#include "../include/asm/insn.h" > +#include "../include/asm/insn.h" /* __ignore_sync_check__ */ > > /* Attribute tables are generated from opcode map */ > #include "inat-tables.c" > diff --git a/tools/arch/x86/lib/insn.c b/tools/arch/x86/lib/insn.c > index 31afbf0a75f7..1174c43b3944 100644 > --- a/tools/arch/x86/lib/insn.c > +++ b/tools/arch/x86/lib/insn.c > @@ -11,10 +11,10 @@ > #else > #include <string.h> > #endif > -#include "../include/asm/inat.h" > -#include "../include/asm/insn.h" > +#include "../include/asm/inat.h" /* __ignore_sync_check__ */ > +#include "../include/asm/insn.h" /* __ignore_sync_check__ */ > > -#include "../include/asm/emulate_prefix.h" > +#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */ > > #define leXX_to_cpu(t, r) \ > ({ \ > diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh > index 606a4b5e929f..4bbabaecab14 100755 > --- a/tools/objtool/sync-check.sh > +++ b/tools/objtool/sync-check.sh > @@ -16,11 +16,14 @@ arch/x86/include/asm/emulate_prefix.h > arch/x86/lib/x86-opcode-map.txt > arch/x86/tools/gen-insn-attr-x86.awk > include/linux/static_call_types.h > -arch/x86/include/asm/inat.h -I '^#include [\"<]\(asm/\)*inat_types.h[\">]' > -arch/x86/include/asm/insn.h -I '^#include [\"<]\(asm/\)*inat.h[\">]' > -arch/x86/lib/inat.c -I '^#include [\"<]\(../include/\)*asm/insn.h[\">]' > -arch/x86/lib/insn.c -I '^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]' -I '^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]' > " > + > +SYNC_CHECK_FILES=' > +arch/x86/include/asm/inat.h > +arch/x86/include/asm/insn.h > +arch/x86/lib/inat.c > +arch/x86/lib/insn.c > +' > fi > > check_2 () { > @@ -63,3 +66,9 @@ while read -r file_entry; do > done <<EOF > $FILES > EOF > + > +if [ "$SRCARCH" = "x86" ]; then > + for i in $SYNC_CHECK_FILES; do > + check $i '-I "^.*\/\*.*__ignore_sync_check__.*\*\/.*$"' > + done > +fi > diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh > index dded93a2bc89..07857dfb4d91 100755 > --- a/tools/perf/check-headers.sh > +++ b/tools/perf/check-headers.sh > @@ -75,6 +75,13 @@ include/uapi/asm-generic/mman-common.h > include/uapi/asm-generic/unistd.h > ' > > +SYNC_CHECK_FILES=' > +arch/x86/include/asm/inat.h > +arch/x86/include/asm/insn.h > +arch/x86/lib/inat.c > +arch/x86/lib/insn.c > +' > + > # These copies are under tools/perf/trace/beauty/ as they are not used to in > # building object files only by scripts in tools/perf/trace/beauty/ to generate > # tables that then gets included in .c files for things like id->string syscall > @@ -129,6 +136,10 @@ for i in $FILES; do > check $i -B > done > > +for i in $SYNC_CHECK_FILES; do > + check $i '-I "^.*\/\*.*__ignore_sync_check__.*\*\/.*$"' > +done > + > # diff with extra ignore lines > check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))"' > check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"' > @@ -137,10 +148,6 @@ check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"' > check include/linux/build_bug.h '-I "^#\(ifndef\|endif\)\( \/\/\)* static_assert$"' > check include/linux/ctype.h '-I "isdigit("' > check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B' > -check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' > -check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' > -check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' > -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' > > # diff non-symmetric files > check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl > -- > 2.29.2 >
-- Masami Hiramatsu <mhiramat@kernel.org>
| |