Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp6231235imm; Mon, 27 Aug 2018 11:59:57 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYz2HZQGOQewPEKD4il47P7OAsVvm/J8sFPct/bd5rGOJ460dEuDoB4OAktaYmxpFzHlRQX X-Received: by 2002:a63:3f45:: with SMTP id m66-v6mr13410818pga.51.1535396397278; Mon, 27 Aug 2018 11:59:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535396397; cv=none; d=google.com; s=arc-20160816; b=1AmA5dk9qviZ5GEMKlmWqPycLLXbj4Bf4xw8D1oG4S1Iwoa+WCYuGps58yc648Ldct euayLl+O5Tc7sDI1Wswf9yyYt5DRvj5FgXAiYgFbsLgRjrE+UteETwSVpfXviOSpxS80 VddlIBjvnzLPqv8mXkuneOaNMt5vyXyRsXTdHPEcsHkt4RpSLnFtM8s83ozusx/kesgt hSS9zbNgvmwfrMVezrU2/w2M7muZA0W6TPd75fzXq5iARib+V8fP5Goa0lssUmXKnsNc LYg0e16oXFJoFkMVcil6PTFuIFjxAP2E+n7T+b/f+/VUUBfr4Im7nS6yMEboArzbCDon L3oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=gQQaxRYwdxGa3SlIR7NDJo5RgkvFltTbvXeuVe0aFCE=; b=OAmo3vpyI4ma/lQ9XvG6+4sDgqi2dJbDIcfsri5dXTvtrzVWFvVQKkkSgmc4NlvrSK VZtNiAU+oMRlb6JXPum1S0JLTLq/LNuzFabAJlGHtQ+YOsURlYBZJ7uFz+8Tg0S/d93Q gixjer0iWmfq+8GuENJvlJdrnP7SORAMrCNDJlFnCKh0224SMwExSKJ1XuYJRl+Q0yf6 UbGx3SFtyuSUJcI25/O4kQxXWp7sI7l3e2Zl0NIwITxHa5W9nSj9JPUHN1ZdsibHc4+9 V4WYsd83yv0HPWS7cKSsh/5w4Yq2mRJDjAZZsmxbWwfH7VzPAZgCmFpXko/5uje9ysbr xAbQ== 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 d130-v6si15380pgc.189.2018.08.27.11.59.42; Mon, 27 Aug 2018 11:59:57 -0700 (PDT) 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 S1727629AbeH0Wpe (ORCPT + 99 others); Mon, 27 Aug 2018 18:45:34 -0400 Received: from mga14.intel.com ([192.55.52.115]:23091 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727058AbeH0Wpa (ORCPT ); Mon, 27 Aug 2018 18:45:30 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Aug 2018 11:57:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,296,1531810800"; d="scan'208";a="69524693" Received: from nitikasi-mobl.ger.corp.intel.com (HELO localhost) ([10.249.36.186]) by orsmga006.jf.intel.com with ESMTP; 27 Aug 2018 11:57:26 -0700 From: Jarkko Sakkinen To: x86@kernel.org, platform-driver-x86@vger.kernel.org Cc: dave.hansen@intel.com, sean.j.christopherson@intel.com, nhorman@redhat.com, npmccallum@redhat.com, linux-sgx@vger.kernel.org, Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Suresh Siddha , Serge Ayoun , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH v13 10/13] x86/sgx: Add sgx_einit() for initializing enclaves Date: Mon, 27 Aug 2018 21:53:31 +0300 Message-Id: <20180827185507.17087-11-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180827185507.17087-1-jarkko.sakkinen@linux.intel.com> References: <20180827185507.17087-1-jarkko.sakkinen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson Add a function to perform ENCLS(EINIT), which initializes an enclave, which can be used by a driver for running enclaves and VMMs. Writing the LE hash MSRs is extraordinarily expensive, e.g. 3-4x slower than normal MSRs, so we use a per-cpu cache to track the last known value of the MSRs to avoid unnecessarily writing the MSRs with the current value. Signed-off-by: Sean Christopherson Co-developed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen --- arch/x86/include/asm/sgx.h | 2 + arch/x86/kernel/cpu/intel_sgx.c | 86 +++++++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/sgx.h b/arch/x86/include/asm/sgx.h index baf30d49b71f..c15c156436be 100644 --- a/arch/x86/include/asm/sgx.h +++ b/arch/x86/include/asm/sgx.h @@ -108,6 +108,8 @@ void sgx_free_page(struct sgx_epc_page *page); void sgx_page_reclaimable(struct sgx_epc_page *page); struct page *sgx_get_backing(struct file *file, pgoff_t index); void sgx_put_backing(struct page *backing_page, bool write); +int sgx_einit(struct sgx_sigstruct *sigstruct, struct sgx_einittoken *token, + struct sgx_epc_page *secs_page, u64 lepubkeyhash[4]); #define ENCLS_FAULT_FLAG 0x40000000UL #define ENCLS_FAULT_FLAG_ASM "$0x40000000" diff --git a/arch/x86/kernel/cpu/intel_sgx.c b/arch/x86/kernel/cpu/intel_sgx.c index 1046478a3ab9..fe25e6805680 100644 --- a/arch/x86/kernel/cpu/intel_sgx.c +++ b/arch/x86/kernel/cpu/intel_sgx.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -38,6 +39,18 @@ static LIST_HEAD(sgx_active_page_list); static DEFINE_SPINLOCK(sgx_active_page_list_lock); static struct task_struct *ksgxswapd_tsk; static DECLARE_WAIT_QUEUE_HEAD(ksgxswapd_waitq); +static struct notifier_block sgx_pm_notifier; +static u64 sgx_pm_cnt; + +/* The cache for the last known values of IA32_SGXLEPUBKEYHASHx MSRs for each + * CPU. The entries are initialized when they are first used by sgx_einit(). + */ +struct sgx_lepubkeyhash { + u64 msrs[4]; + u64 pm_cnt; +}; + +static DEFINE_PER_CPU(struct sgx_lepubkeyhash *, sgx_lepubkeyhash_cache); /** * sgx_reclaim_pages - reclaim EPC pages from the consumers @@ -328,6 +341,54 @@ void sgx_put_backing(struct page *backing_page, bool write) } EXPORT_SYMBOL_GPL(sgx_put_backing); +/** + * sgx_einit - initialize an enclave + * @sigstruct: a pointer to the SIGSTRUCT + * @token: a pointer to the EINITTOKEN + * @secs_page: a pointer to the SECS EPC page + * @lepubkeyhash: the desired value for IA32_SGXLEPUBKEYHASHx MSRs + * + * Try to perform EINIT operation. If the MSRs are writable, they are updated + * according to @lepubkeyhash. + * + * Return: + * 0 on success, + * -errno on failure + * SGX error code if EINIT fails + */ +int sgx_einit(struct sgx_sigstruct *sigstruct, struct sgx_einittoken *token, + struct sgx_epc_page *secs_page, u64 lepubkeyhash[4]) +{ + struct sgx_lepubkeyhash __percpu *cache; + bool cache_valid; + int i, ret; + + if (!sgx_lc_enabled) + return __einit(sigstruct, token, sgx_epc_addr(secs_page)); + + cache = per_cpu(sgx_lepubkeyhash_cache, smp_processor_id()); + if (!cache) { + cache = kzalloc(sizeof(struct sgx_lepubkeyhash), GFP_KERNEL); + if (!cache) + return -ENOMEM; + } + + cache_valid = cache->pm_cnt == sgx_pm_cnt; + cache->pm_cnt = sgx_pm_cnt; + preempt_disable(); + for (i = 0; i < 4; i++) { + if (cache_valid && lepubkeyhash[i] == cache->msrs[i]) + continue; + + wrmsrl(MSR_IA32_SGXLEPUBKEYHASH0 + i, lepubkeyhash[i]); + cache->msrs[i] = lepubkeyhash[i]; + } + ret = __einit(sigstruct, token, sgx_epc_addr(secs_page)); + preempt_enable(); + return ret; +} +EXPORT_SYMBOL(sgx_einit); + static __init int sgx_init_epc_bank(u64 addr, u64 size, unsigned long index, struct sgx_epc_bank *bank) { @@ -426,6 +487,15 @@ static __init int sgx_page_cache_init(void) return 0; } +static int sgx_pm_notifier_cb(struct notifier_block *nb, unsigned long action, + void *data) +{ + if (action == PM_SUSPEND_PREPARE || action == PM_HIBERNATION_PREPARE) + sgx_pm_cnt++; + + return NOTIFY_DONE; +} + static __init int sgx_init(void) { struct task_struct *tsk; @@ -452,20 +522,30 @@ static __init int sgx_init(void) if (!(fc & FEATURE_CONTROL_SGX_LE_WR)) pr_info("IA32_SGXLEPUBKEYHASHn MSRs are not writable\n"); - ret = sgx_page_cache_init(); + sgx_pm_notifier.notifier_call = sgx_pm_notifier_cb; + ret = register_pm_notifier(&sgx_pm_notifier); if (ret) return ret; + ret = sgx_page_cache_init(); + if (ret) + goto out_pm; + tsk = kthread_run(ksgxswapd, NULL, "ksgxswapd"); if (IS_ERR(tsk)) { - sgx_page_cache_teardown(); - return PTR_ERR(tsk); + ret = PTR_ERR(tsk); + goto out_pcache; } ksgxswapd_tsk = tsk; sgx_enabled = true; sgx_lc_enabled = !!(fc & FEATURE_CONTROL_SGX_LE_WR); return 0; +out_pcache: + sgx_page_cache_teardown(); +out_pm: + unregister_pm_notifier(&sgx_pm_notifier); + return ret; } arch_initcall(sgx_init); -- 2.17.1