From: Babu Moger <babu.moger@amd.com>
To: corbet@lwn.net, tglx@linutronix.de, mingo@redhat.com,
bp@alien8.de, hpa@zytor.com, pbonzini@redhat.com,
sean.j.christopherson@intel.com
Cc: x86@kernel.org, vkuznets@redhat.com, wanpengli@tencent.com,
jmattson@google.com, joro@8bytes.org,
dave.hansen@linux.intel.com, luto@kernel.org,
peterz@infradead.org, mchehab+samsung@kernel.org,
babu.moger@amd.com, changbin.du@intel.com, namit@vmware.com,
bigeasy@linutronix.de, yang.shi@linux.alibaba.com,
asteinhauser@google.com, anshuman.khandual@arm.com,
jan.kiszka@siemens.com, akpm@linux-foundation.org,
steven.price@arm.com, rppt@linux.vnet.ibm.com, peterx@redhat.com,
dan.j.williams@intel.com, arjunroy@google.com,
logang@deltatee.com, thellstrom@vmware.com, aarcange@redhat.com,
justin.he@arm.com, robin.murphy@arm.com, ira.weiny@intel.com,
keescook@chromium.org, jgross@suse.com,
andrew.cooper3@citrix.com, pawan.kumar.gupta@linux.intel.com,
fenghua.yu@intel.com, vineela.tummalapalli@intel.com,
yamada.masahiro@socionext.com, sam@ravnborg.org, acme@redhat.com,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org
Subject: [PATCH v4 3/3] KVM: x86: Move MPK feature detection to common code
Date: Tue, 12 May 2020 18:59:16 -0500 [thread overview]
Message-ID: <158932795627.44260.15144185478040178638.stgit@naples-babu.amd.com> (raw)
In-Reply-To: <158932780954.44260.4292038705292213548.stgit@naples-babu.amd.com>
Both Intel and AMD support (MPK) Memory Protection Key feature.
Move the feature detection from VMX to the common code. It should
work for both the platforms now.
Signed-off-by: Babu Moger <babu.moger@amd.com>
---
arch/x86/kvm/cpuid.c | 9 ++++++++-
arch/x86/kvm/vmx/vmx.c | 4 ----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 901cd1fdecd9..d2c36768667d 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -326,7 +326,7 @@ void kvm_set_cpu_caps(void)
);
kvm_cpu_cap_mask(CPUID_7_ECX,
- F(AVX512VBMI) | F(LA57) | 0 /*PKU*/ | 0 /*OSPKE*/ | F(RDPID) |
+ F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ | F(RDPID) |
F(AVX512_VPOPCNTDQ) | F(UMIP) | F(AVX512_VBMI2) | F(GFNI) |
F(VAES) | F(VPCLMULQDQ) | F(AVX512_VNNI) | F(AVX512_BITALG) |
F(CLDEMOTE) | F(MOVDIRI) | F(MOVDIR64B) | 0 /*WAITPKG*/
@@ -335,6 +335,13 @@ void kvm_set_cpu_caps(void)
if (cpuid_ecx(7) & F(LA57))
kvm_cpu_cap_set(X86_FEATURE_LA57);
+ /*
+ * PKU not yet implemented for shadow paging and requires OSPKE
+ * to be set on the host. Clear it if that is not the case
+ */
+ if (!tdp_enabled || !boot_cpu_has(X86_FEATURE_OSPKE))
+ kvm_cpu_cap_clear(X86_FEATURE_PKU);
+
kvm_cpu_cap_mask(CPUID_7_EDX,
F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |
F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES) | F(INTEL_STIBP) |
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 46898a476ba7..d153732ed88f 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7136,10 +7136,6 @@ static __init void vmx_set_cpu_caps(void)
if (vmx_pt_mode_is_host_guest())
kvm_cpu_cap_check_and_set(X86_FEATURE_INTEL_PT);
- /* PKU is not yet implemented for shadow paging. */
- if (enable_ept && boot_cpu_has(X86_FEATURE_OSPKE))
- kvm_cpu_cap_check_and_set(X86_FEATURE_PKU);
-
if (vmx_umip_emulated())
kvm_cpu_cap_set(X86_FEATURE_UMIP);
next prev parent reply other threads:[~2020-05-12 23:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 23:58 [PATCH v4 0/3] arch/x86: Enable MPK feature on AMD Babu Moger
2020-05-12 23:58 ` [PATCH v4 1/3] arch/x86: Update config and kernel doc for " Babu Moger
2020-05-13 15:09 ` Dave Hansen
2020-05-13 15:56 ` Babu Moger
2020-05-12 23:59 ` [PATCH v4 2/3] KVM: x86: Move pkru save/restore to x86.c Babu Moger
2020-05-12 23:59 ` Babu Moger [this message]
2020-05-13 15:35 ` [PATCH v4 0/3] arch/x86: Enable MPK feature on AMD Paolo Bonzini
2020-05-13 16:00 ` Babu Moger
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=158932795627.44260.15144185478040178638.stgit@naples-babu.amd.com \
--to=babu.moger@amd.com \
--cc=aarcange@redhat.com \
--cc=acme@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andrew.cooper3@citrix.com \
--cc=anshuman.khandual@arm.com \
--cc=arjunroy@google.com \
--cc=asteinhauser@google.com \
--cc=bigeasy@linutronix.de \
--cc=bp@alien8.de \
--cc=changbin.du@intel.com \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=ira.weiny@intel.com \
--cc=jan.kiszka@siemens.com \
--cc=jgross@suse.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=justin.he@arm.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=luto@kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=mingo@redhat.com \
--cc=namit@vmware.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=robin.murphy@arm.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=sam@ravnborg.org \
--cc=sean.j.christopherson@intel.com \
--cc=steven.price@arm.com \
--cc=tglx@linutronix.de \
--cc=thellstrom@vmware.com \
--cc=vineela.tummalapalli@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
--cc=yang.shi@linux.alibaba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).