All of lore.kernel.org
 help / color / mirror / Atom feed
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: Cathy Zhang <cathy.zhang@intel.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org,
	Tony Luck <tony.luck@intel.com>
Subject: [PATCH v4 6/6] x86/sgx: Add hook to error injection address validation
Date: Fri, 27 Aug 2021 12:55:43 -0700	[thread overview]
Message-ID: <20210827195543.1667168-7-tony.luck@intel.com> (raw)
In-Reply-To: <20210827195543.1667168-1-tony.luck@intel.com>

SGX reserved memory does not appear in the standard address maps.

Add hook to call into the SGX code to check if an address is located
in SGX memory.

There are other challenges in injecting errors into SGX. Update the
documentation with a sequence of operations to inject.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 .../firmware-guide/acpi/apei/einj.rst         | 19 +++++++++++++++++++
 drivers/acpi/apei/einj.c                      |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Documentation/firmware-guide/acpi/apei/einj.rst b/Documentation/firmware-guide/acpi/apei/einj.rst
index c042176e1707..55e2331a6438 100644
--- a/Documentation/firmware-guide/acpi/apei/einj.rst
+++ b/Documentation/firmware-guide/acpi/apei/einj.rst
@@ -181,5 +181,24 @@ You should see something like this in dmesg::
   [22715.834759] EDAC sbridge MC3: PROCESSOR 0:306e7 TIME 1422553404 SOCKET 0 APIC 0
   [22716.616173] EDAC MC3: 1 CE memory read error on CPU_SrcID#0_Channel#0_DIMM#0 (channel:0 slot:0 page:0x12345 offset:0x0 grain:32 syndrome:0x0 -  area:DRAM err_code:0001:0090 socket:0 channel_mask:1 rank:0)
 
+Special notes for injection into SGX enclaves:
+
+There may be a separate BIOS setup option to enable SGX injection.
+
+The injection process consists of setting some special memory controller
+trigger that will inject the error on the next write to the target
+address. But the h/w prevents any software outside of an SGX enclave
+from accessing enclave pages (even BIOS SMM mode).
+
+The following sequence can be used:
+  1) Determine physical address of enclave page
+  2) Use "notrigger=1" mode to inject (this will setup
+     the injection address, but will not actually inject)
+  3) Enter the enclave
+  4) Store data to the virtual address matching physical address from step 1
+  5) Execute CLFLUSH for that virtual address
+  6) Spin delay for 250ms
+  7) Read from the virtual address. This will trigger the error
+
 For more information about EINJ, please refer to ACPI specification
 version 4.0, section 17.5 and ACPI 5.0, section 18.6.
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 2882450c443e..cd7cffc955bf 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -544,7 +544,8 @@ static int einj_error_inject(u32 type, u32 flags, u64 param1, u64 param2,
 	    ((region_intersects(base_addr, size, IORESOURCE_SYSTEM_RAM, IORES_DESC_NONE)
 				!= REGION_INTERSECTS) &&
 	     (region_intersects(base_addr, size, IORESOURCE_MEM, IORES_DESC_PERSISTENT_MEMORY)
-				!= REGION_INTERSECTS)))
+				!= REGION_INTERSECTS) &&
+	     !sgx_is_epc_page(base_addr)))
 		return -EINVAL;
 
 inject:
-- 
2.29.2


  parent reply	other threads:[~2021-08-27 19:56 UTC|newest]

