From: Zhiquan Li <zhiquan1.li@intel.com>
To: linux-sgx@vger.kernel.org, tony.luck@intel.com
Cc: jarkko@kernel.org, dave.hansen@linux.intel.com,
seanjc@google.com, fan.du@intel.com, zhiquan1.li@intel.com
Subject: [PATCH 3/4] x86/sgx: Fine grained SGX MCA behavior for virtualization
Date: Tue, 10 May 2022 11:17:48 +0800 [thread overview]
Message-ID: <20220510031748.3181459-1-zhiquan1.li@intel.com> (raw)
When VM guest access a SGX EPC page with memory failure, current
behavior will kill the guest, expected only kill the SGX application
inside it.
To fix it we send SIGBUS with code BUS_MCEERR_AR and some extra
information for hypervisor to inject #MC information to guest, which is
helpful in SGX case.
Signed-off-by: Zhiquan Li <zhiquan1.li@intel.com>
---
arch/x86/kernel/cpu/sgx/main.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 8e4bc6453d26..81801ab0009e 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -710,6 +710,8 @@ int arch_memory_failure(unsigned long pfn, int flags)
struct sgx_epc_page *page = sgx_paddr_to_page(pfn << PAGE_SHIFT);
struct sgx_epc_section *section;
struct sgx_numa_node *node;
+ struct sgx_vepc_page *owner;
+ int ret = 0;
/*
* mm/memory-failure.c calls this routine for all errors
@@ -726,8 +728,22 @@ int arch_memory_failure(unsigned long pfn, int flags)
* error. The signal may help the task understand why the
* enclave is broken.
*/
- if (flags & MF_ACTION_REQUIRED)
- force_sig(SIGBUS);
+ if (flags & MF_ACTION_REQUIRED) {
+ /*
+ * In case the error memory is accessed by VM guest, provide
+ * extra info for hypervisor to make further decision but not
+ * simply kill it.
+ */
+ if (page->flags & SGX_EPC_PAGE_IS_VEPC) {
+ owner = (struct sgx_vepc_page *)page->owner;
+ ret = force_sig_mceerr(BUS_MCEERR_AR, (void __user *)owner->vaddr,
+ PAGE_SHIFT);
+ if (ret < 0)
+ pr_err("Memory failure: Error sending signal to %s:%d: %d\n",
+ current->comm, current->pid, ret);
+ } else
+ force_sig(SIGBUS);
+ }
section = &sgx_epc_sections[page->section];
node = section->node;
--
2.25.1
next reply other threads:[~2022-05-10 3:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-10 3:17 Zhiquan Li [this message]
2022-05-11 23:33 ` [PATCH 3/4] x86/sgx: Fine grained SGX MCA behavior for virtualization Kai Huang
2022-05-12 2:19 ` Zhiquan Li
2022-05-12 3:27 ` Kai Huang
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=20220510031748.3181459-1-zhiquan1.li@intel.com \
--to=zhiquan1.li@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=fan.du@intel.com \
--cc=jarkko@kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=seanjc@google.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).