x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: a6dfa128ce5c414ab46b1d690f7a1b8decb8526d config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
This tree includes:
- an FPU related crash fix
- a ptrace fix (with matching testcase in tools/testing/selftests/)
- an x86 Kconfig DMA-config defaults tweak to better avoid non-working drivers
out-of-topic modifications in x86-urgent-for-linus:
-----------------------------------------------------
tools/testing/selftests/x86/Makefile# 0a15584d7276: x86, selftests: Add single_s tools/testing/selftests/x86/run_x86_tests.sh# 0a15584d7276: x86, selftests: Add single_s tools/testing/selftests/x86/single_step_syscall.c# 0a15584d7276: x86, selftests: Add single_s
Thanks,
Ingo
------------------>
Andy Lutomirski (1):
x86, selftests: Add single_step_syscall test
Borislav Petkov (1):
x86/fpu: Load xsave pointer *after* initialization
Konrad Rzeszutek Wilk (1):
config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
Oleg Nesterov (1):
x86/ptrace: Fix the TIF_FORCED_TF logic in handle_signal()
arch/x86/Kconfig | 2 +- arch/x86/kernel/i387.c | 8 +- arch/x86/kernel/signal.c | 22 +-- tools/testing/selftests/x86/Makefile | 2 +- tools/testing/selftests/x86/run_x86_tests.sh | 2 + tools/testing/selftests/x86/single_step_syscall.c | 181 ++++++++++++++++++++++ 6 files changed, 202 insertions(+), 15 deletions(-) create mode 100644 tools/testing/selftests/x86/single_step_syscall.c
arch/x86/Kconfig +1 -1
@@ -177,7 +177,7 @@ config SBUS config NEED_DMA_MAP_STATE def_bool y - depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG + depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB config NEED_SG_DMA_LENGTH def_bool y
arch/x86/kernel/i387.c +6 -2
@@ -341,7 +341,7 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset, unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf) { - struct xsave_struct *xsave = &target->thread.fpu.state->xsave; + struct xsave_struct *xsave;int ret;if (!cpu_has_xsave)
@@ -351,6 +351,8 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,if (ret)return ret; + xsave = &target->thread.fpu.state->xsave; +/* * Copy the 48bytes defined by the software first into the xstate * memory layout in the thread struct, so that we can copy the entire
@@ -369,7 +371,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset, unsigned int pos, unsigned int count, const void *kbuf, const void __user *ubuf) { - struct xsave_struct *xsave = &target->thread.fpu.state->xsave; + struct xsave_struct *xsave;int ret;if (!cpu_has_xsave)
@@ -379,6 +381,8 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,if (ret)return ret; + xsave = &target->thread.fpu.state->xsave; + ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, xsave,0 ,-1 );/* * mxcsr reserved bits must be masked to zero for security reasons.
arch/x86/kernel/signal.c +11 -11
@@ -630,7 +630,8 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)static void handle_signal (struct ksignal *ksig,struct pt_regs *regs) { -bool failed; +bool stepping, failed; +/* Are we from a system call? */ if (syscall_get_nr (current, regs) >=0 ) {/* If so, check system call restarting.. */
@@ -654,12 +655,13 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs) }/* -* If TF is set due to a debugger (TIF_FORCED_TF), clear the TF -* flag so that register information in the sigcontext is correct. +* If TF is set due to a debugger (TIF_FORCED_TF), clear TF now +* so that register information in the sigcontext is correct and +* then notify the tracer before entering the signal handler. */ -if (unlikely (regs->flags &X86_EFLAGS_TF ) && -likely (test_and_clear_thread_flag (TIF_FORCED_TF ))) - regs->flags &= ~X86_EFLAGS_TF ; + stepping =test_thread_flag (TIF_SINGLESTEP ); +if (stepping) +user_disable_single_step (current); failed = (setup_rt_frame (ksig, regs) <0 );if (!failed) {
@@ -670,10 +672,8 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)* it might disable possible debug exception from the * signal handler. * -* Clear TF when entering the signal handler, but -* notify any tracer that was single-stepping it. -* The tracer may want to single-step inside the -* handler too. +* Clear TF for the case when it wasn't set by debugger to +* avoid the recursive send_sigtrap() in SIGTRAP handler. */ regs->flags &= ~(X86_EFLAGS_DF |X86_EFLAGS_RF |X86_EFLAGS_TF );/*
@@ -682,7 +682,7 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)if (used_math ())fpu_reset_state (current); } -signal_setup_done (failed, ksig,test_thread_flag (TIF_SINGLESTEP )); +signal_setup_done (failed, ksig, stepping); }#ifdef CONFIG_X86_32
tools/testing/selftests/x86/Makefile +1 -1
@@ -1,6 +1,6 @@ .PHONY: all all_32 all_64 check_build32 clean run_tests -TARGETS_C_BOTHBITS := sigreturn +TARGETS_C_BOTHBITS := sigreturn single_step_syscall BINARIES_32 := $(TARGETS_C_BOTHBITS:%=%_32) BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64)
tools/testing/selftests/x86/run_x86_tests.sh +2 -0
@@ -3,9 +3,11 @@ # This is deliberately minimal. IMO kselftests should provide a standard # script here. ./sigreturn_32 || exit 1 +./single_step_syscall_32 || exit 1 if [[ "$uname -p" -eq "x86_64" ]]; then ./sigreturn_64 || exit 1 + ./single_step_syscall_64 || exit 1 fi exit 0
tools/testing/selftests/x86/single_step_syscall.c new file +181 -0
181 lines not on this page · raw message