From patchwork Wed Aug 11 02:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 12429731 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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 66054C4338F for ; Wed, 11 Aug 2021 02:04:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3779660184 for ; Wed, 11 Aug 2021 02:04:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbhHKCFG (ORCPT ); Tue, 10 Aug 2021 22:05:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:47556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231233AbhHKCFF (ORCPT ); Tue, 10 Aug 2021 22:05:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E2A560EB7; Wed, 11 Aug 2021 02:04:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628647483; bh=SOH2wGZPiLDp1Yl2HTSZOwxb0OtH+EHP0MXr5/3uu6w=; h=From:To:Cc:Subject:Date:From; b=Ty8FIZ6co3IBstco9Wi+djRHa1mrLIfFH7JoVf9UanQwHK4+lEpKSNbOFQ2XPfKnh DN2Cl0LLlqELLjyFC5Z48h/KLXYD+Fsd7fcLD9paooi7g9KC9+eeqWMew0caQVuB4z jtKKP3UtPcofh/A7JwFASJmWn5fjsaDuOKcV6UCsgXQPxLQTwCraEdo2hqx+mTrmF5 2/o0UomgAQgNz7yaHzMDnRIZl4ZYtWL5NntXY55qxRTO5RfiVND7tbvJS7z2YYMFyk Hs1DiiR/eBonT+pZW9v89aLt+7IHjXdQtP94/vXkis+BAJezAPnc512S1nU+MIBXR1 naQXP1wndc+5w== From: Jarkko Sakkinen To: linux-sgx@vger.kernel.org Cc: Reinette Chatre , Borislav Petkov , Jarkko Sakkinen , Dave Hansen , Thomas Gleixner , Ingo Molnar , x86@kernel.org, "H. Peter Anvin" , Jonathan Corbet , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org Subject: [PATCH RFC] x86/sgx: Add a read-only sysctl attribute kernel.sgx.total_mem Date: Wed, 11 Aug 2021 05:04:38 +0300 Message-Id: <20210811020438.849688-1-jarkko@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org The amount of EPC on the system is determined by the BIOS and it varies wildly between systems. It can be dozens of MB on desktops, or many GB on servers. Introduce a read-only sysctl attribute kernel.sgx_total_mem, which provides the amount of EPC memory available in the system. The primary use case for this attribute are stress tests. Just like normal memory, SGX memory can be overcommitted. SGX has its own reclaim mechanism which kicks in when physical SGX memory (Enclave Page Cache / EPC) is exhausted. That reclaim mechanism is relatively rarely exercised and needs selftests to poke at it. To run in a reasonable amount of time, the selftest needs to know how much EPC there is in the system. Using a sysctl attribute makes most sense, given that its meaning is shared with the SGX driver and KVM. It must be available even when the driver is disabled. Acked-by: Dave Hansen Signed-off-by: Jarkko Sakkinen --- Documentation/x86/sgx.rst | 6 +++++ arch/x86/kernel/cpu/sgx/main.c | 40 ++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Documentation/x86/sgx.rst b/Documentation/x86/sgx.rst index dd0ac96ff9ef..f11bfb331b93 100644 --- a/Documentation/x86/sgx.rst +++ b/Documentation/x86/sgx.rst @@ -250,3 +250,9 @@ user wants to deploy SGX applications both on the host and in guests on the same machine, the user should reserve enough EPC (by taking out total virtual EPC size of all SGX VMs from the physical EPC size) for host SGX applications so they can run with acceptable performance. + +Debugging +========= + +*/sys/kernel/debug/x86/sgx_total_mem* contains an integer describing +the total SGX reserved memory in bytes, available in the system. diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 63d3de02bbcc..c857253a2e5d 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -28,7 +28,10 @@ static DECLARE_WAIT_QUEUE_HEAD(ksgxd_waitq); static LIST_HEAD(sgx_active_page_list); static DEFINE_SPINLOCK(sgx_reclaimer_lock); -/* The free page list lock protected variables prepend the lock. */ +/* Total EPC memory available in bytes. */ +static unsigned long sgx_total_mem; + +/* The number of free EPC pages in all nodes. */ static unsigned long sgx_nr_free_pages; /* Nodes with one or more EPC sections. */ @@ -656,6 +659,8 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size, list_add_tail(§ion->pages[i].list, &sgx_dirty_page_list); } + sgx_total_mem += nr_pages * PAGE_SIZE; + return true; } @@ -790,8 +795,30 @@ int sgx_set_attribute(unsigned long *allowed_attributes, } EXPORT_SYMBOL_GPL(sgx_set_attribute); +static struct ctl_path sgx_sysctl_path[] = { + { .procname = "kernel", }, + { .procname = "sgx", }, + { } +}; + +static unsigned long sgx_total_mem_max = ~0UL; + +static struct ctl_table sgx_sysctl_table[] = { + { + .procname = "total_mem", + .data = &sgx_total_mem, + .maxlen = sizeof(unsigned long), + .mode = 0444, + .proc_handler = proc_doulongvec_minmax, + .extra1 = SYSCTL_ZERO, /* min */ + .extra2 = &sgx_total_mem_max, /* max */ + }, + { } +}; + static int __init sgx_init(void) { + struct ctl_table_header *sysctl_table_header; int ret; int i; @@ -810,6 +837,12 @@ static int __init sgx_init(void) if (ret) goto err_kthread; + sysctl_table_header = register_sysctl_paths(sgx_sysctl_path, sgx_sysctl_table); + if (!sysctl_table_header) { + pr_err("sysctl registration failed.\n"); + goto err_provision; + } + /* * Always try to initialize the native *and* KVM drivers. * The KVM driver is less picky than the native one and @@ -821,10 +854,13 @@ static int __init sgx_init(void) ret = sgx_drv_init(); if (sgx_vepc_init() && ret) - goto err_provision; + goto err_sysctl; return 0; +err_sysctl: + unregister_sysctl_table(sysctl_table_header); + err_provision: misc_deregister(&sgx_dev_provision);