From: Jarkko Sakkinen <jarkko@kernel.org>
To: Kai Huang <kai.huang@intel.com>
Cc: linux-sgx@vger.kernel.org, kvm@vger.kernel.org, x86@kernel.org,
seanjc@google.com, 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
Subject: Re: [RFC PATCH v5 13/26] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM
Date: Tue, 16 Feb 2021 05:09:14 +0200 [thread overview]
Message-ID: <YCs3Wt+il5+pnwCV@kernel.org> (raw)
In-Reply-To: <YCs3IZ/Edv6AeIYo@kernel.org>
On Tue, Feb 16, 2021 at 05:08:20AM +0200, Jarkko Sakkinen wrote:
> On Sun, Feb 14, 2021 at 02:29:15AM +1300, Kai Huang wrote:
> > From: Sean Christopherson <sean.j.christopherson@intel.com>
> >
> > The host kernel must intercept ECREATE to be able to impose policies on
> > guests. When it does this, the host 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>
> > Signed-off-by: Kai Huang <kai.huang@intel.com>
> > ---
> > v4->v5:
> >
> > - No code change.
> >
> > v3->v4:
> >
> > - Added one new line before last return in sgx_virt_einit(), per Jarkko.
> >
> > v2->v3:
> >
> > - Added kdoc for sgx_virt_ecreate() and sgx_virt_einit(), per Jarkko.
> > - Changed to use CONFIG_X86_SGX_KVM.
> >
> > ---
> > arch/x86/include/asm/sgx.h | 16 ++++++
> > arch/x86/kernel/cpu/sgx/virt.c | 94 ++++++++++++++++++++++++++++++++++
> > 2 files changed, 110 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..8a3ea3e1efbe
> > --- /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_KVM
> > +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);
>
> s/virt/vepc/g
>
> > +#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 47542140f8c1..016bad7cff8d 100644
> > --- a/arch/x86/kernel/cpu/sgx/virt.c
> > +++ b/arch/x86/kernel/cpu/sgx/virt.c
>
> Rename as vepc.c.
>
> > @@ -257,3 +257,97 @@ int __init sgx_vepc_init(void)
> >
> > return misc_register(&sgx_vepc_dev);
> > }
> > +
> > +/**
> > + * sgx_virt_ecreate() - Run ECREATE on behalf of guest
> > + * @pageinfo: Pointer to PAGEINFO structure
> > + * @secs: Userspace pointer to SECS page
> > + * @trapnr: trap number injected to guest in case of ECREATE error
> > + *
> > + * Run ECREATE on behalf of guest after KVM traps ECREATE for the purpose
> > + * of enforcing policies of guest's enclaves, and return the trap number
> > + * which should be injected to guest in case of any ECREATE error.
> > + *
> > + * Return:
> > + * - 0: ECREATE was successful.
> > + * - -EFAULT: ECREATE returned error.
> > + */
> > +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);
>
> Empty line.
>
> > + 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();
>
> Ditto.
>
> > + return ret;
> > +}
> > +
> > +/**
> > + * sgx_virt_einit() - Run EINIT on behalf of guest
> > + * @sigstruct: Userspace pointer to SIGSTRUCT structure
> > + * @token: Userspace pointer to EINITTOKEN structure
> > + * @secs: Userspace pointer to SECS page
> > + * @lepubkeyhash: Pointer to guest's *virtual* SGX_LEPUBKEYHASH MSR
> > + * values
> > + * @trapnr: trap number injected to guest in case of EINIT error
> > + *
> > + * Run EINIT on behalf of guest after KVM traps EINIT. If SGX_LC is available
> > + * in host, SGX driver may rewrite the hardware values at wish, therefore KVM
> > + * needs to update hardware values to guest's virtual MSR values in order to
> > + * ensure EINIT is executed with expected hardware values.
> > + *
> > + * Return:
> > + * - 0: EINIT was successful.
> > + * - -EFAULT: EINIT returned error.
> > + */
> > +int sgx_virt_einit(void __user *sigstruct, void __user *token,
> > + void __user *secs, u64 *lepubkeyhash, int *trapnr)
> > +{
> > + 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);
Remove exports.
> > --
> > 2.29.2
> >
> >
>
> /Jarkko
next prev parent reply other threads:[~2021-02-16 3:10 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 [this message]
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 ` [RFC PATCH v5 19/26] KVM: x86: Add reverse-CPUID lookup support for scattered SGX features Kai Huang
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=YCs3Wt+il5+pnwCV@kernel.org \
--to=jarkko@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=haitao.huang@intel.com \
--cc=hpa@zytor.com \
--cc=kai.huang@intel.com \
--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=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).