linux-sgx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
	<x86@kernel.org>,
	Platform Driver <platform-driver-x86@vger.kernel.org>,
	<linux-sgx@vger.kernel.org>, Dave Hansen <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>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	"David Woodhouse" <dwmw@amazon.co.uk>, <davidwang@zhaoxin.com>,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>,
	<qianyue.zj@alibaba-inc.com>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v15 05/23] x86/cpu/intel: Detect SGX support and update caps appropriately
Date: Sat, 3 Nov 2018 15:05:39 +0200	[thread overview]
Message-ID: <CAHp75VcG4FtiS9bDM_pP216kxobFxkChDu6uxvuTsMHQ=YJ3Zg@mail.gmail.com> (raw)
In-Reply-To: <20181102231320.29164-6-jarkko.sakkinen@linux.intel.com>

On Sat, Nov 3, 2018 at 1:16 AM Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com> 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).
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
>  arch/x86/kernel/cpu/intel.c | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index fc3c07fe7df5..9bf8fe2c04ac 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -596,6 +596,30 @@ static void detect_tme(struct cpuinfo_x86 *c)
>         c->x86_phys_bits -= keyid_bits;
>  }
>
> +static void detect_sgx(struct cpuinfo_x86 *c)
> +{
> +       bool unsupported = false;
> +       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");
> +               unsupported = true;
> +       } else if (!(fc & FEATURE_CONTROL_SGX_ENABLE)) {
> +               pr_err_once("sgx: not enabled in IA32_FEATURE_CONTROL MSR\n");
> +               unsupported = true;
> +       } else if (!cpu_has(c, X86_FEATURE_SGX1)) {
> +               pr_err_once("sgx: SGX1 instruction set not supported\n");
> +               unsupported = true;
> +       }

If you do

} else {
 /* Supported */
 return;
}

here, you may get rid of temporary variable.

(Up to you)

> +
> +       if (unsupported) {
> +               setup_clear_cpu_cap(X86_FEATURE_SGX);
> +               setup_clear_cpu_cap(X86_FEATURE_SGX1);
> +               setup_clear_cpu_cap(X86_FEATURE_SGX2);
> +       }
> +}
> +
>  static void init_intel_energy_perf(struct cpuinfo_x86 *c)
>  {
>         u64 epb;
> @@ -763,6 +787,9 @@ static void init_intel(struct cpuinfo_x86 *c)
>         if (cpu_has(c, X86_FEATURE_TME))
>                 detect_tme(c);
>
> +       if (cpu_has(c, X86_FEATURE_SGX))
> +               detect_sgx(c);
> +
>         init_intel_energy_perf(c);
>
>         init_intel_misc_features(c);
> --
> 2.19.1
>


-- 
With Best Regards,
Andy Shevchenko

WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)"
	<x86@kernel.org>,
	Platform Driver <platform-driver-x86@vger.kernel.org>,
	linux-sgx@vger.kernel.org, Dave Hansen <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,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	David Woodhouse <dwmw@amazon.co.uk>,
	davidwang@zhaoxin.com,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>,
	qianyue.zj@alibaba-inc.com,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v15 05/23] x86/cpu/intel: Detect SGX support and update caps appropriately
Date: Sat, 3 Nov 2018 15:05:39 +0200	[thread overview]
Message-ID: <CAHp75VcG4FtiS9bDM_pP216kxobFxkChDu6uxvuTsMHQ=YJ3Zg@mail.gmail.com> (raw)
Message-ID: <20181103130539.K_SDeVCR3Q_aSr-sPThSP_3KcTHRCpF-FSOefF8tGbk@z> (raw)
In-Reply-To: <20181102231320.29164-6-jarkko.sakkinen@linux.intel.com>

On Sat, Nov 3, 2018 at 1:16 AM Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com> 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).
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> ---
>  arch/x86/kernel/cpu/intel.c | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)
>
> diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
> index fc3c07fe7df5..9bf8fe2c04ac 100644
> --- a/arch/x86/kernel/cpu/intel.c
> +++ b/arch/x86/kernel/cpu/intel.c
> @@ -596,6 +596,30 @@ static void detect_tme(struct cpuinfo_x86 *c)
>         c->x86_phys_bits -= keyid_bits;
>  }
>
> +static void detect_sgx(struct cpuinfo_x86 *c)
> +{
> +       bool unsupported = false;
> +       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");
> +               unsupported = true;
> +       } else if (!(fc & FEATURE_CONTROL_SGX_ENABLE)) {
> +               pr_err_once("sgx: not enabled in IA32_FEATURE_CONTROL MSR\n");
> +               unsupported = true;
> +       } else if (!cpu_has(c, X86_FEATURE_SGX1)) {
> +               pr_err_once("sgx: SGX1 instruction set not supported\n");
> +               unsupported = true;
> +       }

If you do

} else {
 /* Supported */
 return;
}

here, you may get rid of temporary variable.

(Up to you)

> +
> +       if (unsupported) {
> +               setup_clear_cpu_cap(X86_FEATURE_SGX);
> +               setup_clear_cpu_cap(X86_FEATURE_SGX1);
> +               setup_clear_cpu_cap(X86_FEATURE_SGX2);
> +       }
> +}
> +
>  static void init_intel_energy_perf(struct cpuinfo_x86 *c)
>  {
>         u64 epb;
> @@ -763,6 +787,9 @@ static void init_intel(struct cpuinfo_x86 *c)
>         if (cpu_has(c, X86_FEATURE_TME))
>                 detect_tme(c);
>
> +       if (cpu_has(c, X86_FEATURE_SGX))
> +               detect_sgx(c);
> +
>         init_intel_energy_perf(c);
>
>         init_intel_misc_features(c);
> --
> 2.19.1
>


-- 
With Best Regards,
Andy Shevchenko

  parent reply	other threads:[~2018-11-03 13:05 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 [this message]
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 ` [PATCH v15 11/23] x86/sgx: Add definitions for SGX's CPUID leaf and variable sub-leafs Jarkko Sakkinen
2018-11-02 23:11   ` 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='CAHp75VcG4FtiS9bDM_pP216kxobFxkChDu6uxvuTsMHQ=YJ3Zg@mail.gmail.com' \
    --to=andy.shevchenko@gmail.com \
    --cc=alexander.levin@verizon.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bp@alien8.de \
    --cc=dave.hansen@intel.com \
    --cc=davidwang@zhaoxin.com \
    --cc=dwmw@amazon.co.uk \
    --cc=haitao.huang@intel.com \
    --cc=hpa@zytor.com \
    --cc=jarkko.sakkinen@linux.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=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).