Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp8705522ybc; Fri, 29 Nov 2019 15:19:21 -0800 (PST) X-Google-Smtp-Source: APXvYqyMSjczWdWGbQ+g1f9JTgyaamEJn3JR52JJweIkv49iR5mw3i4mlia5NdQH8aApP0Mlr2cS X-Received: by 2002:aa7:c2c7:: with SMTP id m7mr49197898edp.295.1575069561668; Fri, 29 Nov 2019 15:19:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575069561; cv=none; d=google.com; s=arc-20160816; b=As/V8TWTQSK2I+B8eSc/Fl1HYj1oAPrCBPh8HH0hhFWxWLYYfuoQ4ji07y59gBVddP B3iXPR9/eD5wt1puPo8eBf7YSC7pwB7BniLB+8S1E3LF3c1615QhBu5JzK3CXDY3Pr+M LmRTn0FsYcTKu5AhYGLLTtKV/wyqtI/eBN2nBWLYkEdulK13HNg3zK1VaEu1tK7GVYSo CQWb759bk3858BWI869+/Df1sUtPew+Rsy/ZC9/+KX0CQnXYMCUOizkJQGhCmG67ZeLu Oz7Xr7HqTeC21R57bUVOpmwFrKhOu56lU1m7fV3uhXE+3D7BH1i5t+ypQfcsKhlnYPnT W8Vw== 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; bh=PPQnXaCJIxn6zHYUlaqghfCBpECzzn1ApE6QhWrhhmY=; b=iaQ2Ef3Iq0igBpJZXXeGnl89xExiYef1iCj8G+BRFlEAlXfmINp007VpsSi3ZIaHrI RXz4Y7MAWRVnwZKofzJrHxabCJtb7FwoGLjqAPlLYwjULLf9R57rgtpx3TpEkZXKyNzU SjtLrNXT98pOEl0dXr2QV2qfT+awajy31SPqRxECPF3yUgBrpNQTg3vOhmK/S7UDuNb2 nveyH7GruKExlI1fj0wlbgk67rW6/8cp+r1tfL4SySOxw2DQ1bZ2FbJmga6w4LXDt1AO nPXt1wDfpMluc4AVeXGUvocAqX6tkLwEkl6RRtqXYEvgZ8yCIWlPxR7uQVY6NvGnVCQm nXWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id 24si17724285eje.293.2019.11.29.15.18.58; Fri, 29 Nov 2019 15:19:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1727289AbfK2XPD (ORCPT + 99 others); Fri, 29 Nov 2019 18:15:03 -0500 Received: from mga01.intel.com ([192.55.52.88]:16100 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727073AbfK2XPD (ORCPT ); Fri, 29 Nov 2019 18:15:03 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2019 15:15:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,259,1571727600"; d="scan'208";a="384193910" Received: from gamanzi-mobl4.ger.corp.intel.com (HELO localhost) ([10.252.3.126]) by orsmga005.jf.intel.com with ESMTP; 29 Nov 2019 15:14:52 -0800 From: Jarkko Sakkinen To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-sgx@vger.kernel.org Cc: akpm@linux-foundation.org, dave.hansen@intel.com, sean.j.christopherson@intel.com, nhorman@redhat.com, npmccallum@redhat.com, serge.ayoun@intel.com, shay.katz-zamir@intel.com, haitao.huang@intel.com, andriy.shevchenko@linux.intel.com, tglx@linutronix.de, kai.svahn@intel.com, bp@alien8.de, josh@joshtriplett.org, luto@kernel.org, kai.huang@intel.com, rientjes@google.com, cedric.xing@intel.com, puiterwijk@redhat.com, Jarkko Sakkinen Subject: [PATCH v24 07/24] x86/cpu/intel: Detect SGX supprt Date: Sat, 30 Nov 2019 01:13:09 +0200 Message-Id: <20191129231326.18076-8-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191129231326.18076-1-jarkko.sakkinen@linux.intel.com> References: <20191129231326.18076-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 When the CPU supports SGX, check that the BIOS has enabled SGX and SGX1 opcodes are available. Otherwise, all the SGX related capabilities. In addition, clear X86_FEATURE_SGX_LC also in the case when the launch enclave are read-only. This way the feature bit reflects the level that Linux supports the launch control. 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. Signed-off-by: Sean Christopherson Co-developed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/intel.c | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index c2fdc00df163..89a71367716c 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -624,6 +624,42 @@ static void detect_tme(struct cpuinfo_x86 *c) c->x86_phys_bits -= keyid_bits; } +static void __maybe_unused detect_sgx(struct cpuinfo_x86 *c) +{ + unsigned long long fc; + + rdmsrl(MSR_IA32_FEATURE_CONTROL, fc); + if (!(fc & FEATURE_CONTROL_LOCKED)) { + pr_err_once("sgx: The feature control MSR is not locked\n"); + goto err_unsupported; + } + + if (!(fc & FEATURE_CONTROL_SGX_ENABLE)) { + pr_err_once("sgx: SGX is not enabled in IA32_FEATURE_CONTROL MSR\n"); + goto err_unsupported; + } + + if (!cpu_has(c, X86_FEATURE_SGX1)) { + pr_err_once("sgx: SGX1 instruction set is not supported\n"); + goto err_unsupported; + } + + if (!(fc & FEATURE_CONTROL_SGX_LE_WR)) { + pr_info_once("sgx: The launch control MSRs are not writable\n"); + goto err_msrs_rdonly; + } + + return; + +err_unsupported: + setup_clear_cpu_cap(X86_FEATURE_SGX); + setup_clear_cpu_cap(X86_FEATURE_SGX1); + setup_clear_cpu_cap(X86_FEATURE_SGX2); + +err_msrs_rdonly: + setup_clear_cpu_cap(X86_FEATURE_SGX_LC); +} + static void init_cpuid_fault(struct cpuinfo_x86 *c) { u64 msr; @@ -761,6 +797,11 @@ static void init_intel(struct cpuinfo_x86 *c) if (cpu_has(c, X86_FEATURE_TME)) detect_tme(c); +#ifdef CONFIG_INTEL_SGX + if (cpu_has(c, X86_FEATURE_SGX)) + detect_sgx(c); +#endif + init_intel_misc_features(c); } -- 2.20.1