From: Tony Luck <tony.luck@intel.com>
To: Sean Christopherson <seanjc@google.com>,
Jarkko Sakkinen <jarkko@kernel.org>,
Dave Hansen <dave.hansen@intel.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Tony Luck <tony.luck@intel.com>
Subject: [PATCH v3 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages
Date: Wed, 28 Jul 2021 13:46:48 -0700 [thread overview]
Message-ID: <20210728204653.1509010-3-tony.luck@intel.com> (raw)
In-Reply-To: <20210728204653.1509010-1-tony.luck@intel.com>
X86 machine check architecture reports a physical address when there
is a memory error. Handling that error requires a method to determine
whether the physical address reported is in any of the areas reserved
for EPC pages by BIOS.
Add an end_phys_addr field to the sgx_epc_section structure and a
new function sgx_paddr_to_page() that searches all such structures
and returns the struct sgx_epc_page pointer if the address is an EPC
page. This function is only intended for use within SGX code.
Export a function sgx_is_epc_page() that simply reports whether an
address is an EPC page for use elsewhere in the kernel.
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
arch/x86/kernel/cpu/sgx/main.c | 24 ++++++++++++++++++++++++
arch/x86/kernel/cpu/sgx/sgx.h | 1 +
2 files changed, 25 insertions(+)
diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 17d09186a6c2..ce40c010c9cb 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -649,6 +649,7 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size,
}
section->phys_addr = phys_addr;
+ section->end_phys_addr = phys_addr + size - 1;
for (i = 0; i < nr_pages; i++) {
section->pages[i].section = index;
@@ -660,6 +661,29 @@ static bool __init sgx_setup_epc_section(u64 phys_addr, u64 size,
return true;
}
+static struct sgx_epc_page *sgx_paddr_to_page(u64 paddr)
+{
+ struct sgx_epc_section *section;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(sgx_epc_sections); i++) {
+ section = &sgx_epc_sections[i];
+
+ if (paddr < section->phys_addr || paddr > section->end_phys_addr)
+ continue;
+
+ return §ion->pages[PFN_DOWN(paddr - section->phys_addr)];
+ }
+
+ return NULL;
+}
+
+bool sgx_is_epc_page(u64 paddr)
+{
+ return !!sgx_paddr_to_page(paddr);
+}
+EXPORT_SYMBOL_GPL(sgx_is_epc_page);
+
/**
* A section metric is concatenated in a way that @low bits 12-31 define the
* bits 12-31 of the metric and @high bits 0-19 define the bits 32-51 of the
diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h
index 4e1a410b8a62..226b081a4d05 100644
--- a/arch/x86/kernel/cpu/sgx/sgx.h
+++ b/arch/x86/kernel/cpu/sgx/sgx.h
@@ -50,6 +50,7 @@ struct sgx_numa_node {
*/
struct sgx_epc_section {
unsigned long phys_addr;
+ unsigned long end_phys_addr;
void *virt_addr;
struct sgx_epc_page *pages;
struct sgx_numa_node *node;
--
2.29.2
next prev parent reply other threads:[~2021-07-28 20:47 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 18:14 [PATCH 0/4] Basic recovery for machine checks inside SGX Tony Luck
2021-07-08 18:14 ` [PATCH 1/4] x86/sgx: Track phase and type of SGX EPC pages Tony Luck
2021-07-09 18:08 ` Jarkko Sakkinen
2021-07-09 18:09 ` Jarkko Sakkinen
2021-07-14 20:42 ` Reinette Chatre
2021-07-14 20:59 ` Luck, Tony
2021-07-14 21:21 ` Reinette Chatre
2021-07-14 23:08 ` Sean Christopherson
2021-07-14 23:39 ` Luck, Tony
2021-07-15 15:33 ` Sean Christopherson
2021-07-08 18:14 ` [PATCH 2/4] x86/sgx: Add basic infrastructure to recover from errors in SGX memory Tony Luck
2021-07-08 18:14 ` [PATCH 3/4] x86/sgx: Hook sgx_memory_failure() into mainline code Tony Luck
2021-07-08 18:14 ` [PATCH 4/4] x86/sgx: Add hook to error injection address validation Tony Luck
2021-07-19 18:20 ` [PATCH v2 0/6] Basic recovery for machine checks inside SGX Tony Luck
2021-07-19 18:20 ` [PATCH v2 1/6] x86/sgx: Provide indication of life-cycle of EPC pages Tony Luck
2021-07-19 18:28 ` Dave Hansen
2021-07-27 2:04 ` Sakkinen, Jarkko
2021-07-19 18:20 ` [PATCH v2 2/6] x86/sgx: Add infrastructure to identify SGX " Tony Luck
2021-07-19 18:20 ` [PATCH v2 3/6] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-07-27 2:08 ` Sakkinen, Jarkko
2021-07-19 18:20 ` [PATCH v2 4/6] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-07-19 18:20 ` [PATCH v2 5/6] x86/sgx: Hook sgx_memory_failure() into mainline code Tony Luck
2021-07-19 18:20 ` [PATCH v2 6/6] x86/sgx: Add hook to error injection address validation Tony Luck
2021-07-27 1:54 ` [PATCH v2 0/6] Basic recovery for machine checks inside SGX Sakkinen, Jarkko
2021-07-28 20:46 ` [PATCH v3 0/7] " Tony Luck
2021-07-28 20:46 ` [PATCH v3 1/7] x86/sgx: Provide indication of life-cycle of EPC pages Tony Luck
2021-07-28 22:12 ` Dave Hansen
2021-07-28 22:57 ` Luck, Tony
2021-07-28 23:12 ` Dave Hansen
2021-07-28 23:32 ` Sean Christopherson
2021-07-28 23:48 ` Luck, Tony
2021-07-29 0:07 ` Sean Christopherson
2021-07-29 0:42 ` Luck, Tony
2021-07-30 0:34 ` Jarkko Sakkinen
2021-07-30 0:33 ` Jarkko Sakkinen
2021-07-28 20:46 ` Tony Luck [this message]
2021-07-28 22:19 ` [PATCH v3 2/7] x86/sgx: Add infrastructure to identify SGX " Dave Hansen
2021-07-30 0:38 ` Jarkko Sakkinen
2021-07-30 16:46 ` Sean Christopherson
2021-07-30 16:50 ` Dave Hansen
2021-07-30 18:44 ` Luck, Tony
2021-07-30 20:35 ` Dave Hansen
2021-07-30 23:35 ` Luck, Tony
2021-08-03 21:34 ` Matthew Wilcox
2021-08-03 23:49 ` Luck, Tony
2021-08-02 8:52 ` Jarkko Sakkinen
2021-08-02 8:51 ` Jarkko Sakkinen
2021-08-02 8:48 ` Jarkko Sakkinen
2021-07-28 20:46 ` [PATCH v3 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-07-30 0:42 ` Jarkko Sakkinen
2021-07-28 20:46 ` [PATCH v3 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-07-28 22:29 ` Dave Hansen
2021-07-28 23:00 ` Sean Christopherson
2021-07-28 20:46 ` [PATCH v3 5/7] x86/sgx: Hook sgx_memory_failure() into mainline code Tony Luck
2021-07-28 20:46 ` [PATCH v3 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-07-28 20:46 ` [PATCH v3 7/7] x86/sgx: Add documentation for SGX memory errors Tony Luck
2021-08-27 19:55 ` [PATCH v4 0/6] Basic recovery for machine checks inside SGX Tony Luck
2021-08-27 19:55 ` [PATCH v4 1/6] x86/sgx: Provide indication of life-cycle of EPC pages Tony Luck
2021-09-01 3:55 ` Jarkko Sakkinen
2021-08-27 19:55 ` [PATCH v4 2/6] x86/sgx: Add infrastructure to identify SGX " Tony Luck
2021-09-01 4:30 ` Jarkko Sakkinen
2021-08-27 19:55 ` [PATCH v4 3/6] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-08-27 19:55 ` [PATCH v4 4/6] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-08-27 19:55 ` [PATCH v4 5/6] x86/sgx: Hook sgx_memory_failure() into mainline code Tony Luck
2021-09-03 6:12 ` Jarkko Sakkinen
2021-09-03 6:56 ` Jarkko Sakkinen
2021-09-06 18:51 ` Luck, Tony
2021-09-07 14:07 ` Jarkko Sakkinen
2021-09-07 14:13 ` Dave Hansen
2021-09-07 15:07 ` Luck, Tony
2021-09-07 15:03 ` Luck, Tony
2021-09-07 15:08 ` Jarkko Sakkinen
2021-09-07 17:46 ` Luck, Tony
2021-09-08 0:59 ` Luck, Tony
2021-09-08 16:49 ` Dave Hansen
2021-09-08 2:29 ` Jarkko Sakkinen
2021-08-27 19:55 ` [PATCH v4 6/6] x86/sgx: Add hook to error injection address validation Tony Luck
2021-08-27 20:28 ` [PATCH v4 0/6] Basic recovery for machine checks inside SGX Borislav Petkov
2021-08-27 20:43 ` Sean Christopherson
2021-09-01 2:06 ` Jarkko Sakkinen
2021-09-01 14:48 ` Luck, Tony
2021-09-17 21:38 ` [PATCH v5 0/7] " Tony Luck
2021-09-17 21:38 ` [PATCH v5 1/7] x86/sgx: Provide indication of life-cycle of EPC pages Tony Luck
2021-09-21 21:28 ` Jarkko Sakkinen
2021-09-21 21:34 ` Luck, Tony
2021-09-22 5:17 ` Jarkko Sakkinen
2021-09-21 22:15 ` Dave Hansen
2021-09-22 5:27 ` Jarkko Sakkinen
2021-09-17 21:38 ` [PATCH v5 2/7] x86/sgx: Add infrastructure to identify SGX " Tony Luck
2021-09-21 20:23 ` Dave Hansen
2021-09-21 20:50 ` Luck, Tony
2021-09-21 22:32 ` Dave Hansen
2021-09-21 23:48 ` Luck, Tony
2021-09-21 23:50 ` Dave Hansen
2021-09-17 21:38 ` [PATCH v5 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-09-17 21:38 ` [PATCH v5 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-09-17 21:38 ` [PATCH v5 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-09-17 21:38 ` [PATCH v5 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-09-17 21:38 ` [PATCH v5 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
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=20210728204653.1509010-3-tony.luck@intel.com \
--to=tony.luck@intel.com \
--cc=dave.hansen@intel.com \
--cc=jarkko@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=seanjc@google.com \
--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;
as well as URLs for NNTP newsgroup(s).