summaryrefslogtreecommitdiff
path: root/kernel/entry
diff options
context:
space:
mode:
authorGabriel Krisman Bertazi <krisman@collabora.com>2020-11-16 12:42:05 -0500
committerThomas Gleixner <tglx@linutronix.de>2020-11-16 21:53:16 +0100
commit2991552447707d791d9d81a5dc161f9e9e90b163 (patch)
treefe3bfcd05ede91fcf00c1eb00ed3eaadc3886ac2 /kernel/entry
parent785dc4eb7fd74e3b7f4eac468457b633117e1aea (diff)
downloadlwn-2991552447707d791d9d81a5dc161f9e9e90b163.tar.gz
lwn-2991552447707d791d9d81a5dc161f9e9e90b163.zip
entry: Drop usage of TIF flags in the generic syscall code
Now that the flags migration in the common syscall entry code is complete and the code relies exclusively on thread_info::syscall_work, clean up the accesses to TI flags in that path. Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Andy Lutomirski <luto@kernel.org> Link: https://lore.kernel.org/r/20201116174206.2639648-10-krisman@collabora.com
Diffstat (limited to 'kernel/entry')
-rw-r--r--kernel/entry/common.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 90533f34ea99..91e8fd50adf4 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -42,7 +42,7 @@ static inline void syscall_enter_audit(struct pt_regs *regs, long syscall)
}
static long syscall_trace_enter(struct pt_regs *regs, long syscall,
- unsigned long ti_work, unsigned long work)
+ unsigned long work)
{
long ret = 0;
@@ -75,11 +75,9 @@ 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);
- unsigned long ti_work;
- ti_work = READ_ONCE(current_thread_info()->flags);
- if (work & SYSCALL_WORK_ENTER || ti_work & SYSCALL_ENTER_WORK)
- syscall = syscall_trace_enter(regs, syscall, ti_work, work);
+ if (work & SYSCALL_WORK_ENTER)
+ syscall = syscall_trace_enter(regs, syscall, work);
return syscall;
}
@@ -227,8 +225,8 @@ static inline bool report_single_step(unsigned long work)
}
#endif
-static void syscall_exit_work(struct pt_regs *regs, unsigned long ti_work,
- unsigned long work)
+
+static void syscall_exit_work(struct pt_regs *regs, unsigned long work)
{
bool step;
@@ -249,7 +247,6 @@ static void syscall_exit_work(struct pt_regs *regs, unsigned long ti_work,
static void syscall_exit_to_user_mode_prepare(struct pt_regs *regs)
{
unsigned long work = READ_ONCE(current_thread_info()->syscall_work);
- u32 cached_flags = READ_ONCE(current_thread_info()->flags);
unsigned long nr = syscall_get_nr(current, regs);
CT_WARN_ON(ct_state() != CONTEXT_KERNEL);
@@ -266,8 +263,8 @@ static void syscall_exit_to_user_mode_prepare(struct pt_regs *regs)
* enabled, we want to run them exactly once per syscall exit with
* interrupts enabled.
*/
- if (unlikely(work & SYSCALL_WORK_EXIT || cached_flags & SYSCALL_EXIT_WORK))
- syscall_exit_work(regs, cached_flags, work);
+ if (unlikely(work & SYSCALL_WORK_EXIT))
+ syscall_exit_work(regs, work);
}
__visible noinstr void syscall_exit_to_user_mode(struct pt_regs *regs)