All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] x86/insn: Add a __ignore_sync_check__ marker
Date: Mon, 15 Mar 2021 15:47:49 -0000	[thread overview]
Message-ID: <161582326934.398.7431853570797650096.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210304174237.31945-4-bp@alien8.de>

The following commit has been merged into the x86/core branch of tip:

Commit-ID:     d30c7b820be5c4777fe6c3b0c21f9d0064251e51
Gitweb:        https://git.kernel.org/tip/d30c7b820be5c4777fe6c3b0c21f9d0064251e51
Author:        Borislav Petkov <bp@suse.de>
AuthorDate:    Mon, 22 Feb 2021 13:34:40 +01:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 15 Mar 2021 11:00:57 +01:00

x86/insn: Add a __ignore_sync_check__ marker

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.

Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Link: https://lkml.kernel.org/r/20210304174237.31945-4-bp@alien8.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 4cf2ad5..b56c574 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 95a448f..93f8460 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 12539fc..b0f3b2a 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 4d1640d..ed1e033 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 877827b..a610514 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 cc777c1..7e1239a 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 4f5ed49..dfbcc64 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 31afbf0..1174c43 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 606a4b5..4bbabae 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 dded93a..07857df 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

  parent reply	other threads:[~2021-03-15 15:48 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-04 17:42 [PATCH v3 00/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 01/21] x86/insn: Rename insn_decode() to insn_decode_from_regs() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 02/21] x86/insn: Add @buf_len param to insn_init() kernel-doc comment Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 03/21] x86/insn: Add a __ignore_sync_check__ marker Borislav Petkov
2021-03-12  3:07   ` Masami Hiramatsu
2021-03-15 15:47   ` tip-bot2 for Borislav Petkov [this message]
2021-03-04 17:42 ` [PATCH v3 04/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-15 16:53     ` Peter Zijlstra
2021-03-17  1:14   ` [PATCH v3 04/21] " Ian Rogers
2021-03-24 13:43     ` Arnaldo Carvalho de Melo
2021-03-24 13:54       ` Borislav Petkov
2021-03-24 18:21         ` Ian Rogers
2021-03-24 18:52           ` Arnaldo Carvalho de Melo
2021-03-04 17:42 ` [PATCH v3 05/21] x86/insn-eval: Handle return values from the decoder Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 06/21] x86/boot/compressed/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 07/21] perf/x86/intel/ds: Check insn_get_length() retval Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 08/21] perf/x86/intel/ds: Check return values of insn decoder functions Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 09/21] x86/alternative: Use insn_decode() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 10/21] x86/mce: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 11/21] x86/kprobes: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 12/21] x86/sev-es: Split vc_decode_insn() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 13/21] x86/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 14/21] x86/traps: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 15/21] x86/uprobes: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 16/21] x86/tools/insn_decoder_test: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 17/21] tools/objtool: " Borislav Petkov
2021-03-04 17:49   ` Peter Zijlstra
2021-03-04 18:06     ` Borislav Petkov
2021-03-05  8:55       ` Peter Zijlstra
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 18/21] x86/tools/insn_sanity: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 19/21] tools/perf: " Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 20/21] x86/insn: Remove kernel_insn_init() Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 21/21] x86/insn: Make insn_complete() static Borislav Petkov
2021-03-15 15:47   ` [tip: x86/core] " tip-bot2 for Borislav Petkov

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=161582326934.398.7431853570797650096.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.