From patchwork Wed Feb 1 20:02:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9550611 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 E8AEA60236 for ; Wed, 1 Feb 2017 20:02:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC48F2846C for ; Wed, 1 Feb 2017 20:02:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D117128471; Wed, 1 Feb 2017 20:02:55 +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 7481E2846C for ; Wed, 1 Feb 2017 20:02:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1135381FC5 for ; Wed, 1 Feb 2017 12:02:55 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 7C46B81FC5 for ; Wed, 1 Feb 2017 12:02:53 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 01 Feb 2017 12:02:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,321,1477983600"; d="scan'208";a="38435867" Received: from rbrown1-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.26.122]) by orsmga002.jf.intel.com with ESMTP; 01 Feb 2017 12:02:51 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Wed, 1 Feb 2017 22:02:48 +0200 Message-Id: <20170201200248.15137-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.9.3 Subject: [intel-sgx-kernel-dev] [PATCH] intel_sgx: clean up ksgxswapd 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 Use wait_event() and with its help clean up all the unnecessary cruft from the implementation of ksgxswapd. Signed-off-by: Jarkko Sakkinen Reviewed-by: Sean Christopherson Tested-by: --- drivers/platform/x86/intel_sgx_page_cache.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/platform/x86/intel_sgx_page_cache.c b/drivers/platform/x86/intel_sgx_page_cache.c index d073057..95949de 100644 --- a/drivers/platform/x86/intel_sgx_page_cache.c +++ b/drivers/platform/x86/intel_sgx_page_cache.c @@ -388,31 +388,12 @@ static void sgx_swap_pages(unsigned long nr_to_scan) int ksgxswapd(void *p) { - DEFINE_WAIT(wait); - unsigned int nr_free; - unsigned int nr_high; + while (!kthread_should_stop()) { + wait_event(ksgxswapd_waitq, kthread_should_stop() || + sgx_nr_free_pages < sgx_nr_high_pages); - for ( ; ; ) { - if (kthread_should_stop()) - break; - - spin_lock(&sgx_free_list_lock); - nr_free = sgx_nr_free_pages; - nr_high = sgx_nr_high_pages; - spin_unlock(&sgx_free_list_lock); - - if (nr_free < nr_high) { + if (sgx_nr_free_pages < sgx_nr_high_pages) sgx_swap_pages(SGX_NR_SWAP_CLUSTER_MAX); - schedule(); - } else { - prepare_to_wait(&ksgxswapd_waitq, - &wait, TASK_INTERRUPTIBLE); - - if (!kthread_should_stop()) - schedule(); - - finish_wait(&ksgxswapd_waitq, &wait); - } } pr_info("%s: done\n", __func__);