lkml.org 
[lkml]   [2020]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Subject[PATCH v3 0/6] Add machine check recovery when copying from user space
Date
Machine check recovery from uncorrected memory errors currently focusses
primarily on errors that are detected while running in user mode. There
is a mechanism for recovering from errors in kernel code, but it is
currently only used for memcpy_mcsafe().

The existing recover actions for errors found in user mode (unmap the
page and send SIGBUS to the task) can also be applied when the error is
found while copying data from user space to the kernel.

Roadmap to this series:

Series is based on top of tip ras/core branch because original part 0001
has already been applied to tip ras/core branch:
13c877f4b48b ("x86/mce: Stop mce_reign() from re-computing severity for every CPU")
so new part 0001 below used to be part 0002 in v1 series.


In v3 part 0005 has been merged with the final part, so now just 6 parts.

0001: First piece of infrastructure update. Severity calculations need
access to the saved registers. So pass pointer down the call
chain.

0002: Need to know what type of exception handler is present
for a given kernel instruction. Rather than proliferate more
functions like ex_has_fault_handler() for each type, replace
with a function that looks up the handler and returns an enum
describing the type.

0003: Need slightly different handling for *copy_user*() faults from
get_user() faults. Create a new exception table tag and apply
to the copy functions.

Change since v2: Reword commit message to avoid use of "we".

0004: In fixup path of copy functions avoid dealing with the tail
when the copy took a machine check by returning that there
are no bytes left to be copied.

0005: Changes to do_machine_check() to support the new recovery flow.
Some re-factoring to avoid code duplication (since the flows
for "error in user mode" and "error while copying from user
mode" are almost identical). Couple of new fields added to the
task structure.

Change since v2: Boris supplied a helper function to make the re-factor
much simpler. Use it instead of the spaghetti code in v2.

0006: Finally the keystone patch that pulls all the parts together.
An instruction decoder figures out whether an instruction
tagged as accessing user space is reading from or writing
to user space. The instructions in the switch were found
experimentally by looking at what instructions in the base
kernel are tagged in the exception table. I didn't add the
atomic operations (0x87 = XCHG etc.) that both read and write
user addresses. I think they should be safe, but I need a test
case where a futex has been poisoned to check. Probably this
switch should be expanded with all the instructions that the
compiler could possibly generate that read from user space.

Change since v2: Merged old part 0005 into this piece since this is
where function fault_in_kernel_space() is used.
Check modrm.got and sib.got fields in "insn" were set before
calling insn_get_addr()
Change type of constant from ~0ul to -1l when checking whether
address returned by insn_get_addr() is valid.


Tony Luck (4):
x86/mce: Provide method to find out the type of exception handle
x86/mce: Avoid tail copy when machine check terminated a copy from
user
x86/mce: Recover from poison found while copying from user space
x86/mce: Decode a kernel instruction to determine if it is copying
from user

Youquan Song (2):
x86/mce: Pass pointer to saved pt_regs to severity calculation
routines
x86/mce: Add _ASM_EXTABLE_CPY for copy user access

arch/x86/include/asm/asm.h | 6 ++
arch/x86/include/asm/extable.h | 9 ++-
arch/x86/include/asm/mce.h | 15 ++++
arch/x86/include/asm/traps.h | 2 +
arch/x86/kernel/cpu/mce/core.c | 52 +++++++++-----
arch/x86/kernel/cpu/mce/internal.h | 3 +-
arch/x86/kernel/cpu/mce/severity.c | 70 ++++++++++++++++--
arch/x86/lib/copy_user_64.S | 111 ++++++++++++++++-------------
arch/x86/mm/extable.c | 24 +++++--
arch/x86/mm/fault.c | 2 +-
include/linux/sched.h | 2 +
11 files changed, 217 insertions(+), 79 deletions(-)


base-commit: 5da8e4a658109e3b7e1f45ae672b7c06ac3e7158
--
2.21.1

\
 
 \ /
  Last update: 2020-10-06 23:09    [W:0.096 / U:1.488 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site