From: Kai Huang <kai.huang@intel.com>
To: linux-sgx@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org
Cc: seanjc@google.com, jarkko@kernel.org, luto@kernel.org,
dave.hansen@intel.com, rick.p.edgecombe@intel.com,
haitao.huang@intel.com, pbonzini@redhat.com, bp@alien8.de,
tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
jmattson@google.com, joro@8bytes.org, vkuznets@redhat.com,
wanpengli@tencent.com, Kai Huang <kai.huang@intel.com>
Subject: [RFC PATCH v5 19/26] KVM: x86: Add reverse-CPUID lookup support for scattered SGX features
Date: Sun, 14 Feb 2021 02:29:47 +1300 [thread overview]
Message-ID: <2c2863023a6439b9f1fb35248b16b0000c08da84.1613221549.git.kai.huang@intel.com> (raw)
In-Reply-To: <cover.1613221549.git.kai.huang@intel.com>
From: Sean Christopherson <seanjc@google.com>
Define a new KVM-only feature word for advertising and querying SGX
sub-features in CPUID.0x12.0x0.EAX. Because SGX1 and SGX2 are scattered
in the kernel's feature word, they need to be translated so that the
bit numbers match those of hardware.
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Kai Huang <kai.huang@intel.com>
---
arch/x86/kvm/cpuid.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
index 2041e2f07347..f55701ef58fc 100644
--- a/arch/x86/kvm/cpuid.h
+++ b/arch/x86/kvm/cpuid.h
@@ -13,13 +13,18 @@
* "bug" caps, but KVM doesn't use those.
*/
enum kvm_only_cpuid_leafs {
- NR_KVM_CPU_CAPS = NCAPINTS,
+ CPUID_12_EAX = NCAPINTS,
+ NR_KVM_CPU_CAPS,
NKVMCAPINTS = NR_KVM_CPU_CAPS - NCAPINTS,
};
#define X86_KVM_FEATURE(w, f) ((w)*32 + (f))
+/* Intel-defined SGX sub-features, CPUID level 0x12 (EAX). */
+#define __X86_FEATURE_SGX1 X86_KVM_FEATURE(CPUID_12_EAX, 0)
+#define __X86_FEATURE_SGX2 X86_KVM_FEATURE(CPUID_12_EAX, 1)
+
extern u32 kvm_cpu_caps[NR_KVM_CPU_CAPS] __read_mostly;
void kvm_set_cpu_caps(void);
@@ -76,6 +81,7 @@ static const struct cpuid_reg reverse_cpuid[] = {
[CPUID_8000_0007_EBX] = {0x80000007, 0, CPUID_EBX},
[CPUID_7_EDX] = { 7, 0, CPUID_EDX},
[CPUID_7_1_EAX] = { 7, 1, CPUID_EAX},
+ [CPUID_12_EAX] = {0x00000012, 0, CPUID_EAX},
};
/*
@@ -102,6 +108,11 @@ static __always_inline void reverse_cpuid_check(unsigned int x86_leaf)
*/
static __always_inline u32 __feature_translate(int x86_feature)
{
+ if (x86_feature == X86_FEATURE_SGX1)
+ return __X86_FEATURE_SGX1;
+ else if (x86_feature == X86_FEATURE_SGX2)
+ return __X86_FEATURE_SGX2;
+
return x86_feature;
}
--
2.29.2
next prev parent reply other threads:[~2021-02-13 13:32 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-13 13:28 [RFC PATCH v5 00/26] KVM SGX virtualization support Kai Huang
2021-02-13 13:28 ` [RFC PATCH v5 01/26] x86/cpufeatures: Make SGX_LC feature bit depend on SGX bit Kai Huang
2021-02-13 13:28 ` [RFC PATCH v5 02/26] x86/cpufeatures: Add SGX1 and SGX2 sub-features Kai Huang
2021-02-13 13:28 ` [RFC PATCH v5 03/26] x86/sgx: Wipe out EREMOVE from sgx_free_epc_page() Kai Huang
2021-02-16 17:04 ` Dave Hansen
2021-02-16 20:42 ` Huang, Kai
2021-02-13 13:28 ` [RFC PATCH v5 04/26] x86/sgx: Add SGX_CHILD_PRESENT hardware error code Kai Huang
2021-02-13 13:28 ` [RFC PATCH v5 05/26] x86/sgx: Introduce virtual EPC for use by KVM guests Kai Huang
2021-02-16 2:12 ` Jarkko Sakkinen
2021-02-16 18:38 ` Dave Hansen
2021-02-16 19:25 ` Sean Christopherson
2021-02-16 21:33 ` Huang, Kai
2021-02-16 21:34 ` Huang, Kai
2021-02-17 22:22 ` Jarkko Sakkinen
2021-02-13 13:29 ` [RFC PATCH v5 06/26] x86/cpu/intel: Allow SGX virtualization without Launch Control support Kai Huang
2021-02-16 2:15 ` Jarkko Sakkinen
2021-02-16 5:03 ` Huang, Kai
2021-02-16 8:36 ` Jarkko Sakkinen
2021-02-16 10:24 ` Huang, Kai
2021-02-16 18:40 ` Dave Hansen
2021-02-16 20:42 ` Huang, Kai
2021-02-13 13:29 ` [RFC PATCH v5 07/26] x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled Kai Huang
2021-02-16 18:41 ` Dave Hansen
2021-02-13 13:29 ` [RFC PATCH v5 08/26] x86/sgx: Expose SGX architectural definitions to the kernel Kai Huang
2021-02-16 2:17 ` Jarkko Sakkinen
2021-02-16 10:30 ` Huang, Kai
2021-02-16 10:32 ` Borislav Petkov
2021-02-16 11:15 ` Huang, Kai
2021-02-16 11:48 ` Borislav Petkov
2021-02-16 11:56 ` Huang, Kai
2021-02-16 15:18 ` Dave Hansen
2021-02-16 18:47 ` Borislav Petkov
2021-02-16 18:53 ` Dave Hansen
2021-02-16 19:18 ` Borislav Petkov
2021-02-17 22:20 ` Jarkko Sakkinen
2021-02-18 9:09 ` Huang, Kai
2021-02-16 16:28 ` Jarkko Sakkinen
2021-02-13 13:29 ` [RFC PATCH v5 09/26] x86/sgx: Move ENCLS leaf definitions to sgx_arch.h Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 10/26] x86/sgx: Add SGX2 ENCLS leaf definitions (EAUG, EMODPR and EMODT) Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 11/26] x86/sgx: Add encls_faulted() helper Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 12/26] x86/sgx: Add helper to update SGX_LEPUBKEYHASHn MSRs Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 13/26] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM Kai Huang
2021-02-16 3:08 ` Jarkko Sakkinen
2021-02-16 3:09 ` Jarkko Sakkinen
2021-02-16 4:55 ` Huang, Kai
2021-02-16 8:33 ` Jarkko Sakkinen
2021-02-16 8:35 ` Jarkko Sakkinen
2021-02-16 9:33 ` Huang, Kai
2021-02-13 13:29 ` [RFC PATCH v5 14/26] x86/sgx: Move provisioning device creation out of SGX driver Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 15/26] KVM: VMX: Convert vcpu_vmx.exit_reason to a union Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 16/26] KVM: x86: Export kvm_mmu_gva_to_gpa_{read,write}() for SGX (VMX) Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 17/26] KVM: x86: Define new #PF SGX error code bit Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 18/26] KVM: x86: Add support for reverse CPUID lookup of scattered features Kai Huang
2021-02-13 13:29 ` Kai Huang [this message]
2021-02-13 13:29 ` [RFC PATCH v5 20/26] KVM: VMX: Add basic handling of VM-Exit from SGX enclave Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 21/26] KVM: VMX: Frame in ENCLS handler for SGX virtualization Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 22/26] KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 23/26] KVM: VMX: Add emulation of SGX Launch Control LE hash MSRs Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 24/26] KVM: VMX: Add ENCLS[EINIT] handler to support SGX Launch Control (LC) Kai Huang
2021-02-13 13:29 ` [RFC PATCH v5 25/26] KVM: VMX: Enable SGX virtualization for SGX1, SGX2 and LC Kai Huang
2021-02-13 13:30 ` [RFC PATCH v5 26/26] KVM: x86: Add capability to grant VM access to privileged SGX attribute Kai Huang
2021-02-16 18:48 ` [RFC PATCH v5 00/26] KVM SGX virtualization support Dave Hansen
2021-02-16 19:15 ` Sean Christopherson
2021-02-16 20:58 ` Huang, Kai
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=2c2863023a6439b9f1fb35248b16b0000c08da84.1613221549.git.kai.huang@intel.com \
--to=kai.huang@intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=haitao.huang@intel.com \
--cc=hpa@zytor.com \
--cc=jarkko@kernel.org \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rick.p.edgecombe@intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--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 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).