Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp1130097ybk; Sat, 16 May 2020 01:56:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxogCNgwaJ/HC0uhi9TeS6X1VzxwAqlQ4bcNMioQu4XKmX7aMXdTo/Gy9+QWtJMYWfApe/R X-Received: by 2002:a50:c2d9:: with SMTP id u25mr5192164edf.123.1589619387389; Sat, 16 May 2020 01:56:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589619387; cv=none; d=google.com; s=arc-20160816; b=hAo1AtxmPbLeGtCeTu7qgwPksgLmE9eweoq/PzQit1STWvEoPhJT/Dag76gXcnCj+g vO7/Bxx7kXk39xzq/wGwjmyAGpSnGMjtR1lVLxnlN5YcNAqwddW2AyAXKN1tRyXF+NxM jntOAFudIpXr9GccXdVWv0f21m1RszUW1JFp/fFTithp3pcNgR8JxtdAr8vCv1cvKIUQ sdzlUKPkd44eYrni85qtkTwTiTvDVEP4Lgk+aJjlYfS9UUVyyWdzuQveGU2m7i/jfQ7l 1fFduloYq3/nAIhg/MKSvUJBbyZ91Z12NZePgnYm1HPauuqJXZCjbOmjc/oSwNBiuMWS nY6w== 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=tYNhXUefDgnBvVXZSNzg9qqL1DlXlGkSDt1LHgq6GDw=; b=Bh2R2Vzw/d/u1WfJgUsAkk45X08Fb5gYcgL/Mn5LZxGMv3zZFR3pX9KZqWnFCDeSA1 dT+uazRO47FyD+Uxg4rU/KeipNTYmBkclU4IkazZ7LAnkaF7ezVgGXO4c42IcuDrizG0 deVXjwl2rRUV1ODlaZjSdpO+NupW1jwoIjguBLlPT0BOv8Q8EM0UgvPu8syfVJkC7ZGP m9++afRpJMOmUoJH2zP4BbpyO8lfZ1UaHl0fQ9mMcxkGUFddkYuVmM5+QWXsjqawWUnF MDfWMndi6UHi4qLESGor5g4JgaBTOZa3MEt15qkI5eDMnzNDtn3PlubbPNWWl884mx5k Laaw== 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 j2si2639742ejs.531.2020.05.16.01.56.01; Sat, 16 May 2020 01:56:27 -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 S1726296AbgEPIyg (ORCPT + 99 others); Sat, 16 May 2020 04:54:36 -0400 Received: from mga05.intel.com ([192.55.52.43]:44346 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725997AbgEPIyg (ORCPT ); Sat, 16 May 2020 04:54:36 -0400 IronPort-SDR: qDXY6qP8NcBnqrV8WcCkzRK5LPhDk+OGxUgJ/OeuVs0bW2GqYVc44HqcpnF+s6PcqewykNS1J9 xzJNw2aUEurg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2020 01:54:36 -0700 IronPort-SDR: wjifuI4z9WGGHb3jkaynPAj65Q0mtCCunn4F9mzGMUTtIB5HGUivSp5htRby1Lm61MkmnllhIt RgVomlJcqQOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,398,1583222400"; d="scan'208";a="465009272" Received: from dbobocel-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.55.115]) by fmsmga005.fm.intel.com with ESMTP; 16 May 2020 01:54:27 -0700 From: Jarkko Sakkinen To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen , Sean Christopherson , 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] x86/cpu/intel: Add nosgx kernel parameter Date: Sat, 16 May 2020 11:53:54 +0300 Message-Id: <20200516085354.10478-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421215316.56503-1-jarkko.sakkinen@linux.intel.com> References: <20200421215316.56503-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 Add kernel parameter to disable Intel SGX kernel support. Tested-by: Sean Christopherson Reviewed-by: Sean Christopherson Signed-off-by: Jarkko Sakkinen --- Documentation/admin-guide/kernel-parameters.txt | 2 ++ arch/x86/kernel/cpu/feat_ctl.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 7bc83f3d9bdf..9f7202a54db6 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3268,6 +3268,8 @@ nosep [BUGS=X86-32] Disables x86 SYSENTER/SYSEXIT support. + nosgx [X86-64,SGX] Disables Intel SGX kernel support. + nosmp [SMP] Tells an SMP kernel to act as a UP kernel, and disable the IO APIC. legacy for "maxcpus=0". diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c index c3afcd2e4342..1837df39527f 100644 --- a/arch/x86/kernel/cpu/feat_ctl.c +++ b/arch/x86/kernel/cpu/feat_ctl.c @@ -101,6 +101,15 @@ static void clear_sgx_caps(void) setup_clear_cpu_cap(X86_FEATURE_SGX2); } +static int __init nosgx(char *str) +{ + clear_sgx_caps(); + + return 0; +} + +early_param("nosgx", nosgx); + void init_ia32_feat_ctl(struct cpuinfo_x86 *c) { bool tboot = tboot_enabled(); -- 2.25.1