Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp692311ybt; Mon, 6 Jul 2020 20:42:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR6AHemF6mOMsfUGHiEXdzVkEHKSx0vwAVTLbGomOrPhSAIUtB6b+jzR219hfRfiPa7hkL X-Received: by 2002:a17:906:924d:: with SMTP id c13mr38768347ejx.518.1594093348702; Mon, 06 Jul 2020 20:42:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594093348; cv=none; d=google.com; s=arc-20160816; b=c4C1jcxh2zFUob2UQc1eRWhTsbZgzNRnbSY7bFPg/3gPWE5J/9Sj7wJQIl3Nlb1n47 kPx1/y1lpa25tqHTR+3ToyvGct2uNLHUU4xqplW2vMtYyr0xnkdAR3G843O+fJinLmRK dIkvP+EvFOqYocMDUvn/jGE9V55+uY3kiv1BsydmWcUGTTgsZ7PX/M+ubNFLWkhIGgra lwPDTGtTK1sm+OGJPb2SBCSdZnHs7BB0sZQMIMqd3tlpaPIGfsOU/c5vNr8TQfet4xT9 zWbSJM7HpFxXfpnVMDOH8DspDxPRlXMeKaklNhxw82uixAjCOt0xSng2cvxZ9ew90P4Y yrKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=q1As+2Ivnr/yXYs3ZRujEFcnV4SrI+ZyfUApXTdwJ38=; b=HumxLzYKLiOQnxPyrRTqjni/oc+TaY1ACzpAig9QJOF4YH3reWMxt/+uDo9ZoNj36V Gf54DKO0ln2nYaBaRPwQ3YQX6q6fazRSqpvCrN++su0UfSkmJWtsSPCPnjWe3pOvJtw9 DuG3UpVrQBjOH7W12XXZvCNUGc5ifYryCTHexa9RJwR0DfO45qOZjs7GOUtZn7hYfWkX EDduialpgq9VHJe5HdJAprQXk6WUiulCnB/9+5toOvi5LbV1u+pe3BKuLwbj9LbQs6c5 ihe4ENkNABoAk4UumSBSHJc8bBQXy/Ok+g1AhC6RBME/N0IOP+bBi32WIqVsYW01K1N1 k87w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t1si14376180ejd.639.2020.07.06.20.42.05; Mon, 06 Jul 2020 20:42:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728096AbgGGDjx (ORCPT + 99 others); Mon, 6 Jul 2020 23:39:53 -0400 Received: from mga11.intel.com ([192.55.52.93]:38648 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727107AbgGGDjx (ORCPT ); Mon, 6 Jul 2020 23:39:53 -0400 IronPort-SDR: Z6k/PgpfJ01n9vGzNFcEImKWwuAtdPDwCXaoGnn/gyOMBLa0h3ygCKm0/T6T1+02Yytsias3Lc uuqj7pcrb1Rw== X-IronPort-AV: E=McAfee;i="6000,8403,9674"; a="145634072" X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="145634072" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 20:39:52 -0700 IronPort-SDR: ngV3nWz2failHVGzOb3ZueGrUNxlr9gJQcYT2SYXygFOz8L/EBKFfgJbq9Y5Qpu4wqJ2kUtzNS 2LSfMfvORI2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,321,1589266800"; d="scan'208";a="427314497" Received: from apiccion-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.45.178]) by orsmga004.jf.intel.com with ESMTP; 06 Jul 2020 20:39:42 -0700 From: Jarkko Sakkinen To: x86@kernel.org, linux-sgx@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jarkko Sakkinen , Jethro Beekman , Sean Christopherson , akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, asapek@google.com, bp@alien8.de, cedric.xing@intel.com, chenalexchen@google.com, conradparker@google.com, cyhanish@google.com, dave.hansen@intel.com, haitao.huang@intel.com, josh@joshtriplett.org, kai.huang@intel.com, kai.svahn@intel.com, kmoy@google.com, ludloff@google.com, luto@kernel.org, nhorman@redhat.com, npmccallum@redhat.com, puiterwijk@redhat.com, rientjes@google.com, tglx@linutronix.de, yaozhangx@google.com Subject: [PATCH v35 09/24] x86/sgx: Add __sgx_alloc_epc_page() and sgx_free_epc_page() Date: Tue, 7 Jul 2020 06:37:32 +0300 Message-Id: <20200707033747.142828-10-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200707033747.142828-1-jarkko.sakkinen@linux.intel.com> References: <20200707033747.142828-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add __sgx_alloc_epc_page(), which iterates through EPC sections and borrows a page structure that is not used by anyone else. When a page is no longer needed it must be released with sgx_free_epc_page(). This function implicitly calls ENCLS[EREMOVE], which will return the page to the uninitialized state (i.e. not required from caller part). Acked-by: Jethro Beekman Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Signed-off-by: Jarkko Sakkinen --- arch/x86/kernel/cpu/sgx/main.c | 62 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/sgx/sgx.h | 3 ++ 2 files changed, 65 insertions(+) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index c5831e3db14a..97c6895fb6c9 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -83,6 +83,68 @@ static bool __init sgx_page_reclaimer_init(void) return true; } +static struct sgx_epc_page *__sgx_alloc_epc_page_from_section(struct sgx_epc_section *section) +{ + struct sgx_epc_page *page; + + 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); + + return page; +} + +/** + * __sgx_alloc_epc_page() - Allocate an EPC page + * + * Iterate through EPC sections and borrow a free EPC page to the caller. When a + * page is no longer needed it must be released with sgx_free_epc_page(). + * + * Return: + * an EPC page, + * -errno on error + */ +struct sgx_epc_page *__sgx_alloc_epc_page(void) +{ + struct sgx_epc_section *section; + struct sgx_epc_page *page; + int i; + + for (i = 0; i < sgx_nr_epc_sections; i++) { + section = &sgx_epc_sections[i]; + spin_lock(§ion->lock); + page = __sgx_alloc_epc_page_from_section(section); + spin_unlock(§ion->lock); + + if (page) + return page; + } + + return ERR_PTR(-ENOMEM); +} + +/** + * sgx_free_epc_page() - Free an EPC page + * @page: an EPC page + * + * Call EREMOVE for an EPC page and insert it back to the list of free pages. + */ +void sgx_free_epc_page(struct sgx_epc_page *page) +{ + struct sgx_epc_section *section = sgx_get_epc_section(page); + int ret; + + ret = __eremove(sgx_get_epc_addr(page)); + if (WARN_ONCE(ret, "EREMOVE returned %d (0x%x)", ret, ret)) + return; + + spin_lock(§ion->lock); + list_add_tail(&page->list, §ion->page_list); + spin_unlock(§ion->lock); +} + static void __init sgx_free_epc_section(struct sgx_epc_section *section) { struct sgx_epc_page *page; diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index dff4f5f16d09..fce756c3434b 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -49,4 +49,7 @@ static inline void *sgx_get_epc_addr(struct sgx_epc_page *page) return section->va + (page->desc & PAGE_MASK) - section->pa; } +struct sgx_epc_page *__sgx_alloc_epc_page(void); +void sgx_free_epc_page(struct sgx_epc_page *page); + #endif /* _X86_SGX_H */ -- 2.25.1