From: Jarkko Sakkinen <jarkko@kernel.org>
To: linux-sgx@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] x86/sgx: Add sgx_nr_{all, free}_pages to the debugfs
Date: Thu, 1 Apr 2021 08:21:14 +0300 [thread overview]
Message-ID: <20210401052114.697432-2-jarkko@kernel.org> (raw)
In-Reply-To: <20210401052114.697432-1-jarkko@kernel.org>
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
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
arch/x86/kernel/cpu/sgx/main.c | 53 +++++++++++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 7df7048cb1c9..190c96735c9f 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/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:
--
2.31.1
next prev parent reply other threads:[~2021-04-01 5:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 5:21 [PATCH 1/2] x86/sgx: Do not update sgx_nr_free_pages in sgx_setup_epc_section() Jarkko Sakkinen
2021-04-01 5:21 ` Jarkko Sakkinen [this message]
2021-04-01 19:32 ` [PATCH 2/2] x86/sgx: Add sgx_nr_{all, free}_pages to the debugfs Dave Hansen
2021-04-04 15:53 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210401052114.697432-2-jarkko@kernel.org \
--to=jarkko@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox