From: Kai Huang <kai.huang@intel.com>
To: kvm@vger.kernel.org, linux-sgx@vger.kernel.org, x86@kernel.org
Cc: linux-kernel@vger.kernel.org, seanjc@google.com,
jarkko@kernel.org, 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, Kai Huang <kai.huang@intel.com>
Subject: [PATCH 12/25] x86/sgx: Add helper to update SGX_LEPUBKEYHASHn MSRs
Date: Mon, 1 Mar 2021 22:45:12 +1300 [thread overview]
Message-ID: <6730fbd2f7b26532f09e5a5e416a58f03a66d222.1614590788.git.kai.huang@intel.com> (raw)
In-Reply-To: <cover.1614590788.git.kai.huang@intel.com>
Add a helper to update SGX_LEPUBKEYHASHn MSRs. SGX virtualization also
needs to update those MSRs based on guest's "virtual" SGX_LEPUBKEYHASHn
before EINIT from guest.
Acked-by: Dave Hansen <dave.hansen@intel.com>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Kai Huang <kai.huang@intel.com>
---
arch/x86/kernel/cpu/sgx/ioctl.c | 5 ++---
arch/x86/kernel/cpu/sgx/main.c | 15 +++++++++++++++
arch/x86/kernel/cpu/sgx/sgx.h | 2 ++
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index e5977752c7be..1bae754268d1 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -495,7 +495,7 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
void *token)
{
u64 mrsigner[4];
- int i, j, k;
+ int i, j;
void *addr;
int ret;
@@ -544,8 +544,7 @@ static int sgx_encl_init(struct sgx_encl *encl, struct sgx_sigstruct *sigstruct,
preempt_disable();
- for (k = 0; k < 4; k++)
- wrmsrl(MSR_IA32_SGXLEPUBKEYHASH0 + k, mrsigner[k]);
+ sgx_update_lepubkeyhash(mrsigner);
ret = __einit(sigstruct, token, addr);
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 8c922e68274d..276220d0e4b5 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -696,6 +696,21 @@ static bool __init sgx_page_cache_init(void)
return true;
}
+
+/*
+ * Update the SGX_LEPUBKEYHASH MSRs to the values specified by caller.
+ * Bare-metal driver requires to update them to hash of enclave's signer
+ * before EINIT. KVM needs to update them to guest's virtual MSR values
+ * before doing EINIT from guest.
+ */
+void sgx_update_lepubkeyhash(u64 *lepubkeyhash)
+{
+ int i;
+
+ for (i = 0; i < 4; i++)
+ wrmsrl(MSR_IA32_SGXLEPUBKEYHASH0 + i, lepubkeyhash[i]);
+}
+
static int __init sgx_init(void)
{
int ret;
diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h
index 5d71c9c8644d..d4b19e5cca16 100644
--- a/arch/x86/kernel/cpu/sgx/sgx.h
+++ b/arch/x86/kernel/cpu/sgx/sgx.h
@@ -92,4 +92,6 @@ static inline int __init sgx_vepc_init(void)
}
#endif
+void sgx_update_lepubkeyhash(u64 *lepubkeyhash);
+
#endif /* _X86_SGX_H */
--
2.29.2
next prev parent reply other threads:[~2021-03-01 9:56 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 9:44 [PATCH 00/25] KVM SGX virtualization support Kai Huang
2021-03-01 9:44 ` [PATCH 01/25] x86/cpufeatures: Make SGX_LC feature bit depend on SGX bit Kai Huang
2021-03-01 9:44 ` [PATCH 02/25] x86/cpufeatures: Add SGX1 and SGX2 sub-features Kai Huang
2021-03-01 10:00 ` Borislav Petkov
2021-03-01 10:19 ` Kai Huang
2021-03-01 10:30 ` Borislav Petkov
2021-03-01 10:40 ` Kai Huang
2021-03-01 10:53 ` Borislav Petkov
2021-03-01 11:28 ` Kai Huang
2021-03-01 11:32 ` Borislav Petkov
2021-03-01 11:43 ` Kai Huang
2021-03-01 11:58 ` Borislav Petkov
2021-03-01 12:08 ` Kai Huang
2021-03-02 15:48 ` Haitao Huang
2021-03-02 15:58 ` Dave Hansen
2021-03-07 22:49 ` Kai Huang
2021-03-10 15:30 ` Jarkko Sakkinen
2021-03-02 16:02 ` Sean Christopherson
2021-03-02 17:53 ` Boris Petkov
2021-03-02 18:27 ` Kai Huang
2021-03-01 9:44 ` [PATCH 03/25] x86/sgx: Wipe out EREMOVE from sgx_free_epc_page() Kai Huang
2021-03-01 17:29 ` Sean Christopherson
2021-03-02 0:32 ` Kai Huang
2021-03-01 9:44 ` [PATCH 04/25] x86/sgx: Add SGX_CHILD_PRESENT hardware error code Kai Huang
2021-03-01 9:44 ` [PATCH 05/25] x86/sgx: Introduce virtual EPC for use by KVM guests Kai Huang
2021-03-01 16:21 ` Sean Christopherson
2021-03-02 0:33 ` Kai Huang
2021-03-01 9:45 ` [PATCH 06/25] x86/cpu/intel: Allow SGX virtualization without Launch Control support Kai Huang
2021-03-05 17:29 ` Borislav Petkov
2021-03-07 23:50 ` Kai Huang
2021-03-08 0:19 ` Kai Huang
2021-03-10 15:32 ` Jarkko Sakkinen
2021-03-01 9:45 ` [PATCH 07/25] x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled Kai Huang
2021-03-01 9:45 ` [PATCH 08/25] x86/sgx: Expose SGX architectural definitions to the kernel Kai Huang
2021-03-01 9:45 ` [PATCH 09/25] x86/sgx: Move ENCLS leaf definitions to sgx.h Kai Huang
2021-03-01 16:25 ` Sean Christopherson
2021-03-02 0:34 ` Kai Huang
2021-03-01 9:45 ` [PATCH 10/25] x86/sgx: Add SGX2 ENCLS leaf definitions (EAUG, EMODPR and EMODT) Kai Huang
2021-03-01 9:45 ` [PATCH 11/25] x86/sgx: Add encls_faulted() helper Kai Huang
2021-03-01 9:45 ` Kai Huang [this message]
2021-03-01 16:57 ` [PATCH 12/25] x86/sgx: Add helper to update SGX_LEPUBKEYHASHn MSRs Sean Christopherson
2021-03-02 0:34 ` Kai Huang
2021-03-01 9:45 ` [PATCH 13/25] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM Kai Huang
2021-03-01 9:45 ` [PATCH 14/25] x86/sgx: Move provisioning device creation out of SGX driver Kai Huang
2021-03-01 9:45 ` [PATCH 15/25] KVM: x86: Export kvm_mmu_gva_to_gpa_{read,write}() for SGX (VMX) Kai Huang
2021-03-01 9:45 ` [PATCH 16/25] KVM: x86: Define new #PF SGX error code bit Kai Huang
2021-03-01 9:45 ` [PATCH 17/25] KVM: x86: Add support for reverse CPUID lookup of scattered features Kai Huang
2021-03-01 9:45 ` [PATCH 18/25] KVM: x86: Add reverse-CPUID lookup support for scattered SGX features Kai Huang
2021-03-01 9:45 ` [PATCH 19/25] KVM: VMX: Add basic handling of VM-Exit from SGX enclave Kai Huang
2021-03-01 16:52 ` Sean Christopherson
2021-03-02 0:50 ` Kai Huang
2021-03-01 9:45 ` [PATCH 20/25] KVM: VMX: Frame in ENCLS handler for SGX virtualization Kai Huang
2021-03-01 9:45 ` [PATCH 21/25] KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions Kai Huang
2021-03-01 17:20 ` Sean Christopherson
2021-03-02 0:54 ` Kai Huang
2021-03-02 5:34 ` Kai Huang
2021-03-02 8:44 ` Kai Huang
2021-03-01 9:45 ` [PATCH 22/25] KVM: VMX: Add emulation of SGX Launch Control LE hash MSRs Kai Huang
2021-03-01 9:45 ` [PATCH 23/25] KVM: VMX: Add ENCLS[EINIT] handler to support SGX Launch Control (LC) Kai Huang
2021-03-01 9:45 ` [PATCH 24/25] KVM: VMX: Enable SGX virtualization for SGX1, SGX2 and LC Kai Huang
2021-03-01 9:46 ` [PATCH 25/25] KVM: x86: Add capability to grant VM access to privileged SGX attribute Kai Huang
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=6730fbd2f7b26532f09e5a5e416a58f03a66d222.1614590788.git.kai.huang@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-kernel@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).