Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp142322ybk; Thu, 14 May 2020 19:00:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwXOCty9rApBBgtHvsgyfxtrjZ47lONfUCxGMWUkULX1bU1cquNVtQnl9qGoIJzgNeKiV3 X-Received: by 2002:aa7:d1d6:: with SMTP id g22mr878859edp.36.1589508054056; Thu, 14 May 2020 19:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589508054; cv=none; d=google.com; s=arc-20160816; b=wIsKM6iQry1n4CTyKxR2qwbaQJXyIjvy/JIUZ5yoUV38ChKAIVcpxcfjwinVIyWJRN vEfym0Wsj7h/88NmCeepvA5FBJDg3NmtH6UhbkIPQjQ9JppBw9qrWBU0uCwhx51sGlg1 x53MZ58BpxYYo8popE0ngZV39340MkRqXqWIGGFK/NouMH8qZ0/xPTEG95K0zIZ7+MfB poNrpEsIWmHqUc8r64Gif/NCvdCCwvTvaFuRl3bh/4iNaOywCikTocGb3hLvnwKZyps9 8J9Azq0WXtNFe3+7cW6/XkTrsQrTHeoKcT3TP6OgNl6A56U30FnVGnOj70MdlwJ82uBt VNzQ== 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=VK79QJ0svYcDO9IMTI1d7R9M4ISne/MpFZ9WimGaWb0=; b=MGGqsrtRh10XiDJkV9c5QVN+mMMqSEjMYrtoi/w57U9Hwz/GFD/KHnMZbA7c+yHEKu ejvX2XPt/o6nlsP+izXelY1rLEPSa/EnTDj3k+DgE+s+2fiILP644aYbu5RVWYl7rA4g j3ESBvg4VzdcCCbxVqtDg4CkY9Kh0X1sg0IX6eTn6/9v0Nm/hbw17mb5LLYlKwlQNGCM 57OSbdaa+FbgT2MVd2Nndwx4dFJzWjje2koHytFTsYkyfi/DcEbWX877DbUJ1TGgSNBa 5350v3+gjE/hMr+OnjF7ZVnL4V634uOZ9yhbhHb7CwuPJ52FHz46ptroF0v2aksJRS7I Bdlw== 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 k7si369793edk.69.2020.05.14.19.00.31; Thu, 14 May 2020 19:00:54 -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 S1728728AbgEOAp2 (ORCPT + 99 others); Thu, 14 May 2020 20:45:28 -0400 Received: from mga07.intel.com ([134.134.136.100]:43910 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726170AbgEOAp1 (ORCPT ); Thu, 14 May 2020 20:45:27 -0400 IronPort-SDR: 24+HZEQcSHlTApJT8yL6VlgUuSm0Gg0+VlP/lma0vAi/cabE3zY1Ke2La9L/I73sEDE29aA+7+ 6CQ6gMO8x5NQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2020 17:45:26 -0700 IronPort-SDR: Dfd3PppAlI7afc/Q8IkPg3Weuyv1fn+IOYjfEZf2p05t+hyCTgSk7wYNH0P3jLQcYo0s9FB/Ed QXpTVpuSnnOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,393,1583222400"; d="scan'208";a="253644159" Received: from ashadrin-mobl1.ccr.corp.intel.com (HELO localhost) ([10.249.38.112]) by fmsmga008.fm.intel.com with ESMTP; 14 May 2020 17:45:17 -0700 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, 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 , Jethro Beekman Subject: [PATCH v30 06/20] x86/cpu/intel: Detect SGX support Date: Fri, 15 May 2020 03:43:56 +0300 Message-Id: <20200515004410.723949-7-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200515004410.723949-1-jarkko.sakkinen@linux.intel.com> References: <20200515004410.723949-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. Signed-off-by: Sean Christopherson Co-developed-by: Jarkko Sakkinen Acked-by: Jethro Beekman 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