From: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Signal SIGSEGV(SEGV_SGXERR) for all faults with PF_SGX set in the
error code. The PF_SGX bit is set if and only if the #PF is detected
by the Enclave Page Cache Map (EPCM), which is consulted only after
an access walks the kernel's page tables, i.e.:
a. the access was allowed by the kernel
b. the kernel's tables have become less restrictive than the EPCM
c. the kernel cannot fixup the cause of the fault
Noteably, (b) implies that either the kernel has botched the EPC
mappings or the EPCM has been invalidated due to a power event. In
either case, userspace needs to be alerted so that it can take
appropriate action, e.g. restart the enclave. This is reinforced
by (c) as the kernel doesn't really have any other reasonable option,
e.g. we could kill the task or panic, but neither is warranted.
Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
---
arch/x86/mm/fault.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 85d20516b2f3..3fb2b2838d6c 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -960,10 +960,13 @@ static noinline void
bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
unsigned long address, struct vm_area_struct *vma)
{
+ int si_code = SEGV_ACCERR;
+
if (bad_area_access_from_pkeys(error_code, vma))
- __bad_area(regs, error_code, address, vma, SEGV_PKUERR);
- else
- __bad_area(regs, error_code, address, vma, SEGV_ACCERR);
+ si_code = SEGV_PKUERR;
+ else if (unlikely(error_code & X86_PF_SGX))
+ si_code = SEGV_SGXERR;
+ __bad_area(regs, error_code, address, vma, si_code);
}
static void
@@ -1153,6 +1156,17 @@ access_error(unsigned long error_code, struct vm_area_struct *vma)
if (error_code & X86_PF_PK)
return 1;
+ /*
+ * Access is blocked by the Enclave Page Cache Map (EPCM),
+ * i.e. the access is allowed by the PTE but not the EPCM.
+ * This usually happens when the EPCM is yanked out from
+ * under us, e.g. by hardware after a suspend/resume cycle.
+ * In any case, there is nothing that can be done by the
+ * kernel to resolve the fault (short of killing the task).
+ */
+ if (unlikely(error_code & X86_PF_SGX))
+ return 1;
+
/*
* Make sure to check the VMA so that we do not perform
* faults just to hit a X86_PF_PK as soon as we fill in a
--
2.17.1
