From patchwork Thu Aug 22 15:51:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 11109613 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C401112C for ; Thu, 22 Aug 2019 15:51:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A776233FE for ; Thu, 22 Aug 2019 15:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732853AbfHVPvc (ORCPT ); Thu, 22 Aug 2019 11:51:32 -0400 Received: from mga12.intel.com ([192.55.52.136]:31586 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727953AbfHVPvb (ORCPT ); Thu, 22 Aug 2019 11:51:31 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Aug 2019 08:51:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,417,1559545200"; d="scan'208";a="169822096" Received: from greathea-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.39.37]) by orsmga007.jf.intel.com with ESMTP; 22 Aug 2019 08:51:28 -0700 From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen , Sean Christopherson Subject: [PATCH v2] x86/sgx: Determine SECS at compile time in sgx_encl_eldu() Date: Thu, 22 Aug 2019 18:51:24 +0300 Message-Id: <20190822155124.9439-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-sgx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org Add @secs_page to sgx_encl_eldu() and @is_secs_child to sgx_encl_ewb() (replacing earlier @do_free) in order to state explicitly in the call site when we are using SECS. These replace the use of SGX_ENCL_PAGE_IS_SECS() macro. In order to fully remove SGX_ENCL_PAGE_IS_SECS(), replace sgx_encl_get_index() with a macro SGX_ENCL_PAGE_INEX() as the conditional logic is no longer required. Cc: Sean Christopherson Signed-off-by: Jarkko Sakkinen --- v2: Use @secs_page in the ELDU flow. Rename @secs_child as @is_secs_child in EWB flow. arch/x86/kernel/cpu/sgx/encl.c | 51 ++++++++++++++----------------- arch/x86/kernel/cpu/sgx/encl.h | 4 +-- arch/x86/kernel/cpu/sgx/reclaim.c | 34 +++++++++++++-------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c index d6397f7ef3b8..89fa520be8a2 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c @@ -13,18 +13,27 @@ #include "sgx.h" static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, - struct sgx_epc_page *epc_page) + struct sgx_epc_page *epc_page, + struct sgx_epc_page *secs_page) { unsigned long va_offset = SGX_ENCL_PAGE_VA_OFFSET(encl_page); struct sgx_encl *encl = encl_page->encl; - pgoff_t page_index = sgx_encl_get_index(encl_page); - pgoff_t pcmd_index = sgx_pcmd_index(encl, page_index); - unsigned long pcmd_offset = sgx_pcmd_offset(page_index); struct sgx_pageinfo pginfo; + unsigned long pcmd_offset; struct page *backing; + pgoff_t page_index; + pgoff_t pcmd_index; struct page *pcmd; int ret; + if (secs_page) + page_index = PFN_DOWN(encl->size); + else + page_index = SGX_ENCL_PAGE_INDEX(encl_page); + + pcmd_index = sgx_pcmd_index(encl, page_index); + pcmd_offset = sgx_pcmd_offset(page_index); + backing = sgx_encl_get_backing_page(encl, page_index); if (IS_ERR(backing)) { ret = PTR_ERR(backing); @@ -40,8 +49,11 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, pginfo.addr = SGX_ENCL_PAGE_ADDR(encl_page); pginfo.contents = (unsigned long)kmap_atomic(backing); pginfo.metadata = (unsigned long)kmap_atomic(pcmd) + pcmd_offset; - pginfo.secs = SGX_ENCL_PAGE_IS_SECS(encl_page) ? 0 : - (unsigned long)sgx_epc_addr(encl->secs.epc_page); + + if (secs_page) + pginfo.secs = 0; + else + pginfo.secs = (u64)sgx_epc_addr(secs_page); ret = __eldu(&pginfo, sgx_epc_addr(epc_page), sgx_epc_addr(encl_page->va_page->epc_page) + va_offset); @@ -64,7 +76,8 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, return ret; } -static struct sgx_epc_page *sgx_encl_eldu(struct sgx_encl_page *encl_page) +static struct sgx_epc_page *sgx_encl_eldu(struct sgx_encl_page *encl_page, + struct sgx_epc_page *secs_page) { unsigned long va_offset = SGX_ENCL_PAGE_VA_OFFSET(encl_page); struct sgx_encl *encl = encl_page->encl; @@ -75,7 +88,7 @@ static struct sgx_epc_page *sgx_encl_eldu(struct sgx_encl_page *encl_page) if (IS_ERR(epc_page)) return epc_page; - ret = __sgx_encl_eldu(encl_page, epc_page); + ret = __sgx_encl_eldu(encl_page, epc_page, secs_page); if (ret) { sgx_free_page(epc_page); return ERR_PTR(ret); @@ -118,12 +131,12 @@ static struct sgx_encl_page *sgx_encl_load_page(struct sgx_encl *encl, } if (!(encl->secs.epc_page)) { - epc_page = sgx_encl_eldu(&encl->secs); + epc_page = sgx_encl_eldu(&encl->secs, NULL); if (IS_ERR(epc_page)) return ERR_CAST(epc_page); } - epc_page = sgx_encl_eldu(entry); + epc_page = sgx_encl_eldu(entry, encl->secs.epc_page); if (IS_ERR(epc_page)) return ERR_CAST(epc_page); @@ -534,24 +547,6 @@ void sgx_encl_release(struct kref *ref) kfree(encl); } -/** - * sgx_encl_get_index() - Convert a page descriptor to a page index - * @page: an enclave page - * - * Given an enclave page descriptor, convert it to a page index used to access - * backing storage. The backing page for SECS is located after the enclave - * pages. - */ -pgoff_t sgx_encl_get_index(struct sgx_encl_page *page) -{ - struct sgx_encl *encl = page->encl; - - if (SGX_ENCL_PAGE_IS_SECS(page)) - return PFN_DOWN(encl->size); - - return PFN_DOWN(page->desc - encl->base); -} - /** * sgx_encl_encl_get_backing_page() - Pin the backing page * @encl: an enclave diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h index b1f4e4f0fa65..b8a5f6c5c049 100644 --- a/arch/x86/kernel/cpu/sgx/encl.h +++ b/arch/x86/kernel/cpu/sgx/encl.h @@ -40,7 +40,8 @@ enum sgx_encl_page_desc { ((page)->desc & SGX_ENCL_PAGE_ADDR_MASK) #define SGX_ENCL_PAGE_VA_OFFSET(page) \ ((page)->desc & SGX_ENCL_PAGE_VA_OFFSET_MASK) -#define SGX_ENCL_PAGE_IS_SECS(page) ((page) == &(page)->encl->secs) +#define SGX_ENCL_PAGE_INDEX(page) \ + PFN_DOWN((page)->desc - (page)->encl->base) struct sgx_encl_page { unsigned long desc; @@ -118,7 +119,6 @@ int sgx_encl_find(struct mm_struct *mm, unsigned long addr, struct vm_area_struct **vma); void sgx_encl_destroy(struct sgx_encl *encl); void sgx_encl_release(struct kref *ref); -pgoff_t sgx_encl_get_index(struct sgx_encl_page *page); struct page *sgx_encl_get_backing_page(struct sgx_encl *encl, pgoff_t index); int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm); int sgx_encl_test_and_clear_young(struct mm_struct *mm, diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c b/arch/x86/kernel/cpu/sgx/reclaim.c index 7da9631ed434..a38c4879c657 100644 --- a/arch/x86/kernel/cpu/sgx/reclaim.c +++ b/arch/x86/kernel/cpu/sgx/reclaim.c @@ -220,17 +220,26 @@ static void sgx_reclaimer_block(struct sgx_epc_page *epc_page) } static int __sgx_encl_ewb(struct sgx_encl *encl, struct sgx_epc_page *epc_page, - struct sgx_va_page *va_page, unsigned int va_offset) + struct sgx_va_page *va_page, unsigned int va_offset, + bool is_secs_child) { struct sgx_encl_page *encl_page = epc_page->owner; - pgoff_t page_index = sgx_encl_get_index(encl_page); - pgoff_t pcmd_index = sgx_pcmd_index(encl, page_index); - unsigned long pcmd_offset = sgx_pcmd_offset(page_index); struct sgx_pageinfo pginfo; + unsigned long pcmd_offset; struct page *backing; + pgoff_t page_index; + pgoff_t pcmd_index; struct page *pcmd; int ret; + if (is_secs_child) + page_index = SGX_ENCL_PAGE_INDEX(encl_page); + else + page_index = PFN_DOWN(encl->size); + + pcmd_index = sgx_pcmd_index(encl, page_index); + pcmd_offset = sgx_pcmd_offset(page_index); + backing = sgx_encl_get_backing_page(encl, page_index); if (IS_ERR(backing)) { ret = PTR_ERR(backing); @@ -291,7 +300,7 @@ static const cpumask_t *sgx_encl_ewb_cpumask(struct sgx_encl *encl) return cpumask; } -static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool do_free) +static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool is_secs_child) { struct sgx_encl_page *encl_page = epc_page->owner; struct sgx_encl *encl = encl_page->encl; @@ -308,7 +317,8 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool do_free) if (sgx_va_page_full(va_page)) list_move_tail(&va_page->list, &encl->va_pages); - ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset); + ret = __sgx_encl_ewb(encl, epc_page, va_page, va_offset, + is_secs_child); if (ret == SGX_NOT_TRACKED) { ret = __etrack(sgx_epc_addr(encl->secs.epc_page)); if (ret) { @@ -318,7 +328,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool do_free) } ret = __sgx_encl_ewb(encl, epc_page, va_page, - va_offset); + va_offset, is_secs_child); if (ret == SGX_NOT_TRACKED) { /* * Slow path, send IPIs to kick cpus out of the @@ -330,7 +340,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool do_free) on_each_cpu_mask(sgx_encl_ewb_cpumask(encl), sgx_ipi_cb, NULL, 1); ret = __sgx_encl_ewb(encl, epc_page, va_page, - va_offset); + va_offset, is_secs_child); } } @@ -340,12 +350,12 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, bool do_free) encl_page->desc |= va_offset; encl_page->va_page = va_page; - } else if (!do_free) { + } else if (is_secs_child) { ret = __eremove(sgx_epc_addr(epc_page)); WARN(ret, "EREMOVE returned %d\n", ret); } - if (do_free) + if (!is_secs_child) sgx_free_page(epc_page); encl_page->epc_page = NULL; @@ -358,11 +368,11 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page) mutex_lock(&encl->lock); - sgx_encl_ewb(epc_page, false); + sgx_encl_ewb(epc_page, true); encl->secs_child_cnt--; if (!encl->secs_child_cnt && (encl->flags & (SGX_ENCL_DEAD | SGX_ENCL_INITIALIZED))) { - sgx_encl_ewb(encl->secs.epc_page, true); + sgx_encl_ewb(encl->secs.epc_page, false); } mutex_unlock(&encl->lock);