From patchwork Fri Jan 7 18:16:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristen Carlson Accardi X-Patchwork-Id: 12706901 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7912BC433F5 for ; Fri, 7 Jan 2022 18:17:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348676AbiAGSRL (ORCPT ); Fri, 7 Jan 2022 13:17:11 -0500 Received: from mga03.intel.com ([134.134.136.65]:15966 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240903AbiAGSRK (ORCPT ); Fri, 7 Jan 2022 13:17:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641579430; x=1673115430; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7KuoOblUfGK5uG6y7thVBk31CNJyygoqp6O5o/g/fxQ=; b=S5kbdIMMKO+fFFjJPWf2h7AQ2SPygACUHHO3v56TzsI/jXqYq6I0sDO7 k/KsJg8WhfS0ykQYZ8Pruc/sFQlC4ROLzkRI1Nd0lO7n2wRxqTr+aBxrG s6mils3tiP5iOqSEoF3esx7xG5xe+W+J1tIn+EPzayQOgo0y6DHdEtpoo dcqx+2URDrNm+FGpZHda9YNdQSYnAOKSvhg0m1mvC0ni0ZuWYeB8t3Ig0 iBklJyEV+KnQcoCkbDV1zvjmUz4LpOUdkjKC9Tl6EWG4elgmZxBgNiaaX srrd3JlKup3v9XNJntTZIa2xSqqBxp1cMGMfRyrHw/x8g/qKbMciCeIJi A==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="242864355" X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="242864355" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 10:17:10 -0800 X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="622009685" Received: from kcaccard-mobl.amr.corp.intel.com (HELO kcaccard-mobl1.jf.intel.com) ([10.212.25.179]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 10:17:09 -0800 From: Kristen Carlson Accardi To: linux-sgx@vger.kernel.org, Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" Cc: linux-kernel@vger.kernel.org, Kristen Carlson Accardi Subject: [PATCH v2 1/2] x86/sgx: Add accounting for tracking overcommit Date: Fri, 7 Jan 2022 10:16:16 -0800 Message-Id: <20220107181618.6597-2-kristen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220107181618.6597-1-kristen@linux.intel.com> References: <20220107181618.6597-1-kristen@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org When the system runs out of enclave memory, SGX can reclaim EPC pages by swapping to normal RAM. This normal RAM is allocated via a per-enclave shared memory area. The shared memory area is not mapped into the enclave or the task mapping it, which makes its memory use opaque (including to the OOM killer). Having lots of hard to find memory around is problematic, especially when there is no limit. Introduce a global counter that can be used to limit the number of pages that enclaves are able to consume for backing storage. This parameter is a percentage value that is used in conjunction with the number of EPC pages in the system to set a cap on the amount of backing RAM that can be consumed. The overcommit percentage value is 150, which limits the total number of shared memory pages that may be consumed by all enclaves as backing pages to 1.5X of EPC pages on the system. For example, on an SGX system that has 128MB of EPC, this would cap the amount of normal RAM that SGX consumes for its shared memory areas at 192MB. The SGX overcommit percent works differently than the core VM overcommit limit. Enclaves request backing pages one page at a time, and the number of in use backing pages that are allowed is a global resource that is limited for all enclaves. Introduce a pair of functions which can be used by callers when requesting backing RAM pages. These functions are responsible for accounting the page charges. A request may return an error if the request will cause the counter to exceed the backing page cap. Signed-off-by: Kristen Carlson Accardi --- arch/x86/kernel/cpu/sgx/main.c | 46 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/sgx/sgx.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 2857a49f2335..8a7bfe0d9023 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -43,6 +43,45 @@ static struct sgx_numa_node *sgx_numa_nodes; static LIST_HEAD(sgx_dirty_page_list); +/* + * Limits the amount of normal RAM that SGX can consume for EPC + * overcommit to the total EPC pages * sgx_overcommit_percent / 100 + */ +static int sgx_overcommit_percent = 150; + +/* The number of pages that can be allocated globally for backing storage. */ +static atomic_long_t sgx_nr_available_backing_pages; + +/** + * sgx_charge_mem() - charge for a page used for backing storage + * + * Backing storage usage is capped by the sgx_nr_available_backing_pages. + * If the backing storage usage is over the overcommit limit, + * return an error. + * + * Return: + * 0: The page requested does not exceed the limit + * -ENOMEM: The page requested exceeds the overcommit limit + */ +int sgx_charge_mem(void) +{ + if (!atomic_long_add_unless(&sgx_nr_available_backing_pages, -1, 0)) + return -ENOMEM; + + return 0; +} + +/** + * sgx_uncharge_mem() - uncharge a page previously used for backing storage + * + * When backing storage is no longer in use, increment the + * sgx_nr_available_backing_pages counter. + */ +void sgx_uncharge_mem(void) +{ + atomic_long_inc(&sgx_nr_available_backing_pages); +} + /* * Reset post-kexec EPC pages to the uninitialized state. The pages are removed * from the input list, and made available for the page allocator. SECS pages @@ -786,6 +825,8 @@ static bool __init sgx_page_cache_init(void) u64 pa, size; int nid; int i; + u64 total_epc_bytes = 0; + u64 available_backing_bytes; sgx_numa_nodes = kmalloc_array(num_possible_nodes(), sizeof(*sgx_numa_nodes), GFP_KERNEL); if (!sgx_numa_nodes) @@ -830,6 +871,7 @@ static bool __init sgx_page_cache_init(void) sgx_epc_sections[i].node = &sgx_numa_nodes[nid]; sgx_numa_nodes[nid].size += size; + total_epc_bytes += size; sgx_nr_epc_sections++; } @@ -839,6 +881,10 @@ static bool __init sgx_page_cache_init(void) return false; } + available_backing_bytes = total_epc_bytes * (sgx_overcommit_percent / 100); + + atomic_long_set(&sgx_nr_available_backing_pages, available_backing_bytes >> PAGE_SHIFT); + return true; } diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 0f17def9fe6f..3507a9983fc1 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -89,6 +89,8 @@ void sgx_free_epc_page(struct sgx_epc_page *page); void sgx_mark_page_reclaimable(struct sgx_epc_page *page); int sgx_unmark_page_reclaimable(struct sgx_epc_page *page); struct sgx_epc_page *sgx_alloc_epc_page(void *owner, bool reclaim); +int sgx_charge_mem(void); +void sgx_uncharge_mem(void); #ifdef CONFIG_X86_SGX_KVM int __init sgx_vepc_init(void); From patchwork Fri Jan 7 18:16:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristen Carlson Accardi X-Patchwork-Id: 12706902 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A454C433F5 for ; Fri, 7 Jan 2022 18:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348683AbiAGSRO (ORCPT ); Fri, 7 Jan 2022 13:17:14 -0500 Received: from mga03.intel.com ([134.134.136.65]:15966 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348652AbiAGSRO (ORCPT ); Fri, 7 Jan 2022 13:17:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641579434; x=1673115434; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9/oc4uSgCNtnv2c/B9c+saZT9CM1u3xvpSgmLVzCdFk=; b=BxHECgdEICZ0TcWtVDAL+cm9nlE2TIKMGYxd8FwEWx3ZhCrdI0att7MK jymIXCEtvkKYxHY3DTFJn+Qdw/HhGU7SeMhrOedOClFeozWtCQFNrKRAk B5U4aX0nY1lBDuGjWB3k/BAzUxnUclp7q1h0OfnmXiVnoM3peWVUDstPu TPwnr2QoETc/1dTJvsOVdGkgcCx3ox8L16SCzT0AA1himsTdMZoVJjeis d4mEfOngutzIcqBxQn7pwxkgqON4rj+fTjEBNiw6/qoo0wPNBA7hNybkA FjxRa0FLRluW0g6WQ4wV8YHmUyYRg4p187WZQzWIueGgjxgL9M9IASXP1 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10219"; a="242864369" X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="242864369" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 10:17:14 -0800 X-IronPort-AV: E=Sophos;i="5.88,270,1635231600"; d="scan'208";a="622009690" Received: from kcaccard-mobl.amr.corp.intel.com (HELO kcaccard-mobl1.jf.intel.com) ([10.212.25.179]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2022 10:17:13 -0800 From: Kristen Carlson Accardi To: linux-sgx@vger.kernel.org, Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" Cc: linux-kernel@vger.kernel.org, Kristen Carlson Accardi Subject: [PATCH v2 2/2] x86/sgx: account backing pages Date: Fri, 7 Jan 2022 10:16:17 -0800 Message-Id: <20220107181618.6597-3-kristen@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220107181618.6597-1-kristen@linux.intel.com> References: <20220107181618.6597-1-kristen@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org SGX may allow EPC pages to be overcommitted. If the system is out of enclave memory, EPC pages are swapped to normal RAM via a per enclave shared memory area. This shared memory is not charged to the enclave or the task mapping it, making it hard to account for using normal methods. In order to avoid unlimited usage of normal RAM, enclaves must be charged for each new page used for backing storage, and uncharged when they are no longer using a backing page. Modify the existing flow for requesting backing pages to reduce the available backing page counter and confirm that the limit has not been exceeded. Backing page usage for loading EPC pages back out of the shared memory do not incur a charge. When a backing page is released from usage, increment the available backing page counter. When swapping EPC pages to RAM, in addition to storing the page contents, SGX must store some additional metadata to protect against a malicious kernel when the page is swapped back in. This additional metadata is called Paging Crypto MetaData. PCMD is allocated from the same shared memory area as the backing page contents and consumes RAM the same way. PCMD is 128 bytes in size, and there is one PCMD structure per page written to shared RAM. The page index for the PCMD page is calculated from the page index of the backing page, so it is possible that the PCMD structures are not packed into the minimum number of pages possible. If 32 PCMDs can fit onto a single page, then PCMD usage is 1/32 of total EPC pages. In the worst case, PCMD can consume the same amount of RAM as EPC backing pages (1:1). For simplicity, this implementation does not account for PCMD page usage. Signed-off-by: Kristen Carlson Accardi --- arch/x86/kernel/cpu/sgx/encl.c | 76 ++++++++++++++++++++++++++++++++-- arch/x86/kernel/cpu/sgx/encl.h | 6 ++- arch/x86/kernel/cpu/sgx/main.c | 6 +-- 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/encl.c b/arch/x86/kernel/cpu/sgx/encl.c index 001808e3901c..8be6f0592bdc 100644 --- a/arch/x86/kernel/cpu/sgx/encl.c +++ b/arch/x86/kernel/cpu/sgx/encl.c @@ -32,7 +32,7 @@ static int __sgx_encl_eldu(struct sgx_encl_page *encl_page, else page_index = PFN_DOWN(encl->size); - ret = sgx_encl_get_backing(encl, page_index, &b); + ret = sgx_encl_lookup_backing(encl, page_index, &b); if (ret) return ret; @@ -407,6 +407,12 @@ void sgx_encl_release(struct kref *ref) sgx_encl_free_epc_page(entry->epc_page); encl->secs_child_cnt--; entry->epc_page = NULL; + } else { + /* + * If there is no epc_page, it means it has been + * swapped out. Uncharge the backing storage. + */ + sgx_uncharge_mem(); } kfree(entry); @@ -574,8 +580,8 @@ static struct page *sgx_encl_get_backing_page(struct sgx_encl *encl, * 0 on success, * -errno otherwise. */ -int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, - struct sgx_backing *backing) +static int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, + struct sgx_backing *backing) { pgoff_t pcmd_index = PFN_DOWN(encl->size) + 1 + (page_index >> 5); struct page *contents; @@ -601,6 +607,62 @@ int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, return 0; } +/** + * sgx_encl_alloc_backing() - allocate a new backing storage page + * @encl: an enclave pointer + * @page_index: enclave page index + * @backing: data for accessing backing storage for the page + * + * Confirm that the global overcommit limit has not been reached before + * requesting a new backing storage page for storing the encrypted contents + * and Paging Crypto MetaData (PCMD) of an enclave page. This is called when + * there is no existing backing page, just before writing to the backing + * storage with EWB. + * + * Return: + * 0 on success, + * -errno otherwise. + */ +int sgx_encl_alloc_backing(struct sgx_encl *encl, unsigned long page_index, + struct sgx_backing *backing) +{ + int ret; + + if (sgx_charge_mem()) + return -ENOMEM; + + ret = sgx_encl_get_backing(encl, page_index, backing); + if (ret) + sgx_uncharge_mem(); + + return ret; +} + +/** + * sgx_encl_lookup_backing() - retrieve an existing backing storage page + * @encl: an enclave pointer + * @page_index: enclave page index + * @backing: data for accessing backing storage for the page + * + * Retrieve a backing page for loading data back into an EPC page with ELDU. + * This call does not cause a charge to the overcommit limit because a page + * has already been allocated, but has been swapped out or is in RAM + * + * It is the caller's responsibility to ensure that it is appropriate to + * use sgx_encl_lookup_backing() rather than sgx_encl_alloc_backing(). If + * lookup is not used correctly, this will cause an allocation that is + * not accounted for. + * + * Return: + * 0 on success, + * -errno otherwise. + */ +int sgx_encl_lookup_backing(struct sgx_encl *encl, unsigned long page_index, + struct sgx_backing *backing) +{ + return sgx_encl_get_backing(encl, page_index, backing); +} + /** * sgx_encl_put_backing() - Unpin the backing storage * @backing: data for accessing backing storage for the page @@ -608,9 +670,17 @@ int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, */ void sgx_encl_put_backing(struct sgx_backing *backing, bool do_write) { + /* + * If the page is being written to by the reclaimer, it is + * still in use and the backing page usage should not be + * uncharged. However, if the page is not being written to, + * it is no longer in use and may be uncharged. + */ if (do_write) { set_page_dirty(backing->pcmd); set_page_dirty(backing->contents); + } else { + sgx_uncharge_mem(); } put_page(backing->pcmd); diff --git a/arch/x86/kernel/cpu/sgx/encl.h b/arch/x86/kernel/cpu/sgx/encl.h index fec43ca65065..8ffb8a83263f 100644 --- a/arch/x86/kernel/cpu/sgx/encl.h +++ b/arch/x86/kernel/cpu/sgx/encl.h @@ -105,8 +105,10 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start, void sgx_encl_release(struct kref *ref); int sgx_encl_mm_add(struct sgx_encl *encl, struct mm_struct *mm); -int sgx_encl_get_backing(struct sgx_encl *encl, unsigned long page_index, - struct sgx_backing *backing); +int sgx_encl_alloc_backing(struct sgx_encl *encl, unsigned long page_index, + struct sgx_backing *backing); +int sgx_encl_lookup_backing(struct sgx_encl *encl, unsigned long page_index, + struct sgx_backing *backing); void sgx_encl_put_backing(struct sgx_backing *backing, bool do_write); int sgx_encl_test_and_clear_young(struct mm_struct *mm, struct sgx_encl_page *page); diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 8a7bfe0d9023..20ccd9c5b184 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -347,8 +347,8 @@ static void sgx_reclaimer_write(struct sgx_epc_page *epc_page, encl->secs_child_cnt--; if (!encl->secs_child_cnt && test_bit(SGX_ENCL_INITIALIZED, &encl->flags)) { - ret = sgx_encl_get_backing(encl, PFN_DOWN(encl->size), - &secs_backing); + ret = sgx_encl_alloc_backing(encl, PFN_DOWN(encl->size), + &secs_backing); if (ret) goto out; @@ -418,7 +418,7 @@ static void sgx_reclaim_pages(void) goto skip; page_index = PFN_DOWN(encl_page->desc - encl_page->encl->base); - ret = sgx_encl_get_backing(encl_page->encl, page_index, &backing[i]); + ret = sgx_encl_alloc_backing(encl_page->encl, page_index, &backing[i]); if (ret) goto skip;