| Message ID | 086aa5a16faf0d9b47ba9e0ebd2213713d0e76ff.1631731214.git.reinette.chatre@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/sgx: Oversubscription, page permission, thread entry | expand |
On Wed, 2021-09-15 at 13:30 -0700, Reinette Chatre wrote: > From: Jarkko Sakkinen <jarkko@kernel.org> > > 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. > > 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. > > To run in a reasonable amount of time, the selftest needs to know how > much EPC there is in the system. > > Introduce a new debugfs file to export that information. > > Acked-by: Dave Hansen <dave.hansen@linux.intel.com> > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > [reinette: Use as placeholder patch until other discussions complete] > Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> This could be replaced with the following two patches: https://lore.kernel.org/linux-sgx/20210914030422.377601-1-jarkko@kernel.org/T/#t I forgot to CC this to you when I sent it, sorry about that. /Jarkko
Hi Jarkko, On 9/16/2021 7:09 AM, Jarkko Sakkinen wrote: > On Wed, 2021-09-15 at 13:30 -0700, Reinette Chatre wrote: >> From: Jarkko Sakkinen <jarkko@kernel.org> >> >> 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. >> >> 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. >> >> To run in a reasonable amount of time, the selftest needs to know how >> much EPC there is in the system. >> >> Introduce a new debugfs file to export that information. >> >> Acked-by: Dave Hansen <dave.hansen@linux.intel.com> >> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> >> [reinette: Use as placeholder patch until other discussions complete] >> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> > > This could be replaced with the following two patches: > > https://lore.kernel.org/linux-sgx/20210914030422.377601-1-jarkko@kernel.org/T/#t > Thank you very much. I will replace this patch and update the kselftest changes to use the information from the new source. Reinette
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..b65da19a53ee 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2016-20 Intel Corporation. */ +#include <linux/debugfs.h> #include <linux/file.h> #include <linux/freezer.h> #include <linux/highmem.h> @@ -28,7 +29,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 +660,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; } @@ -823,6 +829,8 @@ static int __init sgx_init(void) if (sgx_vepc_init() && ret) goto err_provision; + debugfs_create_ulong("sgx_total_mem", 0444, arch_debugfs_dir, &sgx_total_mem); + return 0; err_provision: