From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> To: <x86@kernel.org>, <platform-driver-x86@vger.kernel.org>, <linux-sgx@vger.kernel.org> Cc: <dave.hansen@intel.com>, <sean.j.christopherson@intel.com>, <nhorman@redhat.com>, <npmccallum@redhat.com>, <serge.ayoun@intel.com>, <shay.katz-zamir@intel.com>, <haitao.huang@intel.com>, <mark.shanahan@intel.com>, <andriy.shevchenko@linux.intel.com>, "Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>, "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" <linux-kernel@vger.kernel.org> Subject: [PATCH v15 11/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Date: Sat, 3 Nov 2018 01:11:10 +0200 [thread overview] Message-ID: <20181102231320.29164-12-jarkko.sakkinen@linux.intel.com> (raw) In-Reply-To: <20181102231320.29164-1-jarkko.sakkinen@linux.intel.com> SGX defines its own CPUID leaf, 0x12, along with a variable number of sub-leafs. Sub-leafs 0 and 1 are always available if SGX is supported and enumerate various SGX features, e.g. instruction sets and enclave capabilities. Sub-leafs 2+ are variable, both in their existence and in what they enumerate. Bits 3:0 of EAX report the sub-leaf type, with the remaining bits in EAX, EBX, ECX and EDX being type-specific. Currently, the only known sub-leaf type enumerates an EPC section. An EPC section is simply a range of EPC memory available to software. The "list" of varaible SGX sub-leafs is NULL-terminated, i.e. software is expected to query CPUID until an invalid sub-leaf is encountered. Co-developed-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- arch/x86/include/asm/sgx_arch.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/include/asm/sgx_arch.h b/arch/x86/include/asm/sgx_arch.h index d4c57154e6e6..29c37971e8b3 100644 --- a/arch/x86/include/asm/sgx_arch.h +++ b/arch/x86/include/asm/sgx_arch.h @@ -11,6 +11,21 @@ #include <linux/types.h> #include <uapi/asm/sgx_errno.h> +#define SGX_CPUID 0x12 +#define SGX_CPUID_FIRST_VARIABLE_SUB_LEAF 2 + +/** + * enum sgx_sub_leaf_types - SGX CPUID variable sub-leaf types + * %SGX_CPUID_SUB_LEAF_INVALID: Indicates this sub-leaf is invalid. + * %SGX_CPUID_SUB_LEAF_EPC_SECTION: Sub-leaf enumerates an EPC section. + * %SGX_CPUID_SUB_LEAF_TYPE_MASK: Mask for bits containing the type. + */ +enum sgx_sub_leaf_types { + SGX_CPUID_SUB_LEAF_INVALID = 0x0, + SGX_CPUID_SUB_LEAF_EPC_SECTION = 0x1, + SGX_CPUID_SUB_LEAF_TYPE_MASK = 0xF, +}; + /** * enum sgx_encls_leaves - ENCLS leaf functions * %SGX_ECREATE: Create an enclave. -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> To: x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-sgx@vger.kernel.org Cc: dave.hansen@intel.com, sean.j.christopherson@intel.com, nhorman@redhat.com, npmccallum@redhat.com, serge.ayoun@intel.com, shay.katz-zamir@intel.com, haitao.huang@intel.com, mark.shanahan@intel.com, andriy.shevchenko@linux.intel.com, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, "H. Peter Anvin" <hpa@zytor.com>, linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH v15 11/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Date: Sat, 3 Nov 2018 01:11:10 +0200 [thread overview] Message-ID: <20181102231320.29164-12-jarkko.sakkinen@linux.intel.com> (raw) Message-ID: <20181102231110.AgxGPHp90VLXj4hB6u_JB76c3GISAHMO2PwNtfAvGQ4@z> (raw) In-Reply-To: <20181102231320.29164-1-jarkko.sakkinen@linux.intel.com> SGX defines its own CPUID leaf, 0x12, along with a variable number of sub-leafs. Sub-leafs 0 and 1 are always available if SGX is supported and enumerate various SGX features, e.g. instruction sets and enclave capabilities. Sub-leafs 2+ are variable, both in their existence and in what they enumerate. Bits 3:0 of EAX report the sub-leaf type, with the remaining bits in EAX, EBX, ECX and EDX being type-specific. Currently, the only known sub-leaf type enumerates an EPC section. An EPC section is simply a range of EPC memory available to software. The "list" of varaible SGX sub-leafs is NULL-terminated, i.e. software is expected to query CPUID until an invalid sub-leaf is encountered. Co-developed-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- arch/x86/include/asm/sgx_arch.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/include/asm/sgx_arch.h b/arch/x86/include/asm/sgx_arch.h index d4c57154e6e6..29c37971e8b3 100644 --- a/arch/x86/include/asm/sgx_arch.h +++ b/arch/x86/include/asm/sgx_arch.h @@ -11,6 +11,21 @@ #include <linux/types.h> #include <uapi/asm/sgx_errno.h> +#define SGX_CPUID 0x12 +#define SGX_CPUID_FIRST_VARIABLE_SUB_LEAF 2 + +/** + * enum sgx_sub_leaf_types - SGX CPUID variable sub-leaf types + * %SGX_CPUID_SUB_LEAF_INVALID: Indicates this sub-leaf is invalid. + * %SGX_CPUID_SUB_LEAF_EPC_SECTION: Sub-leaf enumerates an EPC section. + * %SGX_CPUID_SUB_LEAF_TYPE_MASK: Mask for bits containing the type. + */ +enum sgx_sub_leaf_types { + SGX_CPUID_SUB_LEAF_INVALID = 0x0, + SGX_CPUID_SUB_LEAF_EPC_SECTION = 0x1, + SGX_CPUID_SUB_LEAF_TYPE_MASK = 0xF, +}; + /** * enum sgx_encls_leaves - ENCLS leaf functions * %SGX_ECREATE: Create an enclave. -- 2.19.1
next prev parent reply other threads:[~2018-11-02 23:11 UTC|newest] Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-02 23:10 [PATCH v15 00/23] Intel SGX1 Jarkko Sakkinen 2018-11-02 23:10 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 01/23] x86/sgx: Update MAINTAINERS Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 02/23] x86/cpufeatures: Add Intel-defined SGX feature bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:33 ` Borislav Petkov 2018-11-02 23:33 ` Borislav Petkov 2018-11-02 23:55 ` Jarkko Sakkinen 2018-11-02 23:55 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 03/23] x86/cpufeatures: Add SGX sub-features (as Linux-defined bits) Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 04/23] x86/msr: Add IA32_FEATURE_CONTROL.SGX_ENABLE definition Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 05/23] x86/cpu/intel: Detect SGX support and update caps appropriately Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:05 ` Andy Shevchenko 2018-11-03 13:05 ` Andy Shevchenko 2018-11-05 14:09 ` Jarkko Sakkinen 2018-11-05 14:09 ` Jarkko Sakkinen 2018-11-05 14:11 ` Jarkko Sakkinen 2018-11-05 14:11 ` Jarkko Sakkinen 2018-11-05 14:31 ` Andy Shevchenko 2018-11-05 14:31 ` Andy Shevchenko 2018-11-02 23:11 ` [PATCH v15 06/23] x86/mm: x86/sgx: Add new 'PF_SGX' page fault error code bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 07/23] x86/mm: x86/sgx: Signal SIGSEGV for userspace #PFs w/ PF_SGX Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 08/23] x86/sgx: Define SGX1 and SGX2 ENCLS leafs Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 09/23] x86/sgx: Add ENCLS architectural error codes Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 10/23] x86/sgx: Add SGX1 and SGX2 architectural data structures Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen [this message] 2018-11-02 23:11 ` [PATCH v15 11/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Jarkko Sakkinen 2018-11-03 13:11 ` Andy Shevchenko 2018-11-03 13:11 ` Andy Shevchenko 2018-11-05 14:35 ` Jarkko Sakkinen 2018-11-05 14:35 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 12/23] x86/cpufeatures: Add Intel-defined SGX_LC feature bit Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 13/23] x86/msr: Add SGX Launch Control MSR definitions Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 14/23] x86/cpu/intel: Clear SGX_LC capability if not enabled in FEATURE_CONTROL Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:15 ` Andy Shevchenko 2018-11-03 13:15 ` Andy Shevchenko 2018-11-05 14:37 ` Jarkko Sakkinen 2018-11-05 14:37 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 15/23] x86/sgx: Add wrappers for ENCLS leaf functions Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 13:17 ` Andy Shevchenko 2018-11-03 13:17 ` Andy Shevchenko 2018-11-05 17:30 ` Jarkko Sakkinen 2018-11-05 17:30 ` Jarkko Sakkinen 2018-11-05 20:39 ` Andy Shevchenko 2018-11-05 20:39 ` Andy Shevchenko 2018-11-06 12:03 ` Jarkko Sakkinen 2018-11-06 12:03 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 16/23] x86/sgx: Enumerate and track EPC sections Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-03 1:07 ` Jethro Beekman 2018-11-03 1:07 ` Jethro Beekman 2018-11-05 17:31 ` Jarkko Sakkinen 2018-11-05 17:31 ` Jarkko Sakkinen 2018-11-03 13:22 ` Andy Shevchenko 2018-11-03 13:22 ` Andy Shevchenko 2018-11-05 17:35 ` Jarkko Sakkinen 2018-11-05 17:35 ` Jarkko Sakkinen 2018-11-06 12:10 ` Jarkko Sakkinen 2018-11-06 12:10 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 17/23] x86/sgx: Add functions to allocate and free EPC pages Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 18/23] x86/sgx: Add sgx_einit() for initializing enclaves Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 19/23] platform/x86: Intel SGX driver Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 20/23] platform/x86: sgx: Add swapping functionality to the " Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 21/23] x86/sgx: Add a simple swapper for the EPC memory manager Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 22/23] platform/x86: ptrace() support for the SGX driver Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-02 23:11 ` [PATCH v15 23/23] x86/sgx: Driver documentation Jarkko Sakkinen 2018-11-02 23:11 ` Jarkko Sakkinen 2018-11-04 8:15 ` Mike Rapoport 2018-11-04 8:15 ` Mike Rapoport 2018-11-05 17:39 ` Jarkko Sakkinen 2018-11-05 17:39 ` Jarkko Sakkinen 2018-11-05 20:27 ` Dave Hansen 2018-11-05 20:27 ` Dave Hansen 2018-11-06 5:49 ` Jarkko Sakkinen 2018-11-06 5:49 ` Jarkko Sakkinen 2018-11-06 6:20 ` Jarkko Sakkinen 2018-11-06 6:20 ` Jarkko Sakkinen 2018-11-06 16:45 ` Dave Hansen 2018-11-06 16:45 ` Dave Hansen 2018-11-07 16:30 ` Jarkko Sakkinen 2018-11-07 16:30 ` Jarkko Sakkinen 2018-11-07 17:09 ` Dave Hansen 2018-11-07 17:09 ` Dave Hansen 2018-11-08 14:39 ` Jarkko Sakkinen 2018-11-08 14:39 ` Jarkko Sakkinen 2018-11-08 19:20 ` Jarkko Sakkinen 2018-11-08 19:20 ` Jarkko Sakkinen 2018-11-13 15:13 ` Jarkko Sakkinen 2018-11-06 6:26 ` Jarkko Sakkinen 2018-11-06 6:26 ` Jarkko Sakkinen
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=20181102231320.29164-12-jarkko.sakkinen@linux.intel.com \ --to=jarkko.sakkinen@linux.intel.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=bp@alien8.de \ --cc=dave.hansen@intel.com \ --cc=haitao.huang@intel.com \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sgx@vger.kernel.org \ --cc=mark.shanahan@intel.com \ --cc=mingo@redhat.com \ --cc=nhorman@redhat.com \ --cc=npmccallum@redhat.com \ --cc=platform-driver-x86@vger.kernel.org \ --cc=sean.j.christopherson@intel.com \ --cc=serge.ayoun@intel.com \ --cc=shay.katz-zamir@intel.com \ --cc=tglx@linutronix.de \ --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: linkBe 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).