From patchwork Tue Jan 31 23:03: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: 9548771 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 C56B660236 for ; Tue, 31 Jan 2017 23:03:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE19D2832B for ; Tue, 31 Jan 2017 23:03:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B308A283EC; Tue, 31 Jan 2017 23:03:27 +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 6EF8D2832B for ; Tue, 31 Jan 2017 23:03:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 61A8281F73 for ; Tue, 31 Jan 2017 15:03:27 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 8D18D81F73 for ; Tue, 31 Jan 2017 15:03:26 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jan 2017 15:03:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,316,1477983600"; d="scan'208"; a="1101363910" Received: from ljegan-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.5.75]) by fmsmga001.fm.intel.com with ESMTP; 31 Jan 2017 15:03:21 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Wed, 1 Feb 2017 01:03:07 +0200 Message-Id: <20170131230308.7561-5-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 4/5] 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.h | 4 ++++ drivers/platform/x86/intel_sgx_page_cache.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/intel_sgx.h b/drivers/platform/x86/intel_sgx.h index be08346..5cfb043 100644 --- a/drivers/platform/x86/intel_sgx.h +++ b/drivers/platform/x86/intel_sgx.h @@ -185,6 +185,10 @@ extern atomic_t sgx_nr_pids; pr_err_ratelimited("intel_sgx: [%d:0x%p] " fmt, \ pid_nr((encl)->tgid_ctx->tgid), \ (void *)(encl)->base, ##__VA_ARGS__) +#define sgx_crit(encl, fmt, ...) \ + pr_crit_ratelimited("intel_sgx: [%d:0x%p] " fmt, \ + pid_nr((encl)->tgid_ctx->tgid), \ + (void *)(encl)->base, ##__VA_ARGS__) long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); #ifdef CONFIG_COMPAT diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index 248ff71..4c4eabc 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -533,10 +533,8 @@ void sgx_free_page(struct sgx_epc_page *entry, struct sgx_encl *encl) ret = __eremove(epc); sgx_put_epc_page(epc); - if (ret) { - pr_err("EREMOVE returned %d\n", ret); - BUG(); - } + if (ret) + sgx_crit(encl, "EREMOVE returned %d\n", ret); spin_lock(&sgx_free_list_lock); list_add(&entry->free_list, &sgx_free_list);