From patchwork Fri Mar 19 07:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Kai" X-Patchwork-Id: 12150193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E42BAC433E9 for ; Fri, 19 Mar 2021 07:24:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C638A64F62 for ; Fri, 19 Mar 2021 07:24:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234232AbhCSHXa (ORCPT ); Fri, 19 Mar 2021 03:23:30 -0400 Received: from mga05.intel.com ([192.55.52.43]:22827 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233942AbhCSHXU (ORCPT ); Fri, 19 Mar 2021 03:23:20 -0400 IronPort-SDR: 5m9x6Lm4pqWU1BipH9d4+vuiG/TH7zbeIDrFdnzPdEXhru+JL1AF6KfpOmZHMTrkvTEfP+ssV4 VnGNVpwobDaQ== X-IronPort-AV: E=McAfee;i="6000,8403,9927"; a="274910844" X-IronPort-AV: E=Sophos;i="5.81,261,1610438400"; d="scan'208";a="274910844" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2021 00:23:20 -0700 IronPort-SDR: uNxw3ENurhFtG7WXy+Hsr3Q08j3e3i9A7F2MG3mwoieQ7okV4bAuKKaooW55bgUinJkuz1cpsd akh27vDbicTg== X-IronPort-AV: E=Sophos;i="5.81,261,1610438400"; d="scan'208";a="413409364" Received: from dlmeisen-mobl1.amr.corp.intel.com (HELO khuang2-desk.gar.corp.intel.com) ([10.255.229.165]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2021 00:23:16 -0700 From: Kai Huang To: kvm@vger.kernel.org, linux-sgx@vger.kernel.org, x86@kernel.org Cc: linux-kernel@vger.kernel.org, seanjc@google.com, jarkko@kernel.org, luto@kernel.org, dave.hansen@intel.com, rick.p.edgecombe@intel.com, haitao.huang@intel.com, pbonzini@redhat.com, bp@alien8.de, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, Kai Huang Subject: [PATCH v3 07/25] x86/sgx: Initialize virtual EPC driver even when SGX driver is disabled Date: Fri, 19 Mar 2021 20:23:02 +1300 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org Modify sgx_init() to always try to initialize the virtual EPC driver, even if the SGX driver is disabled. The SGX driver might be disabled if SGX Launch Control is in locked mode, or not supported in the hardware at all. This allows (non-Linux) guests that support non-LC configurations to use SGX. Acked-by: Dave Hansen Reviewed-by: Sean Christopherson Signed-off-by: Kai Huang --- arch/x86/kernel/cpu/sgx/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 6a734f484aa7..b73114150ff8 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -743,7 +743,15 @@ static int __init sgx_init(void) goto err_page_cache; } - ret = sgx_drv_init(); + /* + * Always try to initialize the native *and* KVM drivers. + * The KVM driver is less picky than the native one and + * can function if the native one is not supported on the + * current system or fails to initialize. + * + * Error out only if both fail to initialize. + */ + ret = !!sgx_drv_init() & !!sgx_vepc_init(); if (ret) goto err_kthread;