summaryrefslogtreecommitdiff
path: root/kernel/entry
diff options
context:
space:
mode:
authorSven Schnelle <svens@linux.ibm.com>2020-12-01 15:27:53 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-12-02 15:07:57 +0100
commit96e2fbccd0fc806364a964fdf072bfc858a66109 (patch)
treee794e017f180e4e8578b2f97bb50e213f3910531 /kernel/entry
parentbb793562f0da7317adf6c456316bca651ff46f5d (diff)
entry_Add_enter_from_user_mode_wrapper
To be called from architecture specific code if the combo interfaces are not suitable. It simply calls __enter_from_user_mode(). This way __enter_from_user_mode will still be inlined because it is declared static __always_inline. [ tglx: Amend comments and move it to a different location in the header ] Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20201201142755.31931-4-svens@linux.ibm.com
Diffstat (limited to 'kernel/entry')
-rw-r--r--kernel/entry/common.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index dff07b4ce6ec..17b1e032afe7 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -10,16 +10,7 @@
#define CREATE_TRACE_POINTS
#include <trace/events/syscalls.h>
-/**
- * __enter_from_user_mode - Establish state when coming from user mode
- *
- * Syscall/interrupt entry disables interrupts, but user mode is traced as
- * interrupts enabled. Also with NO_HZ_FULL RCU might be idle.
- *
- * 1) Tell lockdep that interrupts are disabled
- * 2) Invoke context tracking if enabled to reactivate RCU
- * 3) Trace interrupts off state
- */
+/* See comment for enter_from_user_mode() in entry-common.h */
static __always_inline void __enter_from_user_mode(struct pt_regs *regs)
{
arch_check_user_regs(regs);
@@ -33,6 +24,11 @@ static __always_inline void __enter_from_user_mode(struct pt_regs *regs)
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)
{
if (unlikely(audit_context())) {