From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Josh Poimboeuf <jpoimboe@redhat.com>
Subject: [PATCH 05/17] tools arch x86: Sync asm/cpufeatures.h with the with the kernel
Date: Tue, 20 Aug 2019 16:27:21 -0300 [thread overview]
Message-ID: <20190820192733.19180-6-acme@kernel.org> (raw)
In-Reply-To: <20190820192733.19180-1-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
To pick up the changes in:
f36cf386e3fe ("x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS")
18ec54fdd6d1 ("x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations")
That don't affect anything in tools/.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h'
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/n/tip-860dq1qie2cpnfghlpcnxrzr@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/arch/x86/include/asm/cpufeatures.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
index 998c2cc08363..e880f2408e29 100644
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -281,6 +281,8 @@
#define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1) /* LLC occupancy monitoring */
#define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2) /* LLC Total MBM monitoring */
#define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */
+#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */
+#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */
/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */
#define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */
@@ -394,5 +396,6 @@
#define X86_BUG_L1TF X86_BUG(18) /* CPU is affected by L1 Terminal Fault */
#define X86_BUG_MDS X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */
#define X86_BUG_MSBDS_ONLY X86_BUG(20) /* CPU is only affected by the MSDBS variant of BUG_MDS */
+#define X86_BUG_SWAPGS X86_BUG(21) /* CPU is affected by speculation through SWAPGS */
#endif /* _ASM_X86_CPUFEATURES_H */
--
2.21.0
next prev parent reply other threads:[~2019-08-20 19:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 19:27 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 01/17] tools headers: Add limits.h to access __WORDSIZE Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 02/17] perf tools: tools/include should come before tools/uapi/include Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 03/17] tools headers: Grab copy of linux/const.h, needed by linux/bits.h Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 04/17] tools headers: Synchronize linux/bits.h with the kernel sources Arnaldo Carvalho de Melo
2019-08-20 19:27 ` Arnaldo Carvalho de Melo [this message]
2019-08-20 19:27 ` [PATCH 06/17] perf evsel: Add comment for 'idx' member in 'struct perf_sample_id Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 07/17] tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 08/17] perf record: Enable LBR callstack capture jointly with thread stack Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 09/17] perf report: Dump LBR callstack data by -D " Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 10/17] perf report: Prefer DWARF callstacks to LBR ones when captured both Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 11/17] perf cs-etm: Support sample flags 'insn' and 'insnlen' Arnaldo Carvalho de Melo
2019-08-20 19:27 ` Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 12/17] perf ui: Make 'exit_msg' optional in ui__question_window() Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 13/17] perf ui: Introduce non-interactive ui__info_window() function Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 14/17] perf ui browser: Allow specifying message to show when no samples are available to display Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 15/17] perf top: Show info message while collecting samples Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 16/17] tools headers: Fixup bitsperlong per arch includes Arnaldo Carvalho de Melo
2019-08-20 19:27 ` [PATCH 17/17] libperf: Fix arch include paths Arnaldo Carvalho de Melo
2019-08-20 19:39 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar
2019-08-20 19:44 ` Arnaldo Carvalho de Melo
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=20190820192733.19180-6-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=jolsa@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/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.