From: Kai Huang <kai.huang@intel.com>
To: linux-sgx@vger.kernel.org
Cc: dave.hansen@linux.intel.com, jarkko@kernel.org,
tony.luck@intel.com, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] x86/sgx: Only run the reclaimer when the native SGX driver is enabled
Date: Tue, 4 Oct 2022 11:04:28 +1300 [thread overview]
Message-ID: <0dd24e5549bbdee8580c2495f1df93798aadfd11.1664834225.git.kai.huang@intel.com> (raw)
In-Reply-To: <cover.1664834225.git.kai.huang@intel.com>
Currently the EPC pages assigned to KVM guests cannot be reclaimed, so
there's no point to run the reclaimer when the native SGX driver is not
enabled.
Add a function to indicate whether the native SGX driver has been
initialized, and in ksgxd(), avoid running the reclaimer when it is
false.
In sgx_drv_init(), move the register of "/dev/sgx_enclave" misc device
before initializing sgx_attributes_reserved_mask (and the other two
masks) so that the new function can just use it to determine whether the
SGX driver has been initialized w/o introducing a new boolean.
Signed-off-by: Kai Huang <kai.huang@intel.com>
---
arch/x86/kernel/cpu/sgx/driver.c | 13 +++++++++----
arch/x86/kernel/cpu/sgx/driver.h | 1 +
arch/x86/kernel/cpu/sgx/main.c | 11 ++++++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver.c b/arch/x86/kernel/cpu/sgx/driver.c
index aa9b8b868867..b5e754632eed 100644
--- a/arch/x86/kernel/cpu/sgx/driver.c
+++ b/arch/x86/kernel/cpu/sgx/driver.c
@@ -160,6 +160,10 @@ int __init sgx_drv_init(void)
return -ENODEV;
}
+ ret = misc_register(&sgx_dev_enclave);
+ if (ret)
+ return ret;
+
sgx_misc_reserved_mask = ~ebx | SGX_MISC_RESERVED_MASK;
cpuid_count(SGX_CPUID, 1, &eax, &ebx, &ecx, &edx);
@@ -172,9 +176,10 @@ int __init sgx_drv_init(void)
sgx_xfrm_reserved_mask = ~xfrm_mask;
}
- ret = misc_register(&sgx_dev_enclave);
- if (ret)
- return ret;
-
return 0;
}
+
+bool sgx_drv_inited(void)
+{
+ return !!sgx_attributes_reserved_mask;
+}
diff --git a/arch/x86/kernel/cpu/sgx/driver.h b/arch/x86/kernel/cpu/sgx/driver.h
index 4eddb4d571ef..159cc066e9cb 100644
--- a/arch/x86/kernel/cpu/sgx/driver.h
+++ b/arch/x86/kernel/cpu/sgx/driver.h
@@ -25,5 +25,6 @@ extern const struct file_operations sgx_provision_fops;
long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);
int sgx_drv_init(void);
+bool sgx_drv_inited(void);
#endif /* __ARCH_X86_SGX_DRIVER_H__ */
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 713ca09f6d6e..0fdbc490b0f8 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -403,6 +403,14 @@ static int ksgxd(void *p)
__sgx_sanitize_pages(&sgx_dirty_page_list);
WARN_ON(__sgx_sanitize_pages(&sgx_dirty_page_list));
+ /*
+ * EPC pages assigned to KVM guests cannot be reclaimed. There's
+ * no reason to run the reclaimer if the native SGX driver isn't
+ * initialized successfully (i.e. on the machines w/o SGX_LC).
+ */
+ if (!sgx_drv_inited())
+ return 0;
+
while (!kthread_should_stop()) {
if (try_to_freeze())
continue;
@@ -940,7 +948,8 @@ static int __init sgx_init(void)
ksgxd_tsk = NULL;
__sgx_sanitize_pages(&sgx_dirty_page_list);
WARN_ON(__sgx_sanitize_pages(&sgx_dirty_page_list));
- pr_info("Running SGX w/o EPC page reclaimer.\n");
+ if (sgx_drv_inited())
+ pr_info("Running native SGX driver w/o EPC page reclaimer.\n");
}
return 0;
--
2.37.1
next prev parent reply other threads:[~2022-10-03 22:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-03 22:04 [PATCH 0/3] Minor improvements to sgx_init() Kai Huang
2022-10-03 22:04 ` [PATCH 1/3] x86/sgx: Start the ksgxd() at the end of sgx_init() Kai Huang
2022-10-03 22:04 ` Kai Huang [this message]
2022-10-03 22:04 ` [RESEND PATCH 3/3] x86/sgx: Add xa_store_range() return value check in sgx_setup_epc_section() Kai Huang
2022-10-04 22:21 ` Jarkko Sakkinen
2022-10-04 22:42 ` Huang, Kai
2022-11-01 2:41 ` Huang, Kai
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=0dd24e5549bbdee8580c2495f1df93798aadfd11.1664834225.git.kai.huang@intel.com \
--to=kai.huang@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=tony.luck@intel.com \
/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
all inboxes | Powered by JetHome®