Add an ASI fault handler and options to define the handler behavior.
Depending on the ASI, the ASI fault handler can either abort the
isolation and retry the faulty instruction with the full kernel
page-table, or preserve the isolation and process the fault like
any regular fault. If isolation is aborted then the location and
address of the fault can be logged and optionally include a stack
trace.
Signed-off-by: Alexandre Chartre <alexandre.chartre@xxxxxxxxxx>
---
arch/x86/include/asm/asi.h | 42 +++++++++++++++++++-
arch/x86/mm/asi.c | 95 ++++++++++++++++++++++++++++++++++++++++++++
arch/x86/mm/fault.c | 20 +++++++++
3 files changed, 156 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/asi.h b/arch/x86/include/asm/asi.h
index a0733f1..b8d7b93 100644
--- a/arch/x86/include/asm/asi.h
+++ b/arch/x86/include/asm/asi.h
@@ -66,6 +66,7 @@ struct asi_type {
int pcid_prefix; /* PCID prefix */
struct asi_tlb_state *tlb_state; /* percpu ASI TLB state */
atomic64_t last_pgtable_id; /* last id for this type */
+ bool fault_abort; /* abort ASI on fault? */
};
/*
@@ -75,12 +76,13 @@ struct asi_type {
* (asi_create_<typename>()) to easily create an ASI of the
* specified type.
*/
-#define DEFINE_ASI_TYPE(name, pcid_prefix) \
+#define DEFINE_ASI_TYPE(name, pcid_prefix, fault_abort) \
DEFINE_PER_CPU(struct asi_tlb_state, asi_tlb_ ## name); \
struct asi_type asi_type_ ## name = { \
pcid_prefix, \
&asi_tlb_ ## name, \
ATOMIC64_INIT(1), \
+ fault_abort \
}; \
EXPORT_SYMBOL(asi_type_ ## name)
@@ -94,16 +96,49 @@ struct asi_type {
return asi_create(&asi_type_ ## name); \
}
+/* ASI fault log size */
+#define ASI_FAULT_LOG_SIZE 128
+
+/*
+ * Options to specify the fault log policy when a fault occurs
+ * while using ASI.
+ *
+ * When set, ASI_FAULT_LOG_KERNEL|USER log the address and location
+ * of the fault. In addition, if ASI_FAULT_LOG_STACK is set, the stack
+ * trace where the fault occurred is also logged.
+ *
+ * Faults are logged only for ASIs with a type which aborts ASI on an
+ * ASI fault (see fault_abort in struct asi_type).
+ */
+#define ASI_FAULT_LOG_KERNEL 0x01 /* log kernel faults */
+#define ASI_FAULT_LOG_USER 0x02 /* log user faults */
+#define ASI_FAULT_LOG_STACK 0x04 /* log stack trace */
+
+enum asi_fault_origin {
+ ASI_FAULT_KERNEL = ASI_FAULT_LOG_KERNEL,
+ ASI_FAULT_USER = ASI_FAULT_LOG_USER,
+};
+
+struct asi_fault_log {
+ unsigned long address; /* fault address */
+ unsigned long count; /* fault count */
+};
+
struct asi {
struct asi_type *type; /* ASI type */
pgd_t *pagetable; /* ASI pagetable */
u64 pgtable_id; /* ASI pagetable ID */
atomic64_t pgtable_gen; /* ASI pagetable generation */
unsigned long base_cr3; /* base ASI CR3 */
+ spinlock_t fault_lock; /* protect fault_log_* */
+ struct asi_fault_log fault_log[ASI_FAULT_LOG_SIZE];
+ int fault_log_policy; /* fault log policy */
};
void asi_schedule_out(struct task_struct *task);
void asi_schedule_in(struct task_struct *task);
+bool asi_fault(struct pt_regs *regs, unsigned long error_code,
+ unsigned long address, enum asi_fault_origin fault_origin);
extern struct asi *asi_create(struct asi_type *type);
extern void asi_destroy(struct asi *asi);
@@ -111,6 +146,11 @@ struct asi {
extern int asi_enter(struct asi *asi);
extern void asi_exit(struct asi *asi);
+static inline void asi_set_log_policy(struct asi *asi, int policy)
+{
+ asi->fault_log_policy = policy;
+}
+
#else /* __ASSEMBLY__ */
#include <asm/alternative-asm.h>
diff --git a/arch/x86/mm/asi.c b/arch/x86/mm/asi.c
index 9955eb2..6c94d29 100644
--- a/arch/x86/mm/asi.c
+++ b/arch/x86/mm/asi.c
@@ -6,6 +6,7 @@
*/
#include <linux/mm.h>
+#include <linux/sched/debug.h>
#include <linux/slab.h>
#include <asm/asi.h>
@@ -13,6 +14,97 @@
#include <asm/mmu_context.h>
#include <asm/tlbflush.h>
+static void asi_log_fault(struct asi *asi, struct pt_regs *regs,
+ unsigned long error_code, unsigned long address,
+ enum asi_fault_origin fault_origin)
+{
+ int i;
+
+ /*
+ * Log information about the fault only if this is a fault
+ * we don't know about yet (and the fault log is not full).
+ */
+ spin_lock(&asi->fault_lock);
+ if (!(asi->fault_log_policy & fault_origin)) {
+ spin_unlock(&asi->fault_lock);
+ return;
+ }
+ for (i = 0; i < ASI_FAULT_LOG_SIZE; i++) {
+ if (asi->fault_log[i].address == regs->ip) {
+ asi->fault_log[i].count++;
+ spin_unlock(&asi->fault_lock);
+ return;
+ }
+ if (!asi->fault_log[i].address) {
+ asi->fault_log[i].address = regs->ip;
+ asi->fault_log[i].count = 1;
+ break;
+ }
+ }
+
+ if (i >= ASI_FAULT_LOG_SIZE) {
+ pr_warn("ASI %p: fault log buffer is full [%d]\n",
+ asi, i);
+ }
+
+ pr_info("ASI %p: PF#%d (%ld) at %pS on %px\n", asi, i,
+ error_code, (void *)regs->ip, (void *)address);
+
+ if (asi->fault_log_policy & ASI_FAULT_LOG_STACK)
+ show_stack(NULL, (unsigned long *)regs->sp);
+
+ spin_unlock(&asi->fault_lock);
+}
+
+bool asi_fault(struct pt_regs *regs, unsigned long error_code,
+ unsigned long address, enum asi_fault_origin fault_origin)
+{
+ struct asi_session *asi_session;
+
+ /*
+ * If address space isolation was active when the fault occurred
+ * then the page fault handler has interrupted the isolation
+ * (exception handlers interrupt isolation very early) and switched
+ * CR3 back to its original kernel value. So we can safely retrieved
+ * the CPU ASI session.
+ */
+ asi_session = &get_cpu_var(cpu_asi_session);
+
+ /*
+ * If address space isolation is not active, or we have a fault
+ * after isolation was aborted then this was not a fault while
+ * using ASI and we don't handle it.
+ */
+ if (!asi_session->asi || asi_session->idepth > 1)
+ return false;
+
+ /*
+ * We have a fault while the CPU is using address space isolation.
+ * Depending on the ASI fault policy, either:
+ *
+ * - Abort the isolation. The ASI used when the fault occurred is
+ * aborted, and the faulty instruction is immediately retried.
+ * The fault is not processed by the system fault handler. The
+ * fault handler will return immediately, the system will not
+ * restore the ASI pagetable and will continue to run with the
+ * full kernel pagetable.
+ *
+ * - Or preserve the isolation. The system fault handler will
+ * process the fault like any regular fault. The ASI pagetable
+ * be restored after the fault has been handled and the system
+ * fault handler returns.
+ */
+ if (asi_session->asi->type->fault_abort) {
+ asi_log_fault(asi_session->asi, regs, error_code,
+ address, fault_origin);
+ asi_session->asi = NULL;
+ asi_session->idepth = 0;
+ return true;
+ }
+
+ return false;
+}
+
struct asi *asi_create(struct asi_type *type)
{
struct asi *asi;
@@ -27,6 +119,9 @@ struct asi *asi_create(struct asi_type *type)
asi->type = type;
asi->pgtable_id = atomic64_inc_return(&type->last_pgtable_id);
atomic64_set(&asi->pgtable_gen, 0);
+ spin_lock_init(&asi->fault_lock);
+ /* by default, log ASI kernel faults */
+ asi->fault_log_policy = ASI_FAULT_LOG_KERNEL;
return asi;
}
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 304d31d..d50676f 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -29,6 +29,7 @@
#include <asm/efi.h> /* efi_recover_from_page_fault()*/
#include <asm/desc.h> /* store_idt(), ... */
#include <asm/cpu_entry_area.h> /* exception stack */
+#include <asm/asi.h> /* asi_fault() */
#define CREATE_TRACE_POINTS
#include <asm/trace/exceptions.h>
@@ -1235,6 +1236,15 @@ static int fault_in_kernel_space(unsigned long address)
WARN_ON_ONCE(hw_error_code & X86_PF_PK);
/*
+ * Check if the fault occurs with ASI and if the ASI handler
+ * handles it.
+ */
+ if (IS_ENABLED(CONFIG_ADDRESS_SPACE_ISOLATION) &&
+ asi_fault(regs, hw_error_code, address, ASI_FAULT_KERNEL)) {
+ return;
+ }
+
+ /*
* We can fault-in kernel-space virtual memory on-demand. The
* 'reference' page table is init_mm.pgd.
*
@@ -1289,6 +1299,16 @@ void do_user_addr_fault(struct pt_regs *regs,
vm_fault_t fault, major = 0;
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
+
+ /*
+ * Check if the fault occurs with ASI and if the ASI handler
+ * handles it.
+ */
+ if (IS_ENABLED(CONFIG_ADDRESS_SPACE_ISOLATION) &&
+ asi_fault(regs, hw_error_code, address, ASI_FAULT_USER)) {
+ return;
+ }
+
tsk = current;
mm = tsk->mm;
--
1.7.1
