Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp671972ybt; Mon, 6 Jul 2020 20:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf15GYCBylM0U1x7wIIpiEnaqKDCycoWD7urGO2jhfX99CRXAWmGRgZqj28Ds/nHbkQ4Je X-Received: by 2002:a17:907:7245:: with SMTP id ds5mr48296434ejc.67.1594091099828; Mon, 06 Jul 2020 20:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594091099; cv=none; d=google.com; s=arc-20160816; b=KmB4sprpMLhNjMYL/5VQwRqMk3DiZEoZhjUvfxp8GwUuOQoRn41l4hS1kIXSHvVIK6 HXtu7mwStA+aWXKGdUYH57brql/PGZ26DJlOcBXblkvLlT/HV6FuM4hWBmmZgwC3bFzR hx0bBAD9jmcyI52sFI1i20btLeW0M6MjCf2u6i9auINcFzihkq+SF3nW/khWVNACx/WL 6TVkPxcgVLr5ow+Rl4UzB7NnVHyxLsKnpVqDCKsp7cgQfzQNtCl8mygTEVEGXmUaS9tQ tS+aCscULGx3x6o7JKnCg03SUYUybtqVclt6EjU9W/exDPuEuIzk9/6IiuAo8ClaUfyl apZg== 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=dwtdoMJOFbG4rfGYQldEbg97Cv+tD6dkkRGvaxO9dfEPbDay2oRw0UJNuQLG54ADqk Vz+r+jxV+COvsZ0ZX4+pHJL2QnRM+sLOFXODH00rzo4aKGaWaOgQUSRrGKmlZyh7ilPv 4NNTnYgvMwjiyno2yWfyGNkTbadMtJlXLVdRSsaIQfSh6kx5bwYgNl4dBbEj4ctjovLy znq0ZiD75lA5FqqM7M266H1bE06Sw7UsrKdZVGdPt9dD2tPuJBv42pzeApEcDRU7hKx+ QdOA3Dwwhtn0OGgKiUQ4uo7vAw5JxiSGsV3DWbZnAbJa9lSyStrYmPyR81EgCqyy8nG2 ozcw== 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 r22si15021339edm.474.2020.07.06.20.04.36; Mon, 06 Jul 2020 20:04:59 -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 S1728125AbgGGDDd (ORCPT + 99 others); Mon, 6 Jul 2020 23:03:33 -0400 Received: from mga14.intel.com ([192.55.52.115]:25863 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbgGGDDc (ORCPT ); Mon, 6 Jul 2020 23:03:32 -0400 IronPort-SDR: w8Za6l0HjWklVxZlYLQc+VrXdqqoDmHXhzWZqm0N425N9OAWJaCB9Wn8Ao1jyWMs3SOf+JHHbE K/XLcGTZUcew== X-IronPort-AV: E=McAfee;i="6000,8403,9674"; a="146606413" X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="146606413" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 20:03:32 -0700 IronPort-SDR: fg84QUhWH/tQck4FZ7lHKHP2pnzhzvF71NjDHPqr4y0RbLTsUwVKS4rNdRrt2eZtl6KZbjSouF ouvKKb7Q6DnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="388368394" Received: from apiccion-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.45.178]) by fmsmga001.fm.intel.com with ESMTP; 06 Jul 2020 20:03:21 -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 v34 06/24] x86/cpu/intel: Detect SGX support Date: Tue, 7 Jul 2020 06:01:46 +0300 Message-Id: <20200707030204.126021-7-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200707030204.126021-1-jarkko.sakkinen@linux.intel.com> References: <20200707030204.126021-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