linux-sgx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages
@ 2025-05-08 23:04 Andrew Zaborowski
  2025-05-15 16:27 ` Dave Hansen
  2025-05-15 17:18 ` [tip: x86/sgx] " tip-bot2 for Andrew Zaborowski
  0 siblings, 2 replies; 4+ messages in thread
From: Andrew Zaborowski @ 2025-05-08 23:04 UTC (permalink / raw)
  To: x86, linux-sgx, linux-kernel
  Cc: Dave Hansen, Tony Luck, Thomas Gleixner, Borislav Petkov,
	Ingo Molnar, H . Peter Anvin, balrogg

Pages used by an enclave only get epc_page->poison set in
arch_memory_failure() but they currently stay on sgx_active_page_list until
sgx_encl_release(), with the SGX_EPC_PAGE_RECLAIMER_TRACKED flag untouched.

epc_page->poison is not checked in the reclaimer logic meaning that, if other
conditions are met, an attempt will be made to reclaim an EPC page that was
poisoned.  This is bad because 1. we don't want that page to end up added
to another enclave and 2. it is likely to cause one core to shut down
and the kernel to panic.

Specifically, reclaiming uses microcode operations including "EWB" which
accesses the EPC page contents to encrypt and write them out to non-SGX
memory.  Those operations cannot handle MCEs in their accesses other than
by putting the executing core into a special shutdown state (affecting
both threads with HT.)  The kernel will subsequently panic on the
remaining cores seeing the core didn't enter MCE handler(s) in time.

Call sgx_unmark_page_reclaimable() to remove the affected EPC page from
sgx_active_page_list on memory error to stop it being considered for
reclaiming.

Testing epc_page->poison in sgx_reclaim_pages() would also work but I assume
it's better to add code in the less likely paths.

The affected EPC page is not added to &node->sgx_poison_page_list until
later in sgx_encl_release()->sgx_free_epc_page() when it is EREMOVEd.
Membership on other lists doesn't change to avoid changing any of the
lists' semantics except for sgx_active_page_list.  There's a "TBD" comment
in arch_memory_failure() about pre-emptive actions, the goal here is not
to address everything that it may imply.

This also doesn't completely close the time window when a memory error
notification will be fatal (for a not previously poisoned EPC page) --
the MCE can happen after sgx_reclaim_pages() has selected its candidates
or even *inside* a microcode operation (actually easy to trigger due to
the amount of time spent in them.)

The spinlock in sgx_unmark_page_reclaimable() is safe because
memory_failure() runs in process context and no spinlocks are held,
explicitly noted in a mm/memory-failure.c comment.

Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com>
---
Changes in v2:
 - improve commit message following Dave Hansen's input: explain why
   the SGX ops crash, replace page with epc_page.  Improve the summary,
   use the right prefix.

 arch/x86/kernel/cpu/sgx/main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 671c26513..7076464d4 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -719,6 +719,8 @@ int arch_memory_failure(unsigned long pfn, int flags)
 		goto out;
 	}
 
