Commit 03248add authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

resume_user_mode: Move to resume_user_mode.h 



Move set_notify_resume and tracehook_notify_resume into resume_user_mode.h.
While doing that rename tracehook_notify_resume to resume_user_mode_work.

Update all of the places that included tracehook.h for these functions to
include resume_user_mode.h instead.

Update all of the callers of tracehook_notify_resume to call
resume_user_mode_work.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20220309162454.123006-12-ebiederm@xmission.com


Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent d3c51a0c

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ config TRACE_IRQFLAGS_SUPPORT 
#	linux/regset.h		user_regset interfaces

#	CORE_DUMP_USE_REGSET	#define'd in linux/elf.h

#	TIF_SYSCALL_TRACE	calls ptrace_report_syscall_{entry,exit}

#	TIF_NOTIFY_RESUME	calls tracehook_notify_resume()

#	TIF_NOTIFY_RESUME	calls resume_user_mode_work()

#

config HAVE_ARCH_TRACEHOOK

	bool

arch/alpha/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/binfmts.h>

#include <linux/bitops.h>

#include <linux/syscalls.h>

#include <linux/tracehook.h>

#include <linux/resume_user_mode.h>



#include <linux/uaccess.h>

#include <asm/sigcontext.h>
@@ -531,7 +531,7 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags, 
				do_signal(regs, r0, r19);

				r0 = 0;

			} else {

				tracehook_notify_resume(regs);

				resume_user_mode_work(regs);

			}

		}

		local_irq_disable();

arch/arc/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include <linux/personality.h>

#include <linux/uaccess.h>

#include <linux/syscalls.h>

#include <linux/tracehook.h>

#include <linux/resume_user_mode.h>

#include <linux/sched/task_stack.h>



#include <asm/ucontext.h>
@@ -438,5 +438,5 @@ void do_notify_resume(struct pt_regs *regs) 
	 * user mode

	 */

	if (test_thread_flag(TIF_NOTIFY_RESUME))

		tracehook_notify_resume(regs);

		resume_user_mode_work(regs);

}

arch/arm/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/signal.h>

#include <linux/personality.h>

#include <linux/uaccess.h>

#include <linux/tracehook.h>

#include <linux/resume_user_mode.h>

#include <linux/uprobes.h>

#include <linux/syscalls.h>
@@ -627,7 +627,7 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) 
			} else if (thread_flags & _TIF_UPROBE) {

				uprobe_notify_resume(regs);

			} else {

				tracehook_notify_resume(regs);

				resume_user_mode_work(regs);

			}

		}

		local_irq_disable();

arch/arm64/kernel/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/uaccess.h>

#include <linux/sizes.h>

#include <linux/string.h>

#include <linux/tracehook.h>

#include <linux/resume_user_mode.h>

#include <linux/ratelimit.h>

#include <linux/syscalls.h>
@@ -941,7 +941,7 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags) 
				do_signal(regs);



			if (thread_flags & _TIF_NOTIFY_RESUME)

				tracehook_notify_resume(regs);

				resume_user_mode_work(regs);



			if (thread_flags & _TIF_FOREIGN_FPSTATE)

				fpsimd_restore_current_state();