Thread overview: 187+ 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     ` [PATCH v3 2/7] x86/sgx: Add infrastructure to identify SGX " Tony Luck
2021-07-28 22:19       ` 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       ` Tony Luck [this message]
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
2021-09-22 18:21         ` [PATCH v6 0/7] Basic recovery for machine checks inside SGX Tony Luck
2021-09-22 18:21           ` [PATCH v6 1/7] x86/sgx: Provide indication of life-cycle of EPC pages Tony Luck
2021-09-23 20:21             ` Jarkko Sakkinen
2021-09-23 20:24               ` Jarkko Sakkinen
2021-09-23 20:46                 ` Luck, Tony
2021-09-23 22:11                   ` Luck, Tony
2021-09-28  2:13                     ` Jarkko Sakkinen
2021-09-22 18:21           ` [PATCH v6 2/7] x86/sgx: Add infrastructure to identify SGX " Tony Luck
2021-09-22 18:21           ` [PATCH v6 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-09-22 18:21           ` [PATCH v6 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-09-22 18:21           ` [PATCH v6 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-09-22 18:21           ` [PATCH v6 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-09-22 18:21           ` [PATCH v6 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-09-27 21:34           ` [PATCH v7 0/7] Basic recovery for machine checks inside SGX Tony Luck
2021-09-27 21:34             ` [PATCH v7 1/7] x86/sgx: Add new sgx_epc_page flag bit to mark in-use pages Tony Luck
2021-09-28  2:28               ` Jarkko Sakkinen
2021-09-27 21:34             ` [PATCH v7 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages Tony Luck
2021-09-28  2:30               ` Jarkko Sakkinen
2021-09-27 21:34             ` [PATCH v7 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-09-28  2:46               ` Jarkko Sakkinen
2021-09-28 15:41                 ` Luck, Tony
2021-09-28 20:11                   ` Jarkko Sakkinen
2021-09-28 20:53                     ` Luck, Tony
2021-09-30 14:40                       ` Jarkko Sakkinen
2021-09-30 18:02                         ` Luck, Tony
2021-09-27 21:34             ` [PATCH v7 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-09-27 21:34             ` [PATCH v7 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-09-27 21:34             ` [PATCH v7 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-09-27 21:34             ` [PATCH v7 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-10-01 16:47             ` [PATCH v8 0/7] Basic recovery for machine checks inside SGX Tony Luck
2021-10-01 16:47               ` [PATCH v8 1/7] x86/sgx: Add new sgx_epc_page flag bit to mark in-use pages Tony Luck
2021-10-01 16:47               ` [PATCH v8 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages Tony Luck
2021-10-01 16:47               ` [PATCH v8 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-10-04 23:24                 ` Jarkko Sakkinen
2021-10-01 16:47               ` [PATCH v8 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-10-04 23:30                 ` Jarkko Sakkinen
2021-10-01 16:47               ` [PATCH v8 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-10-01 16:47               ` [PATCH v8 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-10-01 16:47               ` [PATCH v8 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-10-04 21:56               ` [PATCH v8 0/7] Basic recovery for machine checks inside SGX Reinette Chatre
2021-10-11 18:59               ` [PATCH v9 " Tony Luck
2021-10-11 18:59                 ` [PATCH v9 1/7] x86/sgx: Add new sgx_epc_page flag bit to mark in-use pages Tony Luck
2021-10-15 22:57                   ` Sean Christopherson
2021-10-11 18:59                 ` [PATCH v9 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages Tony Luck
2021-10-22 10:43                   ` kernel test robot
2021-10-22 10:43                     ` kernel test robot
2021-10-11 18:59                 ` [PATCH v9 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-10-15 23:07                   ` Sean Christopherson
2021-10-15 23:32                     ` Luck, Tony
2021-10-11 18:59                 ` [PATCH v9 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-10-15 23:10                   ` Sean Christopherson
2021-10-15 23:19                     ` Luck, Tony
2021-10-11 18:59                 ` [PATCH v9 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-10-12 16:49                   ` Jarkko Sakkinen
2021-10-11 18:59                 ` [PATCH v9 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-10-12 16:50                   ` Jarkko Sakkinen
2021-10-11 18:59                 ` [PATCH v9 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-10-12 16:51                   ` Jarkko Sakkinen
2021-10-12 16:48                 ` [PATCH v9 0/7] Basic recovery for machine checks inside SGX Jarkko Sakkinen
2021-10-12 17:57                   ` Luck, Tony
2021-10-18 20:25                 ` [PATCH v10 " Tony Luck
2021-10-18 20:25                   ` [PATCH v10 1/7] x86/sgx: Add new sgx_epc_page flag bit to mark free pages Tony Luck
2021-10-18 20:25                   ` [PATCH v10 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages Tony Luck
2021-11-19 12:25                     ` kernel test robot
2021-11-19 12:25                       ` kernel test robot
2021-10-18 20:25                   ` [PATCH v10 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-10-18 20:25                   ` [PATCH v10 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-10-18 20:25                   ` [PATCH v10 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-10-20  9:06                     ` Naoya Horiguchi
2021-10-20 17:04                       ` Luck, Tony
2021-10-18 20:25                   ` [PATCH v10 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-10-18 20:25                   ` [PATCH v10 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-10-26 22:00                   ` [PATCH v11 0/7] Basic recovery for machine checks inside SGX Tony Luck
2021-10-26 22:00                     ` [PATCH v11 1/7] x86/sgx: Add new sgx_epc_page flag bit to mark free pages Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 2/7] x86/sgx: Add infrastructure to identify SGX EPC pages Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 3/7] x86/sgx: Initial poison handling for dirty and free pages Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 4/7] x86/sgx: Add SGX infrastructure to recover from poison Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 5/7] x86/sgx: Hook arch_memory_failure() into mainline code Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 6/7] x86/sgx: Add hook to error injection address validation Tony Luck
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for Tony Luck
2021-10-26 22:00                     ` [PATCH v11 7/7] x86/sgx: Add check for SGX pages to ghes_do_memory_failure() Tony Luck
2021-10-29 18:39                       ` Rafael J. Wysocki
2021-11-15 20:22                       ` [tip: x86/sgx] " tip-bot2 for 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=20210827195543.1667168-7-tony.luck@intel.com \
    --to=tony.luck@intel.com \
    --cc=cathy.zhang@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.