From: Borislav Petkov <bp@alien8.de>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: x86@kernel.org, platform-driver-x86@vger.kernel.org,
linux-sgx@vger.kernel.org, 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@linux.intel.com,
andriy.shevchenko@linux.intel.com, tglx@linutronix.de,
kai.svahn@intel.com, mark.shanahan@intel.com,
luto@amacapital.net, Ingo Molnar <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
David Woodhouse <dwmw@amazon.co.uk>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
David Wang <davidwang@zhaoxin.com>,
"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>,
Jia Zhang <qianyue.zj@alibaba-inc.com>,
"open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v17 06/23] x86/cpu/intel: Detect SGX support and update caps appropriately
Date: Wed, 21 Nov 2018 19:17:28 +0100 [thread overview]
Message-ID: <20181121181728.GA27559@zn.tnic> (raw)
In-Reply-To: <20181116010412.23967-7-jarkko.sakkinen@linux.intel.com>
On Fri, Nov 16, 2018 at 03:01:13AM +0200, Jarkko Sakkinen wrote:
> From: Sean Christopherson <sean.j.christopherson@intel.com>
>
> Similar to other large Intel features such as VMX and TXT, SGX must be
> explicitly enabled in IA32_FEATURE_CONTROL MSR to be truly usable.
> Clear all SGX related capabilities if SGX is not fully enabled in
> IA32_FEATURE_CONTROL or if the SGX1 instruction set isn't supported
> (impossible on bare metal, theoretically possible in a VM if the VMM is
> doing something weird).
>
> Like SGX itself, SGX Launch Control must be explicitly enabled via a
> flag in IA32_FEATURE_CONTROL. Clear the SGX_LC capability if Launch
> Control is not fully enabled (or obviously if SGX itself is disabled).
>
> Note that clearing X86_FEATURE_SGX_LC creates a bit of a conundrum
> regarding the SGXLEPUBKEYHASH MSRs, as it may be desirable to read the
> MSRs even if they are not writable, e.g. to query the configured key,
> but clearing the capability leaves no breadcrum for discerning whether
> or not the MSRs exist. But, such usage will be rare (KVM is the only
> known case at this time) and not performance critical, so it's not
> unreasonable to require the use of rdmsr_safe(). Clearing the cap bit
> eliminates the need for an additional flag to track whether or not
> Launch Control is truly enabled, which is what we care about the vast
> majority of the time.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> Co-developed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
> ---
> arch/x86/kernel/cpu/intel.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index fc3c07fe7df5..8a20a193d399 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -596,6 +596,40 @@ static void detect_tme(struct cpuinfo_x86 *c)
> c->x86_phys_bits -= keyid_bits;
> }
>
> +static void detect_sgx(struct cpuinfo_x86 *c)
> +{
> + unsigned long long fc;
> +
> + rdmsrl(MSR_IA32_FEATURE_CONTROL, fc);
> + if (!(fc & FEATURE_CONTROL_LOCKED)) {
> + pr_err_once("sgx: IA32_FEATURE_CONTROL MSR is not locked\n");
> + goto out_unsupported;
> + }
> +
> + if (!(fc & FEATURE_CONTROL_SGX_ENABLE)) {
> + pr_err_once("sgx: not enabled in IA32_FEATURE_CONTROL MSR\n");
Start those messages with a capital letter: "sgx: SGX is not enabled ...".
> + goto out_unsupported;
> + }
> +
> + if (!cpu_has(c, X86_FEATURE_SGX1)) {
> + pr_err_once("sgx: SGX1 instruction set not supported\n");
> + goto out_unsupported;
> + }
> +
> + if (!(fc & FEATURE_CONTROL_SGX_LE_WR)) {
I see the build failure here has been pointed out already but lemme
repeat it out for another reason:
It is very important that no patch we merge breaks bisectability -
please build every patch before sending:
arch/x86/kernel/cpu/intel.c: In function ‘detect_sgx’:
arch/x86/kernel/cpu/intel.c:619:13: error: ‘FEATURE_CONTROL_SGX_LE_WR’ undeclared (first use in this function); did you mean ‘FEATURE_CONTROL_SGX_ENABLE’?
if (!(fc & FEATURE_CONTROL_SGX_LE_WR)) {
^~~~~~~~~~~~~~~~~~~~~~~~~
FEATURE_CONTROL_SGX_ENABLE
arch/x86/kernel/cpu/intel.c:619:13: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [scripts/Makefile.build:291: arch/x86/kernel/cpu/intel.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [scripts/Makefile.build:516: arch/x86/kernel/cpu] Error 2
make[1]: *** [scripts/Makefile.build:516: arch/x86/kernel] Error 2
make: *** [Makefile:1060: arch/x86] Error 2
make: *** Waiting for unfinished jobs....
> + pr_info_once("sgx: launch control MSRs are not writable\n");
> + goto out_msrs_rdonly;
> + }
> +
> + return;
<---- newline here.
> +out_unsupported:
> + setup_clear_cpu_cap(X86_FEATURE_SGX);
> + setup_clear_cpu_cap(X86_FEATURE_SGX1);
> + setup_clear_cpu_cap(X86_FEATURE_SGX2);
<---- newline here.
> +out_msrs_rdonly:
> + setup_clear_cpu_cap(X86_FEATURE_SGX_LC);
> +}
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2018-11-21 18:17 UTC|newest]
Thread overview: 161+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181116010412.23967-1-jarkko.sakkinen@linux.intel.com>
2018-11-16 1:01 ` [PATCH v17 01/23] x86/sgx: Update MAINTAINERS Jarkko Sakkinen
2018-11-16 14:22 ` Borislav Petkov
2018-11-16 15:07 ` Jarkko Sakkinen
2018-11-16 20:24 ` Borislav Petkov
2018-11-18 8:20 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 02/23] x86/cpufeatures: Add Intel-defined SGX feature bit Jarkko Sakkinen
2018-11-16 14:28 ` Borislav Petkov
2018-11-16 15:13 ` Jarkko Sakkinen
2018-11-16 15:18 ` Jarkko Sakkinen
2018-11-16 20:53 ` Borislav Petkov
2018-11-16 1:01 ` [PATCH v17 03/23] x86/cpufeatures: Add SGX sub-features (as Linux-defined bits) Jarkko Sakkinen
2018-11-16 14:37 ` Borislav Petkov
2018-11-16 15:38 ` Sean Christopherson
2018-11-16 23:31 ` Dave Hansen
2018-11-18 8:36 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 04/23] x86/msr: Add IA32_FEATURE_CONTROL.SGX_ENABLE definition Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 05/23] x86/cpufeatures: Add Intel-defined SGX_LC feature bit Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 06/23] x86/cpu/intel: Detect SGX support and update caps appropriately Jarkko Sakkinen
2018-11-16 23:32 ` Dave Hansen
2018-11-18 8:37 ` Jarkko Sakkinen
2018-11-21 18:17 ` Borislav Petkov [this message]
2018-11-24 13:54 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 07/23] x86/mm: x86/sgx: Add new 'PF_SGX' page fault error code bit Jarkko Sakkinen
2018-11-16 23:33 ` Dave Hansen
2018-11-18 8:38 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 08/23] x86/mm: x86/sgx: Signal SIGSEGV for userspace #PFs w/ PF_SGX Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 09/23] x86/sgx: Define SGX1 and SGX2 ENCLS leafs Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 10/23] x86/sgx: Add ENCLS architectural error codes Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 11/23] x86/sgx: Add SGX1 and SGX2 architectural data structures Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 12/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 13/23] x86/msr: Add SGX Launch Control MSR definitions Jarkko Sakkinen
2018-11-16 17:29 ` Sean Christopherson
2018-11-18 8:19 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 14/23] x86/sgx: Add wrappers for ENCLS leaf functions Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 15/23] x86/sgx: Enumerate and track EPC sections Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 16/23] x86/sgx: Add functions to allocate and free EPC pages Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 17/23] x86/sgx: Add sgx_einit() for initializing enclaves Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 18/23] platform/x86: Intel SGX driver Jarkko Sakkinen
2018-11-16 1:37 ` Randy Dunlap
2018-11-16 11:23 ` Jarkko Sakkinen
2018-11-19 15:06 ` Jarkko Sakkinen
2018-11-19 16:22 ` Jethro Beekman
2018-11-19 17:19 ` Jarkko Sakkinen
2018-11-19 17:39 ` Jethro Beekman
2018-11-20 10:58 ` Jarkko Sakkinen
2018-11-21 15:24 ` Jarkko Sakkinen
2018-11-19 18:18 ` Andy Lutomirski
2018-11-20 11:00 ` Jarkko Sakkinen
2018-11-19 15:29 ` Andy Lutomirski
2018-11-19 16:19 ` Jarkko Sakkinen
2018-11-19 16:59 ` Andy Lutomirski
2018-11-20 12:04 ` Jarkko Sakkinen
2018-11-22 11:12 ` Dr. Greg
2018-11-22 15:21 ` Andy Lutomirski
2018-11-24 17:21 ` Jarkko Sakkinen
2018-11-24 20:13 ` Dr. Greg
2018-11-26 21:15 ` Jarkko Sakkinen
2018-11-25 14:53 ` Jarkko Sakkinen
2018-11-25 16:22 ` Andy Lutomirski
2018-11-25 18:55 ` Dr. Greg
2018-11-25 23:51 ` Jarkko Sakkinen
[not found] ` <D45BC005-5064-4C75-B486-4E43C454E2F6@amacapital.net>
2018-11-26 0:37 ` Andy Lutomirski
2018-11-26 11:00 ` Dr. Greg
2018-11-26 18:22 ` Andy Lutomirski
2018-11-26 22:16 ` Jarkko Sakkinen
2018-11-26 21:51 ` Jarkko Sakkinen
2018-11-26 23:04 ` Jarkko Sakkinen
2018-11-27 8:55 ` Dr. Greg
2018-11-27 16:41 ` Jarkko Sakkinen
2018-11-27 17:55 ` Andy Lutomirski
2018-11-28 10:49 ` Dr. Greg
2018-11-28 19:22 ` Jarkko Sakkinen
2018-12-10 10:49 ` Dr. Greg
2018-12-12 18:00 ` Jarkko Sakkinen
2018-12-14 23:59 ` Dr. Greg
2018-12-15 0:06 ` Sean Christopherson
2018-12-15 23:22 ` Dr. Greg
2018-12-17 14:27 ` Sean Christopherson
2018-12-17 13:28 ` Jarkko Sakkinen
2018-12-17 13:39 ` Jarkko Sakkinen
2018-12-17 14:08 ` Jarkko Sakkinen
2018-12-17 14:13 ` Jarkko Sakkinen
2018-12-17 16:34 ` Dr. Greg
2018-12-17 17:31 ` Sean Christopherson
2018-12-17 17:49 ` Jarkko Sakkinen
2018-12-17 18:09 ` Sean Christopherson
2018-12-17 18:23 ` Jarkko Sakkinen
2018-12-17 18:46 ` Sean Christopherson
2018-12-17 19:36 ` Jarkko Sakkinen
2018-11-27 16:46 ` Jarkko Sakkinen
2018-11-28 21:52 ` Andy Lutomirski
2018-11-27 7:46 ` Jethro Beekman
2018-11-27 16:36 ` Jarkko Sakkinen
2018-11-22 20:56 ` Andy Lutomirski
2018-11-23 10:39 ` Dr. Greg
2018-11-24 16:45 ` Jarkko Sakkinen
2018-11-28 5:08 ` Jarkko Sakkinen
2018-11-28 5:38 ` Jethro Beekman
2018-12-09 17:01 ` Pavel Machek
2018-11-20 11:15 ` Dr. Greg
2018-11-24 16:15 ` Jarkko Sakkinen
2018-11-24 19:24 ` Dr. Greg
2018-11-26 19:39 ` Jarkko Sakkinen
2018-12-09 17:01 ` Pavel Machek
2018-12-10 14:46 ` Dr. Greg
2018-12-17 17:45 ` Dave Hansen
2018-12-17 18:01 ` Jarkko Sakkinen
2018-12-17 18:07 ` Dave Hansen
2018-12-17 18:31 ` Jarkko Sakkinen
2018-12-17 18:36 ` Sean Christopherson
2018-12-17 18:43 ` Jarkko Sakkinen
2018-12-17 18:47 ` Dave Hansen
2018-12-17 19:12 ` Andy Lutomirski
2018-12-17 19:17 ` Dave Hansen
2018-12-17 19:25 ` Andy Lutomirski
2018-12-17 19:54 ` Jarkko Sakkinen
2018-12-17 19:49 ` Jarkko Sakkinen
2018-12-17 19:53 ` Dave Hansen
2018-12-17 19:55 ` Andy Lutomirski
2018-12-17 20:03 ` Dave Hansen
2018-12-17 20:10 ` Andy Lutomirski
2018-12-17 20:15 ` Dave Hansen
2018-12-17 22:36 ` Sean Christopherson
2018-12-18 1:40 ` Jarkko Sakkinen
2018-12-17 22:20 ` Sean Christopherson
2018-12-18 1:39 ` Jarkko Sakkinen
2018-12-18 3:27 ` Jarkko Sakkinen
2018-12-18 5:02 ` Andy Lutomirski
2018-12-18 13:27 ` Jarkko Sakkinen
2018-12-18 4:55 ` Andy Lutomirski
2018-12-18 13:18 ` Jarkko Sakkinen
2018-12-18 4:59 ` Andy Lutomirski
2018-12-18 13:11 ` Jarkko Sakkinen
2018-12-18 15:44 ` Sean Christopherson
2018-12-18 18:53 ` Sean Christopherson
2018-12-19 5:00 ` Jarkko Sakkinen
2018-12-19 5:13 ` Jarkko Sakkinen
2018-12-21 18:28 ` Sean Christopherson
2018-12-22 0:01 ` Jarkko Sakkinen
2018-12-19 4:47 ` Jarkko Sakkinen
2018-12-19 5:24 ` Jarkko Sakkinen
2018-12-18 1:17 ` Jarkko Sakkinen
2018-12-18 1:31 ` Jarkko Sakkinen
2018-12-17 18:48 ` Sean Christopherson
2018-12-17 19:09 ` Dave Hansen
2018-12-17 19:37 ` Jarkko Sakkinen
2018-12-17 19:40 ` Dave Hansen
2018-12-17 19:33 ` Jarkko Sakkinen
2018-12-17 20:21 ` Jarkko Sakkinen
2018-12-18 13:13 ` Jarkko Sakkinen
2018-12-18 15:46 ` Sean Christopherson
2018-12-18 5:55 ` Andy Lutomirski
2018-12-19 5:22 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 19/23] platform/x86: sgx: Add swapping functionality to the " Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 20/23] x86/sgx: Add a simple swapper for the EPC memory manager Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 21/23] platform/x86: ptrace() support for the SGX driver Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 22/23] x86/sgx: SGX documentation Jarkko Sakkinen
2018-12-03 3:28 ` Randy Dunlap
2018-12-03 9:32 ` Jarkko Sakkinen
2018-11-16 1:01 ` [PATCH v17 23/23] selftests/x86: Add a selftest for SGX Jarkko Sakkinen
2018-11-16 11:17 ` [PATCH v17 00/23] Intel SGX1 support 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=20181121181728.GA27559@zn.tnic \
--to=bp@alien8.de \
--cc=alexander.levin@verizon.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=dave.hansen@intel.com \
--cc=davidwang@zhaoxin.com \
--cc=dwmw@amazon.co.uk \
--cc=haitao.huang@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=kai.svahn@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@amacapital.net \
--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=qianyue.zj@alibaba-inc.com \
--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: 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).