From patchwork Thu Dec 22 20:15:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 9485565 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 216DB601C0 for ; Thu, 22 Dec 2016 20:16:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24AD82844A for ; Thu, 22 Dec 2016 20:16:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1332928461; Thu, 22 Dec 2016 20:16:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 87A702845B for ; Thu, 22 Dec 2016 20:16:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6BF84823C3 for ; Thu, 22 Dec 2016 12:16:04 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 455C6823B8 for ; Thu, 22 Dec 2016 12:16:03 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP; 22 Dec 2016 12:16:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,390,1477983600"; d="scan'208";a="45576596" Received: from sjchrist-ts.jf.intel.com ([10.54.74.20]) by orsmga005.jf.intel.com with ESMTP; 22 Dec 2016 12:16:02 -0800 From: Sean Christopherson To: intel-sgx-kernel-dev@lists.01.org Date: Thu, 22 Dec 2016 12:15:33 -0800 Message-Id: <1482437735-4722-5-git-send-email-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482437735-4722-1-git-send-email-sean.j.christopherson@intel.com> References: <1482437735-4722-1-git-send-email-sean.j.christopherson@intel.com> Subject: [intel-sgx-kernel-dev] [PATCH 4/6] intel_sgx: Clean-up page freeing in sgx_ewb flow X-BeenThere: intel-sgx-kernel-dev@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Project: Intel® Software Guard Extensions for Linux*: https://01.org/intel-software-guard-extensions" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-sgx-kernel-dev-bounces@lists.01.org Sender: "intel-sgx-kernel-dev" X-Virus-Scanned: ClamAV using ClamSMTP Call sgx_free_encl_page directly from sgx_ewb to make it more clear why sgx_free_encl_page is called with(out) SGX_FREE_SKIP_EREMOVE. This removes the need to return success/failure from sgx_ewb, and eliminates the associated tracking in sgx_write_pages. Do not invalidate the enclave if it is already dead. Signed-off-by: Sean Christopherson --- drivers/platform/x86/intel_sgx_page_cache.c | 65 +++++++++++++---------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index f4833a0..45964b4 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -232,6 +232,15 @@ static void sgx_etrack(struct sgx_epc_page *epc_page) sgx_put_epc_page(epc); } +static void sgx_free_encl_page(struct sgx_encl_page *encl_page, + struct sgx_encl *encl, + unsigned int flags) +{ + sgx_free_page(encl_page->epc_page, encl, flags); + encl_page->epc_page = NULL; + encl_page->flags &= ~SGX_ENCL_PAGE_RESERVED; +} + static int __sgx_ewb(struct sgx_encl *encl, struct sgx_encl_page *encl_page) { @@ -267,36 +276,29 @@ static int __sgx_ewb(struct sgx_encl *encl, return ret; } -static bool sgx_ewb(struct sgx_encl *encl, - struct sgx_encl_page *entry) +static void sgx_ewb(struct sgx_encl *encl, + struct sgx_encl_page *encl_page) { - int ret = __sgx_ewb(encl, entry); + int ret = __sgx_ewb(encl, encl_page); if (ret == SGX_NOT_TRACKED) { /* slow path, IPI needed */ smp_call_function(sgx_ipi_cb, NULL, 1); - ret = __sgx_ewb(encl, entry); + ret = __sgx_ewb(encl, encl_page); } - if (ret) { - /* make enclave inaccessible */ - sgx_invalidate(encl); - smp_call_function(sgx_ipi_cb, NULL, 1); - if (ret > 0) - sgx_err(encl, "EWB returned %d, enclave killed\n", ret); - return false; + if (ret == SGX_SUCCESS) { + sgx_free_encl_page(encl_page, encl, SGX_FREE_SKIP_EREMOVE); + } else { + sgx_free_encl_page(encl_page, encl, 0); + if (!(encl->flags & SGX_ENCL_DEAD)) { + /* make enclave inaccessible */ + sgx_invalidate(encl); + smp_call_function(sgx_ipi_cb, NULL, 1); + if (ret > 0) + sgx_err(encl, "EWB returned %d, enclave killed\n", ret); + } } - - return true; -} - -void sgx_free_encl_page(struct sgx_encl_page *entry, - struct sgx_encl *encl, - unsigned int flags) -{ - sgx_free_page(entry->epc_page, encl, flags); - entry->epc_page = NULL; - entry->flags &= ~SGX_ENCL_PAGE_RESERVED; } static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) @@ -304,7 +306,6 @@ static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) struct sgx_encl_page *entry; struct sgx_encl_page *tmp; struct vm_area_struct *evma; - unsigned int free_flags; if (list_empty(src)) return; @@ -335,25 +336,17 @@ static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) load_list); list_del(&entry->load_list); - free_flags = 0; - evma = sgx_find_vma(encl, entry->addr); if (evma) { - if (sgx_ewb(encl, entry)) - free_flags = SGX_FREE_SKIP_EREMOVE; + sgx_ewb(encl, entry); encl->secs_child_cnt--; + } else { + sgx_free_encl_page(entry, encl, 0); } - - sgx_free_encl_page(entry, encl, free_flags); } - if (!encl->secs_child_cnt && (encl->flags & SGX_ENCL_INITIALIZED)) { - free_flags = 0; - if (sgx_ewb(encl, &encl->secs_page)) - free_flags = SGX_FREE_SKIP_EREMOVE; - - sgx_free_encl_page(&encl->secs_page, encl, free_flags); - } + if (!encl->secs_child_cnt && (encl->flags & SGX_ENCL_INITIALIZED)) + sgx_ewb(encl, &encl->secs_page); mutex_unlock(&encl->lock); }