From patchwork Mon Sep 16 10:17:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 11146719 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 B050F14ED for ; Mon, 16 Sep 2019 10:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 988C3206C2 for ; Mon, 16 Sep 2019 10:18:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728106AbfIPKSv (ORCPT ); Mon, 16 Sep 2019 06:18:51 -0400 Received: from mga14.intel.com ([192.55.52.115]:12234 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725853AbfIPKSv (ORCPT ); Mon, 16 Sep 2019 06:18:51 -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:18:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,492,1559545200"; d="scan'208";a="180387486" 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:18:48 -0700 From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Jarkko Sakkinen , Sean Christopherson , Shay Katz-zamir , Serge Ayoun Subject: [PATCH v3 07/17] x86/sgx: Remove pages in sgx_reclaimer_write() Date: Mon, 16 Sep 2019 13:17:53 +0300 Message-Id: <20190916101803.30726-8-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 The overall flow is somewhat simpler if sgx_reclaimer_write() takes care of freeing and removing pages and sgx_encl_ewb() focuses only on doing ENCLS[EWB]. Move sgx_free_page() and __eremove() from sgx_encl_ewb() to sgx_reclaimer_write(). Cc: Sean Christopherson Cc: Shay Katz-zamir Cc: Serge Ayoun Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/sgx/reclaim.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/reclaim.c b/arch/x86/kernel/cpu/sgx/reclaim.c index cfda38a9b05c..353888256b2b 100644 --- a/arch/x86/kernel/cpu/sgx/reclaim.c +++ b/arch/x86/kernel/cpu/sgx/reclaim.c @@ -357,16 +357,7 @@ static void sgx_encl_ewb(struct sgx_epc_page *epc_page, unsigned int pt) encl_page->desc |= va_offset; encl_page->va_page = va_page; - } else if (pt != SGX_SECINFO_SECS) { - ret = __eremove(sgx_epc_addr(epc_page)); - WARN(ret, "EREMOVE returned %d\n", ret); } - - /* The reclaimer is not aware of SECS pages. */ - if (pt == SGX_SECINFO_SECS) - sgx_free_page(epc_page); - - encl_page->epc_page = NULL; } static void sgx_reclaimer_write(struct sgx_epc_page *epc_page) @@ -374,6 +365,7 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page) struct sgx_encl_page *encl_page = epc_page->owner; struct sgx_encl *encl = encl_page->encl; unsigned int pt; + int ret; if (encl_page->desc & SGX_ENCL_PAGE_TCS) pt = SGX_SECINFO_TCS; @@ -383,13 +375,22 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page) mutex_lock(&encl->lock); sgx_encl_ewb(epc_page, pt); + if (atomic_read(&encl->flags) & SGX_ENCL_DEAD) { + ret = __eremove(sgx_epc_addr(epc_page)); + WARN(ret, "EREMOVE returned %d\n", ret); + } + encl_page->epc_page = NULL; encl->secs_child_cnt--; if (!encl->secs_child_cnt && (atomic_read(&encl->flags) & - (SGX_ENCL_DEAD | SGX_ENCL_INITIALIZED))) + (SGX_ENCL_DEAD | SGX_ENCL_INITIALIZED))) { sgx_encl_ewb(encl->secs.epc_page, SGX_SECINFO_SECS); + sgx_free_page(encl->secs.epc_page); + + encl->secs.epc_page = NULL; + } mutex_unlock(&encl->lock); }