From patchwork Mon Sep 16 10:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 11146729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F85514ED for ; Mon, 16 Sep 2019 10:19:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28236206C2 for ; Mon, 16 Sep 2019 10:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728662AbfIPKTQ (ORCPT ); Mon, 16 Sep 2019 06:19:16 -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 S1725853AbfIPKTP (ORCPT ); Mon, 16 Sep 2019 06:19:15 -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:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="180387588" 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:12 -0700 From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen , Sean Christopherson , Shay Katz-zamir , Serge Ayoun Subject: [PATCH v3 12/17] x86/sgx: Open code sgx_reclaimer_get() and sgx_reclaimer_put() Date: Mon, 16 Sep 2019 13:17:58 +0300 Message-Id: <20190916101803.30726-13-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 Sender: linux-sgx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org Open code sgx_reclaimer_get() and sgx_reclaimer_put(). They are legacy from the callback interface. Wrapping a function call inside a function does not make sense. Cc: Sean Christopherson Cc: Shay Katz-zamir Cc: Serge Ayoun Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/sgx/reclaim.c | 47 ++++++++++++------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c b/arch/x86/kernel/cpu/sgx/reclaim.c index c2a85db68307..5a4d44dd02d7 100644 --- a/arch/x86/kernel/cpu/sgx/reclaim.c +++ b/arch/x86/kernel/cpu/sgx/reclaim.c @@ -121,22 +121,6 @@ void sgx_mark_page_reclaimable(struct sgx_epc_page *page) spin_unlock(&sgx_active_page_list_lock); } -bool sgx_reclaimer_get(struct sgx_epc_page *epc_page) -{ - struct sgx_encl_page *encl_page = epc_page->owner; - struct sgx_encl *encl = encl_page->encl; - - return kref_get_unless_zero(&encl->refcount) != 0; -} - -void sgx_reclaimer_put(struct sgx_epc_page *epc_page) -{ - struct sgx_encl_page *encl_page = epc_page->owner; - struct sgx_encl *encl = encl_page->encl; - - kref_put(&encl->refcount, sgx_encl_release); -} - static bool sgx_reclaimer_evict(struct sgx_epc_page *epc_page) { struct sgx_encl_page *page = epc_page->owner; @@ -392,6 +376,7 @@ void sgx_reclaim_pages(void) { struct sgx_epc_page *chunk[SGX_NR_TO_SCAN + 1]; struct sgx_epc_section *section; + struct sgx_encl_page *encl_page; struct sgx_epc_page *epc_page; int cnt = 0; int i; @@ -404,8 +389,9 @@ void sgx_reclaim_pages(void) epc_page = list_first_entry(&sgx_active_page_list, struct sgx_epc_page, list); list_del_init(&epc_page->list); + encl_page = epc_page->owner; - if (sgx_reclaimer_get(epc_page)) + if (kref_get_unless_zero(&encl_page->encl->refcount) != 0) chunk[cnt++] = epc_page; else /* The owner is freeing the page. No need to add the @@ -417,10 +403,12 @@ void sgx_reclaim_pages(void) for (i = 0; i < cnt; i++) { epc_page = chunk[i]; + encl_page = epc_page->owner; + if (sgx_reclaimer_evict(epc_page)) continue; - sgx_reclaimer_put(epc_page); + kref_put(&encl_page->encl->refcount, sgx_encl_release); spin_lock(&sgx_active_page_list_lock); list_add_tail(&epc_page->list, &sgx_active_page_list); @@ -437,19 +425,20 @@ void sgx_reclaim_pages(void) for (i = 0; i < cnt; i++) { epc_page = chunk[i]; - if (epc_page) { - sgx_reclaimer_write(epc_page); - sgx_reclaimer_put(epc_page); - epc_page->desc &= ~SGX_EPC_PAGE_RECLAIMABLE; + if (!epc_page) + continue; - section = sgx_epc_section(epc_page); - spin_lock(§ion->lock); - list_add_tail(&epc_page->list, - §ion->page_list); - section->free_cnt++; - spin_unlock(§ion->lock); - } + encl_page = epc_page->owner; + sgx_reclaimer_write(epc_page); + kref_put(&encl_page->encl->refcount, sgx_encl_release); + epc_page->desc &= ~SGX_EPC_PAGE_RECLAIMABLE; + + section = sgx_epc_section(epc_page); + spin_lock(§ion->lock); + list_add_tail(&epc_page->list, §ion->page_list); + section->free_cnt++; + spin_unlock(§ion->lock); } }