From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A78CEC49ED7 for ; Mon, 16 Sep 2019 10:19:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87E17214AF for ; Mon, 16 Sep 2019 10:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729913AbfIPKTZ (ORCPT ); Mon, 16 Sep 2019 06:19:25 -0400 Received: from mga14.intel.com ([192.55.52.115]:12263 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729890AbfIPKTZ (ORCPT ); Mon, 16 Sep 2019 06:19:25 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Sep 2019 03:19:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="180387621" Received: from sweber1-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.40.159]) by orsmga008.jf.intel.com with ESMTP; 16 Sep 2019 03:19:22 -0700 From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen , Sean Christopherson , Shay Katz-zamir , Serge Ayoun Subject: [PATCH v3 14/17] x86/sgx: Replace section->free_cnt with a global sgx_nr_free_pages Date: Mon, 16 Sep 2019 13:18:00 +0300 Message-Id: <20190916101803.30726-15-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190916101803.30726-1-jarkko.sakkinen@linux.intel.com> References: <20190916101803.30726-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-sgx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org Replace section specific counters with a single gloal counter for free pages. In effect, remove sgx_calc_free_cnt(). Cc: Sean Christopherson Cc: Shay Katz-zamir Cc: Serge Ayoun Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/sgx/main.c | 11 ++++++----- arch/x86/kernel/cpu/sgx/reclaim.c | 19 ++----------------- arch/x86/kernel/cpu/sgx/sgx.h | 3 +-- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 4c03e5f33414..f37d28023b97 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -14,19 +14,20 @@ struct sgx_epc_section sgx_epc_sections[SGX_MAX_EPC_SECTIONS]; int sgx_nr_epc_sections; +unsigned long sgx_nr_free_pages; static struct sgx_epc_page *sgx_section_try_take_page( struct sgx_epc_section *section) { struct sgx_epc_page *page; - if (!section->free_cnt) + if (list_empty(§ion->page_list)) return NULL; page = list_first_entry(§ion->page_list, struct sgx_epc_page, list); list_del_init(&page->list); - section->free_cnt--; + sgx_nr_free_pages--; return page; } @@ -90,7 +91,7 @@ struct sgx_epc_page *sgx_alloc_page(void *owner, bool reclaim) schedule(); } - if (sgx_calc_free_cnt() < SGX_NR_LOW_PAGES) + if (sgx_nr_free_pages < SGX_NR_LOW_PAGES) wake_up(&ksgxswapd_waitq); return entry; @@ -136,7 +137,7 @@ int __sgx_free_page(struct sgx_epc_page *page) spin_lock(§ion->lock); list_add_tail(&page->list, §ion->page_list); - section->free_cnt++; + sgx_nr_free_pages++; spin_unlock(§ion->lock); return 0; @@ -202,7 +203,7 @@ static __init int sgx_init_epc_section(u64 addr, u64 size, unsigned long index, goto out; page->desc = (addr + (i << PAGE_SHIFT)) | index; list_add_tail(&page->list, §ion->unsanitized_page_list); - section->free_cnt++; + sgx_nr_free_pages++; } return 0; diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c b/arch/x86/kernel/cpu/sgx/reclaim.c index cc3155b61513..2e04a923d8dc 100644 --- a/arch/x86/kernel/cpu/sgx/reclaim.c +++ b/arch/x86/kernel/cpu/sgx/reclaim.c @@ -64,7 +64,7 @@ static void sgx_sanitize_section(struct sgx_epc_section *section) static inline bool sgx_should_reclaim(void) { - return sgx_calc_free_cnt() < SGX_NR_HIGH_PAGES && + return sgx_nr_free_pages < SGX_NR_HIGH_PAGES && !list_empty(&sgx_active_page_list); } @@ -432,7 +432,6 @@ void sgx_reclaim_pages(void) if (!epc_page) continue; - encl_page = epc_page->owner; sgx_reclaimer_write(epc_page); kref_put(&encl_page->encl->refcount, sgx_encl_release); @@ -441,21 +440,7 @@ void sgx_reclaim_pages(void) section = sgx_epc_section(epc_page); spin_lock(§ion->lock); list_add_tail(&epc_page->list, §ion->page_list); - section->free_cnt++; + sgx_nr_free_pages++; spin_unlock(§ion->lock); } } - -unsigned long sgx_calc_free_cnt(void) -{ - struct sgx_epc_section *section; - unsigned long free_cnt = 0; - int i; - - for (i = 0; i < sgx_nr_epc_sections; i++) { - section = &sgx_epc_sections[i]; - free_cnt += section->free_cnt; - } - - return free_cnt; -} diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 9b08690262b5..56d0bde3f4d8 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -30,7 +30,6 @@ struct sgx_epc_section { void *va; struct list_head page_list; struct list_head unsanitized_page_list; - unsigned long free_cnt; spinlock_t lock; }; @@ -72,6 +71,7 @@ static inline void *sgx_epc_addr(struct sgx_epc_page *page) #define SGX_NR_HIGH_PAGES 64 extern int sgx_nr_epc_sections; +extern unsigned long sgx_nr_free_pages; extern struct task_struct *ksgxswapd_tsk; extern struct wait_queue_head(ksgxswapd_waitq); extern struct list_head sgx_active_page_list; @@ -79,7 +79,6 @@ extern spinlock_t sgx_active_page_list_lock; int sgx_page_reclaimer_init(void); void sgx_mark_page_reclaimable(struct sgx_epc_page *page); -unsigned long sgx_calc_free_cnt(void); void sgx_reclaim_pages(void); struct sgx_epc_page *sgx_alloc_page(void *owner, bool reclaim); -- 2.20.1