x86/sgx: Do not update sgx_nr_free_pages in sgx_setup_epc_section()
Jarkko Sakkinen
maintainerPATCH 1/2 x86/sgx: Do not update sgx_nr_free_pages in sgx_setup_epc_section()
Now that the sanitization process will make pages available by calling sgx_free_epc_page(), sgx_setup_epc_section() should not touch to sgx_nr_free_pages. This will result sgx_nr_free_pages to contain 2x the number of actual free pages. Simply, remove the statement.
--- arch/x86/kernel/cpu/sgx/main.c | 1 - 1 file changed, 1 deletion(-)
arch/x86/kernel/cpu/sgx/main.c +0 -1
@@ -657,7 +657,6 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size,list_add_tail (§ion->pages[i].list, &sgx_dirty_page_list); } - sgx_nr_free_pages += nr_pages;return true; }
Signature · 1 line
2.31.1
Jarkko Sakkinen
maintainerPATCH 2/2 x86/sgx: Add sgx_nr_{all, free}_pages to the debugfs
Add two debugs attributes:
* /sys/kernel/debug/x86/sgx_nr_all_pages
* /sys/kernel/debug/x86/sgx_nr_free_pages
These provide useful statistics for testing purposes.
E.g. on a NUC7CJYH2, when no enclaves are running, and EPC set to 32 MB:
$ sudo cat /sys/kernel/debug/x86/sgx_nr_all_pages 5632
$ sudo cat /sys/kernel/debug/x86/sgx_nr_free_pages 5632
--- arch/x86/kernel/cpu/sgx/main.c | 53 +++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/main.c +52 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2016-20 Intel Corporation. */ +#include <linux/debugfs.h> #include <linux/freezer.h> #include <linux/highmem.h> #include <linux/kthread.h>
@@ -25,7 +26,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. */ +/* The number of EPC pages in total in all nodes. */ +static unsigned long sgx_nr_all_pages; + +/* The number of free EPC pages in all nodes. */ static unsigned long sgx_nr_free_pages;/* Nodes with one or more EPC sections. */
@@ -657,6 +661,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_nr_all_pages += nr_pages; +return true; }
@@ -730,6 +736,44 @@ static bool __init sgx_page_cache_init(void)return true; } +#ifdef CONFIG_DEBUG_FS +static ssize_t sgx_nr_all_pages_read (struct file *file,char __user *user_buf, +size_t count,loff_t *pos) +{ +char kernel_buf[32 ]; +int len; + + len =snprintf (kernel_buf,sizeof (kernel_buf),"%lu\n" , sgx_nr_all_pages); +if (len <0 ) +return len; + +return simple_read_from_buffer (user_buf, count, pos, kernel_buf, len); +} + +static const struct file_operations sgx_nr_all_pages_fops = { + .read = sgx_nr_all_pages_read, + .llseek = default_llseek, +}; + +static ssize_t sgx_nr_free_pages_read (struct file *file,char __user *user_buf, +size_t count,loff_t *pos) +{ +char kernel_buf[32 ]; +int len; + + len =snprintf (kernel_buf,sizeof (kernel_buf),"%lu\n" , sgx_nr_free_pages); +if (len <0 ) +return len; + +return simple_read_from_buffer (user_buf, count, pos, kernel_buf, len); +} + +static const struct file_operations sgx_nr_free_pages_fops = { + .read = sgx_nr_free_pages_read, + .llseek = default_llseek, +}; +#endif /* CONFIG_DEBUG_FS */ +static int __init sgx_init (void ) {int ret;
@@ -750,6 +794,13 @@ static int __init sgx_init(void)if (ret) goto err_kthread; +#ifdef CONFIG_DEBUG_FS +debugfs_create_file ("sgx_nr_all_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_all_pages_fops); +debugfs_create_file ("sgx_nr_free_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_free_pages_fops); +#endif /* CONFIG_DEBUG_FS */ +return 0 ; err_kthread:
Signature · 1 line
2.31.1
Re: [PATCH 2/2] x86/sgx: Add sgx_nr_{all, free}_pages to the debugfs
arch/x86/kernel/cpu/sgx/main.c static int __init sgx_init(void) · line 802
Quoted 6 lines · Jarkko Sakkinen
arch/x86/kernel/cpu/sgx/main.c +6
-0+#ifdef CONFIG_DEBUG_FS +debugfs_create_file ("sgx_nr_all_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_all_pages_fops); +debugfs_create_file ("sgx_nr_free_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_free_pages_fops); +#endif /* CONFIG_DEBUG_FS */
Why not make the types u64's and use debugfs_create_u64()? That would save a ton of code. There's also debugfs_create_ulong().
Jarkko Sakkinen
maintainerRe: [PATCH 2/2] x86/sgx: Add sgx_nr_{all, free}_pages to the debugfs
Quoted 11 lines · Dave Hansen
arch/x86/kernel/cpu/sgx/main.c static int __init sgx_init(void) · line 802
Quoted 6 lines · Jarkko Sakkinen
arch/x86/kernel/cpu/sgx/main.c +6
-0+#ifdef CONFIG_DEBUG_FS +debugfs_create_file ("sgx_nr_all_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_all_pages_fops); +debugfs_create_file ("sgx_nr_free_pages" ,0400 , arch_debugfs_dir,NULL , + &sgx_nr_free_pages_fops); +#endif /* CONFIG_DEBUG_FS */ Why not make the types u64's and use
debugfs_create_u64()? That would save a ton of code. There's alsodebugfs_create_ulong().
Because I was not aware of that. For sure can be used.
/Jarkko