From patchwork Thu Jan 26 21:21:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9540109 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 64403604A0 for ; Thu, 26 Jan 2017 21:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56A481FE6A for ; Thu, 26 Jan 2017 21:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BA9428329; Thu, 26 Jan 2017 21:21:17 +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 E244D2817F for ; Thu, 26 Jan 2017 21:21:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id DC92781F82 for ; Thu, 26 Jan 2017 13:21:16 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 4642381F84 for ; Thu, 26 Jan 2017 13:21:15 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 26 Jan 2017 13:21:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,291,1477983600"; d="scan'208"; a="1118321335" Received: from gerardan-mobl.ger.corp.intel.com (HELO localhost) ([10.252.16.178]) by fmsmga002.fm.intel.com with ESMTP; 26 Jan 2017 13:21:13 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Thu, 26 Jan 2017 23:21:07 +0200 Message-Id: <20170126212109.12922-2-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170126212109.12922-1-jarkko.sakkinen@linux.intel.com> References: <20170126212109.12922-1-jarkko.sakkinen@linux.intel.com> Subject: [intel-sgx-kernel-dev] [PATCH 1/3] intel_sgx: do not use BUG() in 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 EREMOVE fails on non-EPC page or when a SECS page with children is to be removed. These do not happen if the driver is working correctly. Log the error but do not crash the driver. Signed-off-by: Jarkko Sakkinen --- drivers/platform/x86/intel_sgx_page_cache.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index d073057..7f73ac7 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -551,10 +551,8 @@ void sgx_free_page(struct sgx_epc_page *entry, ret = __eremove(epc); sgx_put_epc_page(epc); - if (ret) { - pr_err("EREMOVE returned %d\n", ret); - BUG(); - } + if (ret) + sgx_err(encl, "EREMOVE returned %d\n", ret); } spin_lock(&sgx_free_list_lock);