Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp691498ybt; Mon, 6 Jul 2020 20:40:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ0H+vdGpzvgpjCJk3xg4oykgTwKxdILBizoU579ca0xxu4FkARYeXXIwwUO3qXW5zw+VT X-Received: by 2002:a17:906:a0c8:: with SMTP id bh8mr47406542ejb.190.1594093252388; Mon, 06 Jul 2020 20:40:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594093252; cv=none; d=google.com; s=arc-20160816; b=NJAD3H2JyaST67m1WgyycG1V6uQKKIOCMcwK6XhMqQroU/9erBeLlpv13fMkwXI66G FyLH7xE3Ofk9dbrUN0IvCjQAHE27lWb0eVwpEDskgxcfzN1nqRWC8vT+huTGkBmURnlZ sTF24NfNQkeXrlgDOlt9+A1f3NbFMqTN/Q5IcHXYERBPgwkJKenanp7mtqO+Mld/XsFG JDcKzgt+xe7rdfZvTOshVn5jWdkXCf37eVRzgrfJl7Vaq5R1IGJHIVe3k8WvZH3YF3K2 lju+pHMItY1GAntVGNvrxyk9TxyNX3CwYeUS8oCcKtNQI6QY8bwJF1r6wofaU5tCS187 poyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=Kgt4CiIqoGupg//zcCzrDcHD6LixSdLWbZUhJ84hUxc=; b=j/RDa8pjJoPQIq8Edxe+b7lgGxGopguCThjSbeOXdVTQOjHRfRH0OCVBQI4bM+a/kt 4ig+yYfS7o8PoMBGHtL+E/2FhbJ13yZdViukphsJce2yN1gIcCa/WN/MhRRSEeBySeOt BxVC3sbPjBXQaTL4IMI/Bb0/hCpPEfl9ph1g1Tho8FQmQqKCT669gJJmyCMJBc3Eg9HW JyNTgwgowfjGec3m8UZXkzHQYxL+hFJU5UGV28s9vCflDleM907lKemyQXz0tEz9IpsF v4MhSst8jCOPfQDPzWYjijulipyvOlhzbtPaBAE+JDhHWp4QVdwZo9QlGlIpMMzd6OcA hBJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn17si18495632ejc.556.2020.07.06.20.40.28; Mon, 06 Jul 2020 20:40:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728312AbgGGDjS (ORCPT + 99 others); Mon, 6 Jul 2020 23:39:18 -0400 Received: from mga07.intel.com ([134.134.136.100]:36300 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727077AbgGGDjR (ORCPT ); Mon, 6 Jul 2020 23:39:17 -0400 IronPort-SDR: QFzbGWMvLSQQVtGp58inws4AwMrC5IYDevKCxYpmrmuMAvGVWGg38RM1v0vwHtSJ0xJEv30a/c A4zKeLsKEQ1g== X-IronPort-AV: E=McAfee;i="6000,8403,9674"; a="212506270" X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="212506270" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 20:39:17 -0700 IronPort-SDR: 9Pgfd9BNiibO2O7b4CsJ1xqNkXppyeqkd7hdQVXiZCIAgb3uKSj1IBjkW/Nf4Ticpj5a6y/2vB t510zump9X5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="427314348" Received: from apiccion-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.45.178]) by orsmga004.jf.intel.com with ESMTP; 06 Jul 2020 20:39:05 -0700 From: Jarkko Sakkinen To: x86@kernel.org, linux-sgx@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Jethro Beekman , Jarkko Sakkinen , akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, asapek@google.com, bp@alien8.de, cedric.xing@intel.com, chenalexchen@google.com, conradparker@google.com, cyhanish@google.com, dave.hansen@intel.com, haitao.huang@intel.com, josh@joshtriplett.org, kai.huang@intel.com, kai.svahn@intel.com, kmoy@google.com, ludloff@google.com, luto@kernel.org, nhorman@redhat.com, npmccallum@redhat.com, puiterwijk@redhat.com, rientjes@google.com, tglx@linutronix.de, yaozhangx@google.com Subject: [PATCH v35 06/24] x86/cpu/intel: Detect SGX support Date: Tue, 7 Jul 2020 06:37:29 +0300 Message-Id: <20200707033747.142828-7-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200707033747.142828-1-jarkko.sakkinen@linux.intel.com> References: <20200707033747.142828-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson Configure SGX as part of feature control MSR initialization and update the associated X86_FEATURE flags accordingly. Because the kernel will require the LE hash MSRs to be writable when running native enclaves, disable X86_FEATURE_SGX (and all derivatives) if SGX Launch Control is not (or cannot) be fully enabled via feature control MSR. The check is done for every CPU, not just BSP, in order to verify that MSR_IA32_FEATURE_CONTROL is correctly configured on all CPUs. The other parts of the kernel, like the enclave driver, expect the same configuration from all CPUs. Note, unlike VMX, clear the X86_FEATURE_SGX* flags for all CPUs if any CPU lacks SGX support as the kernel expects SGX to be available on all CPUs. X86_FEATURE_VMX is intentionally cleared only for the current CPU so that KVM can provide additional information if KVM fails to load, e.g. print which CPU doesn't support VMX. KVM/VMX requires additional per-CPU enabling, e.g. to set CR4.VMXE and do VMXON, and so already has the necessary infrastructure to do per-CPU checks. SGX on the other hand doesn't require additional enabling, so clearing the feature flags on all CPUs means the SGX subsystem doesn't need to manually do support checks on a per-CPU basis. Acked-by: Jethro Beekman Signed-off-by: Sean Christopherson Co-developed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/feat_ctl.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c index 29a3bedabd06..c3afcd2e4342 100644 --- a/arch/x86/kernel/cpu/feat_ctl.c +++ b/arch/x86/kernel/cpu/feat_ctl.c @@ -93,16 +93,35 @@ static void init_vmx_capabilities(struct cpuinfo_x86 *c) } #endif /* CONFIG_X86_VMX_FEATURE_NAMES */ +static void clear_sgx_caps(void) +{ + setup_clear_cpu_cap(X86_FEATURE_SGX); + setup_clear_cpu_cap(X86_FEATURE_SGX_LC); + setup_clear_cpu_cap(X86_FEATURE_SGX1); + setup_clear_cpu_cap(X86_FEATURE_SGX2); +} + void init_ia32_feat_ctl(struct cpuinfo_x86 *c) { bool tboot = tboot_enabled(); + bool enable_sgx; u64 msr; if (rdmsrl_safe(MSR_IA32_FEAT_CTL, &msr)) { clear_cpu_cap(c, X86_FEATURE_VMX); + clear_sgx_caps(); return; } + /* + * Enable SGX if and only if the kernel supports SGX and Launch Control + * is supported, i.e. disable SGX if the LE hash MSRs can't be written. + */ + enable_sgx = cpu_has(c, X86_FEATURE_SGX) && + cpu_has(c, X86_FEATURE_SGX1) && + cpu_has(c, X86_FEATURE_SGX_LC) && + IS_ENABLED(CONFIG_INTEL_SGX); + if (msr & FEAT_CTL_LOCKED) goto update_caps; @@ -124,13 +143,16 @@ void init_ia32_feat_ctl(struct cpuinfo_x86 *c) msr |= FEAT_CTL_VMX_ENABLED_INSIDE_SMX; } + if (enable_sgx) + msr |= FEAT_CTL_SGX_ENABLED | FEAT_CTL_SGX_LC_ENABLED; + wrmsrl(MSR_IA32_FEAT_CTL, msr); update_caps: set_cpu_cap(c, X86_FEATURE_MSR_IA32_FEAT_CTL); if (!cpu_has(c, X86_FEATURE_VMX)) - return; + goto update_sgx; if ( (tboot && !(msr & FEAT_CTL_VMX_ENABLED_INSIDE_SMX)) || (!tboot && !(msr & FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX))) { @@ -143,4 +165,12 @@ void init_ia32_feat_ctl(struct cpuinfo_x86 *c) init_vmx_capabilities(c); #endif } + +update_sgx: + if (!(msr & FEAT_CTL_SGX_ENABLED) || + !(msr & FEAT_CTL_SGX_LC_ENABLED) || !enable_sgx) { + if (enable_sgx) + pr_err_once("SGX disabled by BIOS\n"); + clear_sgx_caps(); + } } -- 2.25.1