From patchwork Tue Jan 31 23:03:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9548765 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 C197460236 for ; Tue, 31 Jan 2017 23:03:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9B672832B for ; Tue, 31 Jan 2017 23:03:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AECF4283EC; Tue, 31 Jan 2017 23:03:18 +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 65E152832B for ; Tue, 31 Jan 2017 23:03:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 47B0781F73 for ; Tue, 31 Jan 2017 15:03:18 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 35A1181F73 for ; Tue, 31 Jan 2017 15:03:17 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP; 31 Jan 2017 15:03:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,316,1477983600"; d="scan'208";a="59406197" Received: from ljegan-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.5.75]) by orsmga005.jf.intel.com with ESMTP; 31 Jan 2017 15:03:15 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Wed, 1 Feb 2017 01:03:05 +0200 Message-Id: <20170131230308.7561-3-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 2/5] intel_sgx: always assume encl parameter for sgx_free_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 The encl parameter is passed in all call sites so we make it as a requirement. Signed-off-by: Jarkko Sakkinen --- drivers/platform/x86/intel_sgx_page_cache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index d2b8baa..3c6c7a4 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -539,12 +539,10 @@ void sgx_free_page(struct sgx_epc_page *entry, void *epc; int ret; - if (encl) { - atomic_dec(&encl->tgid_ctx->epc_cnt); + atomic_dec(&encl->tgid_ctx->epc_cnt); - if (encl->flags & SGX_ENCL_SUSPEND) - flags |= SGX_FREE_SKIP_EREMOVE; - } + if (encl->flags & SGX_ENCL_SUSPEND) + flags |= SGX_FREE_SKIP_EREMOVE; if (!(flags & SGX_FREE_SKIP_EREMOVE)) { epc = sgx_get_epc_page(entry);