From patchwork Tue Jan 31 23:03:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9548763 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 A32B160236 for ; Tue, 31 Jan 2017 23:03:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AFB52832B for ; Tue, 31 Jan 2017 23:03:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FE0E283EC; Tue, 31 Jan 2017 23:03:15 +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 4CBB72832B for ; Tue, 31 Jan 2017 23:03:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3EFE481F73 for ; Tue, 31 Jan 2017 15:03:15 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 D7A6581F73 for ; Tue, 31 Jan 2017 15:03:14 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP; 31 Jan 2017 15:03:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,316,1477983600"; d="scan'208";a="54200904" Received: from ljegan-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.5.75]) by orsmga004.jf.intel.com with ESMTP; 31 Jan 2017 15:03:13 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Wed, 1 Feb 2017 01:03:04 +0200 Message-Id: <20170131230308.7561-2-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170131230308.7561-1-jarkko.sakkinen@linux.intel.com> References: <20170131230308.7561-1-jarkko.sakkinen@linux.intel.com> Subject: [intel-sgx-kernel-dev] [PATCH 1/5] intel_sgx: turn sgx_free_encl_page() into static sgx_evict_page() 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 Renamed the internal function that evicts an EPC page after swapping because it is easily confused to sgx_free_page(). In addition the function is declared as static because it isn't used outside of intel_sgx_page_cache.c. Signed-off-by: Jarkko Sakkinen --- drivers/platform/x86/intel_sgx_page_cache.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index d073057..d2b8baa 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -290,9 +290,9 @@ static bool sgx_ewb(struct sgx_encl *encl, return true; } -void sgx_free_encl_page(struct sgx_encl_page *entry, - struct sgx_encl *encl, - unsigned int flags) +static void sgx_evict_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; @@ -318,7 +318,7 @@ static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) evma = sgx_find_vma(encl, entry->addr); if (!evma) { list_del(&entry->load_list); - sgx_free_encl_page(entry, encl, 0); + sgx_evict_page(entry, encl, 0); continue; } @@ -344,7 +344,7 @@ static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) encl->secs_child_cnt--; } - sgx_free_encl_page(entry, encl, free_flags); + sgx_evict_page(entry, encl, free_flags); } if (!encl->secs_child_cnt && (encl->flags & SGX_ENCL_INITIALIZED)) { @@ -353,7 +353,7 @@ static void sgx_write_pages(struct sgx_encl *encl, struct list_head *src) free_flags = SGX_FREE_SKIP_EREMOVE; encl->flags |= SGX_ENCL_SECS_EVICTED; - sgx_free_encl_page(&encl->secs_page, encl, free_flags); + sgx_evict_page(&encl->secs_page, encl, free_flags); } mutex_unlock(&encl->lock);