From: Kai Huang <kai.huang@intel.com>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: linux-sgx@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org,
seanjc@google.com, luto@kernel.org, dave.hansen@intel.com,
haitao.huang@intel.com, pbonzini@redhat.com, bp@alien8.de,
tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com
Subject: Re: [RFC PATCH v2 13/26] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM
Date: Thu, 21 Jan 2021 12:29:31 +1300 [thread overview]
Message-ID: <20210121122931.f9168f16f0738e8fddafb9f5@intel.com> (raw)
In-Reply-To: <YAgcVIzdFU3cl3SW@kernel.org>
On Wed, 20 Jan 2021 14:04:36 +0200 Jarkko Sakkinen wrote:
> On Mon, Jan 18, 2021 at 04:28:06PM +1300, Kai Huang wrote:
> > From: Sean Christopherson <sean.j.christopherson@intel.com>
> >
> > The bare-metal kernel must intercept ECREATE to be able to impose policies
> > on guests. When it does this, the bare-metal kernel runs ECREATE against
> > the userspace mapping of the virtualized EPC.
> >
> > Provide wrappers around __ecreate() and __einit() to hide the ugliness
> > of overloading the ENCLS return value to encode multiple error formats
> > in a single int. KVM will trap-and-execute ECREATE and EINIT as part
> > of SGX virtualization, and on an exception, KVM needs the trapnr so that
> > it can inject the correct fault into the guest.
> >
> > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
> > [Kai: Use sgx_update_lepubkeyhash() to update pubkey hash MSRs.]
>
> If you have to go to this, please instead use co-developed-by.
I'll remove it. I don't want to use co-developed-by here.
>
> > Signed-off-by: Kai Huang <kai.huang@intel.com>
> > ---
> > v1->v2:
> >
> > - Refined commit msg based on Dave's comment.
> > - Added comment to explain why to use __uaccess_xxx().
> > ---
> > arch/x86/include/asm/sgx.h | 16 +++++++++
> > arch/x86/kernel/cpu/sgx/virt.c | 61 ++++++++++++++++++++++++++++++++++
> > 2 files changed, 77 insertions(+)
> > create mode 100644 arch/x86/include/asm/sgx.h
> >
> > diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h
> > new file mode 100644
> > index 000000000000..0d643b985085
> > --- /dev/null
> > +++ b/arch/x86/include/asm/sgx.h
> > @@ -0,0 +1,16 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +#ifndef _ASM_X86_SGX_H
> > +#define _ASM_X86_SGX_H
> > +
> > +#include <linux/types.h>
> > +
> > +#ifdef CONFIG_X86_SGX_VIRTUALIZATION
> > +struct sgx_pageinfo;
> > +
> > +int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
> > + int *trapnr);
> > +int sgx_virt_einit(void __user *sigstruct, void __user *token,
> > + void __user *secs, u64 *lepubkeyhash, int *trapnr);
> > +#endif
> > +
> > +#endif /* _ASM_X86_SGX_H */
> > diff --git a/arch/x86/kernel/cpu/sgx/virt.c b/arch/x86/kernel/cpu/sgx/virt.c
> > index 1e8620f20651..97f02e5235ca 100644
> > --- a/arch/x86/kernel/cpu/sgx/virt.c
> > +++ b/arch/x86/kernel/cpu/sgx/virt.c
> > @@ -253,3 +253,64 @@ int __init sgx_virt_epc_init(void)
> >
> > return misc_register(&sgx_virt_epc_dev);
> > }
> > +
> > +int sgx_virt_ecreate(struct sgx_pageinfo *pageinfo, void __user *secs,
> > + int *trapnr)
> > +{
> > + int ret;
> > +
> > + /*
> > + * @secs is userspace address, and it's not guaranteed @secs points at
> > + * an actual EPC page. It's also possible to generate a kernel mapping
> > + * to physical EPC page by resolving PFN but using __uaccess_xx() is
> > + * simpler.
> > + */
> > + __uaccess_begin();
> > + ret = __ecreate(pageinfo, (void *)secs);
> > + __uaccess_end();
> > +
> > + if (encls_faulted(ret)) {
> > + *trapnr = ENCLS_TRAPNR(ret);
> > + return -EFAULT;
> > + }
> > +
> > + /* ECREATE doesn't return an error code, it faults or succeeds. */
> > + WARN_ON_ONCE(ret);
> > + return 0;
> > +}
> > +EXPORT_SYMBOL_GPL(sgx_virt_ecreate);
> > +
> > +static int __sgx_virt_einit(void __user *sigstruct, void __user *token,
> > + void __user *secs)
> > +{
> > + int ret;
> > +
> > + __uaccess_begin();
> > + ret = __einit((void *)sigstruct, (void *)token, (void *)secs);
> > + __uaccess_end();
> > + return ret;
> > +}
> > +
> > +int sgx_virt_einit(void __user *sigstruct, void __user *token,
> > + void __user *secs, u64 *lepubkeyhash, int *trapnr)
>
> kdoc missing.
OK. Will add for both sgx_virt_create() and sgx_virt_init().
>
> > +{
> > + int ret;
> > +
> > + if (!boot_cpu_has(X86_FEATURE_SGX_LC)) {
> > + ret = __sgx_virt_einit(sigstruct, token, secs);
> > + } else {
> > + preempt_disable();
> > +
> > + sgx_update_lepubkeyhash(lepubkeyhash);
> > +
> > + ret = __sgx_virt_einit(sigstruct, token, secs);
> > + preempt_enable();
> > + }
> > +
> > + if (encls_faulted(ret)) {
> > + *trapnr = ENCLS_TRAPNR(ret);
> > + return -EFAULT;
> > + }
> > + return ret;
> > +}
> > +EXPORT_SYMBOL_GPL(sgx_virt_einit);
> > --
> > 2.29.2
> >
> >
>
> /Jarkko
next prev parent reply other threads:[~2021-01-21 0:08 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 3:26 [RFC PATCH v2 00/26] KVM SGX virtualization support Kai Huang
2021-01-18 3:26 ` [RFC PATCH v2 01/26] x86/cpufeatures: Add SGX1 and SGX2 sub-features Kai Huang
2021-01-19 16:19 ` Borislav Petkov
2021-01-19 18:03 ` Sean Christopherson
2021-01-19 22:54 ` Kai Huang
2021-01-20 10:28 ` Borislav Petkov
2021-01-20 11:50 ` Jarkko Sakkinen
2021-01-20 23:23 ` Kai Huang
2021-01-21 1:01 ` Jarkko Sakkinen
2021-01-18 3:26 ` [RFC PATCH v2 02/26] x86/sgx: Remove a warn from sgx_free_epc_page() Kai Huang
2021-01-19 8:32 ` Jarkko Sakkinen
2021-01-20 0:42 ` Kai Huang
2021-01-18 3:26 ` [RFC PATCH v2 03/26] x86/sgx: Wipe out EREMOVE " Kai Huang
2021-01-18 3:26 ` [RFC PATCH v2 04/26] x86/sgx: Add SGX_CHILD_PRESENT hardware error code Kai Huang
2021-01-20 11:51 ` Jarkko Sakkinen
2021-01-18 3:26 ` [RFC PATCH v2 05/26] x86/sgx: Introduce virtual EPC for use by KVM guests Kai Huang
2021-01-20 11:54 ` Jarkko Sakkinen
2021-01-20 17:40 ` Sean Christopherson
2021-01-21 0:54 ` Jarkko Sakkinen
2021-01-21 0:55 ` Jarkko Sakkinen
2021-01-18 3:27 ` [RFC PATCH v2 06/26] x86/cpu/intel: Allow SGX virtualization without Launch Control support Kai Huang
2021-01-20 21:02 ` Dave Hansen
2021-01-20 22:36 ` Sean Christopherson
2021-01-20 23:27 ` Dave Hansen
2021-01-20 23:48 ` Kai Huang
2021-01-20 23:51 ` Dave Hansen
2021-01-21 1:53 ` Kai Huang
2021-01-21 14:35 ` Jarkko Sakkinen
2021-01-21 1:12 ` Jarkko Sakkinen
2021-01-20 23:50 ` Kai Huang
2021-01-21 1:11 ` Jarkko Sakkinen
2021-01-18 3:27 ` [RFC PATCH v2 07/26] x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled Kai Huang
2021-01-18 3:27 ` [RFC PATCH v2 08/26] x86/sgx: Expose SGX architectural definitions to the kernel Kai Huang
2021-01-20 11:58 ` Jarkko Sakkinen
2021-01-20 23:53 ` Kai Huang
2021-01-18 3:27 ` [RFC PATCH v2 09/26] x86/sgx: Move ENCLS leaf definitions to sgx_arch.h Kai Huang
2021-01-20 11:59 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 10/26] x86/sgx: Add SGX2 ENCLS leaf definitions (EAUG, EMODPR and EMODT) Kai Huang
2021-01-20 11:59 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 11/26] x86/sgx: Add encls_faulted() helper Kai Huang
2021-01-20 12:03 ` Jarkko Sakkinen
2021-01-20 23:43 ` Kai Huang
2021-01-21 1:08 ` Jarkko Sakkinen
2021-01-21 1:12 ` Kai Huang
2021-01-21 14:38 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 12/26] x86/sgx: Add helper to update SGX_LEPUBKEYHASHn MSRs Kai Huang
2021-01-20 12:03 ` Jarkko Sakkinen
2021-01-20 18:36 ` Dave Hansen
2021-01-20 23:36 ` Kai Huang
2021-01-20 23:50 ` Dave Hansen
2021-01-21 1:06 ` Kai Huang
2021-01-21 1:15 ` Dave Hansen
2021-01-21 1:44 ` Kai Huang
2021-01-21 14:36 ` Jarkko Sakkinen
2021-01-21 1:18 ` Kai Huang
2021-01-21 1:09 ` Jarkko Sakkinen
2021-01-21 1:08 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 13/26] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM Kai Huang
2021-01-20 12:04 ` Jarkko Sakkinen
2021-01-20 23:29 ` Kai Huang [this message]
2021-01-18 3:28 ` [RFC PATCH v2 14/26] x86/sgx: Move provisioning device creation out of SGX driver Kai Huang
2021-01-20 14:09 ` Jarkko Sakkinen
2021-01-20 23:24 ` Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 15/26] KVM: VMX: Convert vcpu_vmx.exit_reason to a union Kai Huang
2021-01-20 14:18 ` Jarkko Sakkinen
2021-01-20 16:39 ` Sean Christopherson
2021-01-21 0:47 ` Jarkko Sakkinen
2021-01-21 16:33 ` Sean Christopherson
2021-01-22 17:29 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 16/26] KVM: x86: Export kvm_mmu_gva_to_gpa_{read,write}() for SGX (VMX) Kai Huang
2021-01-20 14:19 ` Jarkko Sakkinen
2021-01-18 3:28 ` [RFC PATCH v2 17/26] KVM: x86: Define new #PF SGX error code bit Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 18/26] KVM: x86: Add support for reverse CPUID lookup of scattered features Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 19/26] KVM: x86: Add reverse-CPUID lookup support for scattered SGX features Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 20/26] KVM: VMX: Add basic handling of VM-Exit from SGX enclave Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 21/26] KVM: VMX: Frame in ENCLS handler for SGX virtualization Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 22/26] KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 23/26] KVM: VMX: Add emulation of SGX Launch Control LE hash MSRs Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 24/26] KVM: VMX: Add ENCLS[EINIT] handler to support SGX Launch Control (LC) Kai Huang
2021-01-18 3:28 ` [RFC PATCH v2 25/26] KVM: VMX: Enable SGX virtualization for SGX1, SGX2 and LC Kai Huang
2021-01-18 3:29 ` [RFC PATCH v2 26/26] KVM: x86: Add capability to grant VM access to privileged SGX attribute Kai Huang
2021-01-19 8:23 ` [RFC PATCH v2 00/26] KVM SGX virtualization support Jarkko Sakkinen
2021-01-20 0:52 ` Kai Huang
2021-01-20 16:35 ` Sean Christopherson
2021-01-20 16:39 ` Paolo Bonzini
2021-01-21 1:28 ` Kai Huang
2021-01-20 23:43 ` Jarkko Sakkinen
2021-01-20 23:52 ` Kai Huang
2021-01-21 1:16 ` Jarkko Sakkinen
2021-01-21 1:27 ` Kai Huang
2021-01-21 14:34 ` 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=20210121122931.f9168f16f0738e8fddafb9f5@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=kvm@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.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).