Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-09 14:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

entry: Move enter_from_user_mode() to header file

Browse Source 
To allow inlining of enter_from_user_mode(), move it to
entry-common.h.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20231218074520.1998026-3-svens@linux.ibm.com
This commit is contained in:
Sven Schnelle 2023-12-18 08:45:19 +01:00 committed by Thomas Gleixner
parent d680194719
commit caf4062e35
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/entry-common.h
View File

@ -11,6 +11,7 @@
#include <linux/livepatch.h> #include <linux/livepatch.h>
#include <linux/resume_user_mode.h> #include <linux/resume_user_mode.h>
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/kmsan.h>
#include <asm/entry-common.h> #include <asm/entry-common.h>
@ -102,7 +103,19 @@ static __always_inline void arch_enter_from_user_mode(struct pt_regs *regs) {}
* done between establishing state and enabling interrupts. The caller must * done between establishing state and enabling interrupts. The caller must
* enable interrupts before invoking syscall_enter_from_user_mode_work(). * enable interrupts before invoking syscall_enter_from_user_mode_work().
*/ */
void enter_from_user_mode(struct pt_regs *regs); static __always_inline void enter_from_user_mode(struct pt_regs *regs)
{
arch_enter_from_user_mode(regs);
lockdep_hardirqs_off(CALLER_ADDR0);
CT_WARN_ON(__ct_state() != CONTEXT_USER);
user_exit_irqoff();
instrumentation_begin();
kmsan_unpoison_entry_regs(regs);
trace_hardirqs_off_finish();
instrumentation_end();
}
/** /**
* syscall_enter_from_user_mode_prepare - Establish state and enable interrupts * syscall_enter_from_user_mode_prepare - Establish state and enable interrupts

26
kernel/entry/common.c
View File

@ -15,26 +15,6 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/syscalls.h> #include <trace/events/syscalls.h>
/* See comment for enter_from_user_mode() in entry-common.h */
static __always_inline void __enter_from_user_mode(struct pt_regs *regs)
{
arch_enter_from_user_mode(regs);
lockdep_hardirqs_off(CALLER_ADDR0);
CT_WARN_ON(__ct_state() != CONTEXT_USER);
user_exit_irqoff();
instrumentation_begin();
kmsan_unpoison_entry_regs(regs);
trace_hardirqs_off_finish();
instrumentation_end();
}
void noinstr enter_from_user_mode(struct pt_regs *regs)
{
__enter_from_user_mode(regs);
}
static inline void syscall_enter_audit(struct pt_regs *regs, long syscall) static inline void syscall_enter_audit(struct pt_regs *regs, long syscall)
{ {
if (unlikely(audit_context())) { if (unlikely(audit_context())) {
@ -105,7 +85,7 @@ noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)
{ {
long ret; long ret;
__enter_from_user_mode(regs); enter_from_user_mode(regs);
instrumentation_begin(); instrumentation_begin();
local_irq_enable(); local_irq_enable();
@ -117,7 +97,7 @@ noinstr long syscall_enter_from_user_mode(struct pt_regs *regs, long syscall)
noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs) noinstr void syscall_enter_from_user_mode_prepare(struct pt_regs *regs)
{ {
__enter_from_user_mode(regs); enter_from_user_mode(regs);
instrumentation_begin(); instrumentation_begin();
local_irq_enable(); local_irq_enable();
instrumentation_end(); instrumentation_end();
@ -266,7 +246,7 @@ __visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs)
noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs) noinstr void irqentry_enter_from_user_mode(struct pt_regs *regs)
{ {
__enter_from_user_mode(regs); enter_from_user_mode(regs);
} }
noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs)