From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kai Huang Subject: [PATCH 11/11] kvm: vmx: workaround FEATURE_CONTROL[17] is not set by BIOS Date: Mon, 8 May 2017 17:24:34 +1200 Message-ID: <20170508052434.3627-12-kai.huang@linux.intel.com> References: <20170508052434.3627-1-kai.huang@linux.intel.com> To: pbonzini@redhat.com, rkrcmar@redhat.com, kvm@vger.kernel.org Return-path: Received: from mail-pg0-f65.google.com ([74.125.83.65]:35323 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752248AbdEHFZR (ORCPT ); Mon, 8 May 2017 01:25:17 -0400 Received: by mail-pg0-f65.google.com with SMTP id i63so9012909pgd.2 for ; Sun, 07 May 2017 22:25:17 -0700 (PDT) In-Reply-To: <20170508052434.3627-1-kai.huang@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: even this bit is not set by BIOS, current ucode patch allows write to IA32_SGXLEPUBKEYHASHn. --- arch/x86/kvm/vmx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1022295ba925..9e687ce45b48 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2254,12 +2254,20 @@ static void decache_tsc_multiplier(struct vcpu_vmx *vmx) vmcs_write64(TSC_MULTIPLIER, vmx->current_tsc_ratio); } +#define UCODE_PATCH static bool cpu_sgx_lepubkeyhash_writable(void) { u64 val, sgx_lc_enabled_mask = (FEATURE_CONTROL_LOCKED | FEATURE_CONTROL_SGX_LAUNCH_CONTROL_ENABLE); rdmsrl(MSR_IA32_FEATURE_CONTROL, val); +#ifdef UCODE_PATCH + /* + * current ucode patch can support write to IA32_SGXLEPUBKEYHASHn + * even if FEATURE_CONTROL[17] is not set. + */ + val |= FEATURE_CONTROL_SGX_LAUNCH_CONTROL_ENABLE; +#endif return ((val & sgx_lc_enabled_mask) == sgx_lc_enabled_mask); } -- 2.11.0