Commit 19ccbd7f authored by Sven Schnelle's avatar Sven Schnelle Committed by liwei
Browse files

entry: Move syscall_enter_from_user_mode() to header file 

mainline inclusion
from mainline-v6.8-rc1
commit 221a164035fd8b554a44bd7c4bf8e7715a497561
category: performance
bugzilla: https://gitee.com/openeuler/kernel/issues/I9OJ0P
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=221a164035fd8b554a44bd7c4bf8e7715a497561



------------------------------------------------------

To allow inlining of syscall_enter_from_user_mode(), move it
to entry-common.h.

Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20231218074520.1998026-4-svens@linux.ibm.com


Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent cd5706d2

include/linux/entry-common.h

+25 −2
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs) 
 */

void syscall_enter_from_user_mode_prepare(struct pt_regs *regs);



long syscall_trace_enter(struct pt_regs *regs, long syscall,

			 unsigned long work);



/**

 * syscall_enter_from_user_mode_work - Check and handle work before invoking

 *				       a syscall
@@ -157,7 +160,15 @@ void syscall_enter_from_user_mode_prepare(struct pt_regs *regs); 
 *     ptrace_report_syscall_entry(), __secure_computing(), trace_sys_enter()

 *  2) Invocation of audit_syscall_entry()

 */

long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall);

static __always_inline long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall)

{

	unsigned long work = READ_ONCE(current_thread_info()->syscall_work);



	if (work & SYSCALL_WORK_ENTER)

		syscall = syscall_trace_enter(regs, syscall, work);



	return syscall;

}



/**

 * syscall_enter_from_user_mode - Establish state and check and handle work
@@ -176,7 +187,19 @@ long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall); 
 * Returns: The original or a modified syscall number. See

 * syscall_enter_from_user_mode_work() for further explanation.

 */

long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall);

static __always_inline long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)

{

	long ret;



	enter_from_user_mode(regs);



	instrumentation_begin();

	local_irq_enable();

	ret = syscall_enter_from_user_mode_work(regs, syscall);

	instrumentation_end();



	return ret;

}



/**

 * local_irq_enable_exit_to_user - Exit to user variant of local_irq_enable()

kernel/entry/common.c

+1 −31
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static inline void syscall_enter_audit(struct pt_regs *regs, long syscall) 
	}

}



static long syscall_trace_enter(struct pt_regs *regs, long syscall,

long syscall_trace_enter(struct pt_regs *regs, long syscall,

				unsigned long work)

{

	long ret = 0;
@@ -71,36 +71,6 @@ static long syscall_trace_enter(struct pt_regs *regs, long syscall, 
	return ret ? : syscall;

}



static __always_inline long

__syscall_enter_from_user_work(struct pt_regs *regs, long syscall)

{

	unsigned long work = READ_ONCE(current_thread_info()->syscall_work);



	if (work & SYSCALL_WORK_ENTER)

		syscall = syscall_trace_enter(regs, syscall, work);



	return syscall;

}



long syscall_enter_from_user_mode_work(struct pt_regs *regs, long syscall)

{

	return __syscall_enter_from_user_work(regs, syscall);

}



noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)

{

	long ret;



	enter_from_user_mode(regs);



	instrumentation_begin();

	local_irq_enable();

	ret = __syscall_enter_from_user_work(regs, syscall);

	instrumentation_end();



	return ret;

}



noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs)

{

	enter_from_user_mode(regs);