From: "tip-bot2 for Juergen Gross" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>, Borislav Petkov <bp@suse.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cpu] x86/cpufeatures: Add X86_FEATURE_XENPV to disabled-features.h
Date: Tue, 22 Nov 2022 18:04:51 -0000 [thread overview]
Message-ID: <166914029143.4906.11843439869317994745.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221104072701.20283-2-jgross@suse.com>
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 15e15d64bd8e12d835f6bb1b1ce3ffa13fa03a66
Gitweb: https://git.kernel.org/tip/15e15d64bd8e12d835f6bb1b1ce3ffa13fa03a66
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Fri, 04 Nov 2022 08:26:57 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 22 Nov 2022 15:42:33 +01:00
x86/cpufeatures: Add X86_FEATURE_XENPV to disabled-features.h
Add X86_FEATURE_XENPV to the features handled specially in
disabled-features.h.
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20221104072701.20283-2-jgross@suse.com
---
arch/x86/include/asm/disabled-features.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h
index 33d2cd0..c862552 100644
--- a/arch/x86/include/asm/disabled-features.h
+++ b/arch/x86/include/asm/disabled-features.h
@@ -81,6 +81,12 @@
# define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31))
#endif
+#ifdef CONFIG_XEN_PV
+# define DISABLE_XENPV 0
+#else
+# define DISABLE_XENPV (1 << (X86_FEATURE_XENPV & 31))
+#endif
+
#ifdef CONFIG_INTEL_TDX_GUEST
# define DISABLE_TDX_GUEST 0
#else
@@ -98,7 +104,7 @@
#define DISABLED_MASK5 0
#define DISABLED_MASK6 0
#define DISABLED_MASK7 (DISABLE_PTI)
-#define DISABLED_MASK8 (DISABLE_TDX_GUEST)
+#define DISABLED_MASK8 (DISABLE_XENPV|DISABLE_TDX_GUEST)
#define DISABLED_MASK9 (DISABLE_SGX)
#define DISABLED_MASK10 0
#define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET)
next prev parent reply other threads:[~2022-11-22 18:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 7:26 [PATCH v2 0/5] x86: Switch X86_FEATURE_XENPV to cpu_feature_enabled() use Juergen Gross
2022-11-04 7:26 ` [PATCH v2 1/5] x86: add X86_FEATURE_XENPV to disabled-features.h Juergen Gross
2022-11-04 14:56 ` Dave Hansen
2022-11-22 18:04 ` tip-bot2 for Juergen Gross [this message]
2022-11-04 7:26 ` [PATCH v2 2/5] x86: remove unneeded 64-bit dependency in arch_enter_from_user_mode() Juergen Gross
2022-11-04 14:58 ` Dave Hansen
2022-11-22 18:04 ` [tip: x86/cpu] x86/cpu: Remove " tip-bot2 for Juergen Gross
2022-11-04 7:26 ` [PATCH v2 3/5] x86: drop 32-bit Xen PV guest code in update_task_stack() Juergen Gross
2022-11-04 15:04 ` Dave Hansen
2022-11-22 18:04 ` [tip: x86/cpu] x86/cpu: Drop " tip-bot2 for Juergen Gross
2022-11-04 7:27 ` [PATCH v2 4/5] x86: remove X86_FEATURE_XENPV usage in setup_cpu_entry_area() Juergen Gross
2022-11-04 15:04 ` Dave Hansen
2022-11-22 18:04 ` [tip: x86/cpu] x86/cpu: Remove " tip-bot2 for Juergen Gross
2022-11-04 7:27 ` [PATCH v2 5/5] x86: switch to cpu_feature_enabled() for X86_FEATURE_XENPV Juergen Gross
2022-11-04 17:32 ` Dave Hansen
2022-11-22 18:04 ` [tip: x86/cpu] x86/cpu: Switch " tip-bot2 for Juergen Gross
2022-11-22 12:47 ` [PATCH v2 0/5] x86: Switch X86_FEATURE_XENPV to cpu_feature_enabled() use Juergen Gross
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=166914029143.4906.11843439869317994745.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.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.