+	sgx_unmark_page_reclaimable(page);
+
 	/*
 	 * TBD: Add additional plumbing to enable pre-emptive
 	 * action for asynchronous poison notification. Until
-- 
2.43.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages
  2025-05-08 23:04 [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages Andrew Zaborowski
@ 2025-05-15 16:27 ` Dave Hansen
  2025-05-15 17:05   ` Ingo Molnar
  2025-05-15 17:18 ` [tip: x86/sgx] " tip-bot2 for Andrew Zaborowski
  1 sibling, 1 reply; 4+ messages in thread
From: Dave Hansen @ 2025-05-15 16:27 UTC (permalink / raw)
  To: Andrew Zaborowski, x86, linux-sgx, linux-kernel
  Cc: Dave Hansen, Tony Luck, Thomas Gleixner, Borislav Petkov,
	Ingo Molnar, H . Peter Anvin, balrogg

Thanks for sending this, Andrew!

I think I'll probably add a slightly shorter summary:

tl;dr: SGX page reclaim touches the page to copy its contents to
secondary storage. SGX instructions do not gracefully handle machine
checks. Despite this, the existing SGX code will try to reclaim pages
that it _knows_ are poisoned. Avoid even trying to reclaim poisoned pages.

But otherwise it looks great:

Acked-by: Dave Hansen <dave.hansen@linux.intel.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages
  2025-05-15 16:27 ` Dave Hansen
@ 2025-05-15 17:05   ` Ingo Molnar
  0 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2025-05-15 17:05 UTC (permalink / raw)
  To: Dave Hansen
  Cc: Andrew Zaborowski, x86, linux-sgx, linux-kernel, Dave Hansen,
	Tony Luck, Thomas Gleixner, Borislav Petkov, Ingo Molnar,
	H . Peter Anvin, balrogg


* Dave Hansen <dave.hansen@intel.com> wrote:

> Thanks for sending this, Andrew!
> 
> I think I'll probably add a slightly shorter summary:
> 
> tl;dr: SGX page reclaim touches the page to copy its contents to
> secondary storage. SGX instructions do not gracefully handle machine
> checks. Despite this, the existing SGX code will try to reclaim pages
> that it _knows_ are poisoned. Avoid even trying to reclaim poisoned pages.
> 
> But otherwise it looks great:
> 
> Acked-by: Dave Hansen <dave.hansen@linux.intel.com>

Thanks, I've applied this fix to tip:x86/sgx, with the TL;DR paragraph 
added in.

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip: x86/sgx] x86/sgx: Prevent attempts to reclaim poisoned pages
  2025-05-08 23:04 [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages Andrew Zaborowski
  2025-05-15 16:27 ` Dave Hansen
@ 2025-05-15 17:18 ` tip-bot2 for Andrew Zaborowski
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Andrew Zaborowski @ 2025-05-15 17:18 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Andrew Zaborowski, Ingo Molnar, Dave Hansen, H. Peter Anvin,
	Linus Torvalds, Tony Luck, balrogg, linux-sgx, x86, linux-kernel

The following commit has been merged into the x86/sgx branch of tip:

Commit-ID:     ed16618c380c32c68c06186d0ccbb0d5e0586e59
Gitweb:        https://git.kernel.org/tip/ed16618c380c32c68c06186d0ccbb0d5e0586e59
Author:        Andrew Zaborowski <andrew.zaborowski@intel.com>
AuthorDate:    Fri, 09 May 2025 01:04:29 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 15 May 2025 19:01:45 +02:00

x86/sgx: Prevent attempts to reclaim poisoned pages

TL;DR: SGX page reclaim touches the page to copy its contents to
secondary storage. SGX instructions do not gracefully handle machine
checks. Despite this, the existing SGX code will try to reclaim pages
that it _knows_ are poisoned. Avoid even trying to reclaim poisoned pages.

The longer story:

Pages used by an enclave only get epc_page->poison set in
arch_memory_failure() but they currently stay on sgx_active_page_list until
sgx_encl_release(), with the SGX_EPC_PAGE_RECLAIMER_TRACKED flag untouched.

epc_page->poison is not checked in the reclaimer logic meaning that, if other
conditions are met, an attempt will be made to reclaim an EPC page that was
poisoned.  This is bad because 1. we don't want that page to end up added
to another enclave and 2. it is likely to cause one core to shut down
and the kernel to panic.

Specifically, reclaiming uses microcode operations including "EWB" which
accesses the EPC page contents to encrypt and write them out to non-SGX
memory.  Those operations cannot handle MCEs in their accesses other than
by putting the executing core into a special shutdown state (affecting
both threads with HT.)  The kernel will subsequently panic on the
remaining cores seeing the core didn't enter MCE handler(s) in time.

Call sgx_unmark_page_reclaimable() to remove the affected EPC page from
sgx_active_page_list on memory error to stop it being considered for
reclaiming.

Testing epc_page->poison in sgx_reclaim_pages() would also work but I assume
it's better to add code in the less likely paths.

The affected EPC page is not added to &node->sgx_poison_page_list until
later in sgx_encl_release()->sgx_free_epc_page() when it is EREMOVEd.
Membership on other lists doesn't change to avoid changing any of the
lists' semantics except for sgx_active_page_list.  There's a "TBD" comment
in arch_memory_failure() about pre-emptive actions, the goal here is not
to address everything that it may imply.

This also doesn't completely close the time window when a memory error
notification will be fatal (for a not previously poisoned EPC page) --
the MCE can happen after sgx_reclaim_pages() has selected its candidates
or even *inside* a microcode operation (actually easy to trigger due to
the amount of time spent in them.)

The spinlock in sgx_unmark_page_reclaimable() is safe because
memory_failure() runs in process context and no spinlocks are held,
explicitly noted in a mm/memory-failure.c comment.

Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: balrogg@gmail.com
Cc: linux-sgx@vger.kernel.org
Link: https://lore.kernel.org/r/20250508230429.456271-1-andrew.zaborowski@intel.com
---
 arch/x86/kernel/cpu/sgx/main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c
index 8ce352f..7c19977 100644
--- a/arch/x86/kernel/cpu/sgx/main.c
+++ b/arch/x86/kernel/cpu/sgx/main.c
@@ -719,6 +719,8 @@ int arch_memory_failure(unsigned long pfn, int flags)
 		goto out;
 	}
 
+	sgx_unmark_page_reclaimable(page);
+
 	/*
 	 * TBD: Add additional plumbing to enable pre-emptive
 	 * action for asynchronous poison notification. Until

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-05-15 17:18 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-08 23:04 [PATCH v2] x86/sgx: Prevent attempts to reclaim poisoned pages Andrew Zaborowski
2025-05-15 16:27 ` Dave Hansen
2025-05-15 17:05   ` Ingo Molnar
2025-05-15 17:18 ` [tip: x86/sgx] " tip-bot2 for Andrew Zaborowski

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).