AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 00:00:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()

Browse Source 
commit 5abbe51a526253b9f003e9a0a195638dc882d660 upstream.

Preparation for fixing get_nr_restart_syscall() on X86 for COMPAT.

Add a new helper which sets restart_block->fn and calls a dummy
arch_set_restart_data() helper.

Fixes: 609c19a385 ("x86/ptrace: Stop setting TS_COMPAT in ptrace code")
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210201174641.GA17871@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Nesterov 2021-02-01 18:46:41 +01:00 committed by Greg Kroah-Hartman
parent 0e245256e3
commit 4523e648b7
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/select.c
View File

@ -1055,10 +1055,9 @@ static long do_restart_poll(struct restart_block *restart_block)
ret = do_sys_poll(ufds, nfds, to); ret = do_sys_poll(ufds, nfds, to);
if (ret == -ERESTARTNOHAND) { if (ret == -ERESTARTNOHAND)
restart_block->fn = do_restart_poll; ret = set_restart_fn(restart_block, do_restart_poll);
ret = -ERESTART_RESTARTBLOCK;
}
return ret; return ret;
} }
@ -1080,7 +1079,6 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
struct restart_block *restart_block; struct restart_block *restart_block;
restart_block = &current->restart_block; restart_block = &current->restart_block;
restart_block->fn = do_restart_poll;
restart_block->poll.ufds = ufds; restart_block->poll.ufds = ufds;
restart_block->poll.nfds = nfds; restart_block->poll.nfds = nfds;
@ -1091,7 +1089,7 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
} else } else
restart_block->poll.has_timeout = 0; restart_block->poll.has_timeout = 0;
ret = -ERESTART_RESTARTBLOCK; ret = set_restart_fn(restart_block, do_restart_poll);
} }
return ret; return ret;
} }

13
include/linux/thread_info.h
View File

@ -11,6 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/restart_block.h> #include <linux/restart_block.h>
#include <linux/errno.h>
#ifdef CONFIG_THREAD_INFO_IN_TASK #ifdef CONFIG_THREAD_INFO_IN_TASK
/* /*
@ -39,6 +40,18 @@ enum {
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef arch_set_restart_data
#define arch_set_restart_data(restart) do { } while (0)
#endif
static inline long set_restart_fn(struct restart_block *restart,
long (*fn)(struct restart_block *))
{
restart->fn = fn;
arch_set_restart_data(restart);
return -ERESTART_RESTARTBLOCK;
}
#ifndef THREAD_ALIGN #ifndef THREAD_ALIGN
#define THREAD_ALIGN THREAD_SIZE #define THREAD_ALIGN THREAD_SIZE
#endif #endif

3
kernel/futex.c
View File

@ -2730,14 +2730,13 @@ static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val,
goto out; goto out;
restart = &current->restart_block; restart = &current->restart_block;
restart->fn = futex_wait_restart;
restart->futex.uaddr = uaddr; restart->futex.uaddr = uaddr;
restart->futex.val = val; restart->futex.val = val;
restart->futex.time = *abs_time; restart->futex.time = *abs_time;
restart->futex.bitset = bitset; restart->futex.bitset = bitset;
restart->futex.flags = flags | FLAGS_HAS_TIMEOUT; restart->futex.flags = flags | FLAGS_HAS_TIMEOUT;
ret = -ERESTART_RESTARTBLOCK; ret = set_restart_fn(restart, futex_wait_restart);
out: out:
if (to) { if (to) {

2
kernel/time/alarmtimer.c
View File

@ -848,9 +848,9 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
if (flags == TIMER_ABSTIME) if (flags == TIMER_ABSTIME)
return -ERESTARTNOHAND; return -ERESTARTNOHAND;
restart->fn = alarm_timer_nsleep_restart;
restart->nanosleep.clockid = type; restart->nanosleep.clockid = type;
restart->nanosleep.expires = exp; restart->nanosleep.expires = exp;
set_restart_fn(restart, alarm_timer_nsleep_restart);
return ret; return ret;
} }

2
kernel/time/hrtimer.c
View File

@ -1957,9 +1957,9 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
} }
restart = &current->restart_block; restart = &current->restart_block;
restart->fn = hrtimer_nanosleep_restart;
restart->nanosleep.clockid = t.timer.base->clockid; restart->nanosleep.clockid = t.timer.base->clockid;
restart->nanosleep.expires = hrtimer_get_expires_tv64(&t.timer); restart->nanosleep.expires = hrtimer_get_expires_tv64(&t.timer);
set_restart_fn(restart, hrtimer_nanosleep_restart);
out: out:
destroy_hrtimer_on_stack(&t.timer); destroy_hrtimer_on_stack(&t.timer);
return ret; return ret;

2
kernel/time/posix-cpu-timers.c
View File

@ -1480,8 +1480,8 @@ static int posix_cpu_nsleep(const clockid_t which_clock, int flags,
if (flags & TIMER_ABSTIME) if (flags & TIMER_ABSTIME)
return -ERESTARTNOHAND; return -ERESTARTNOHAND;
restart_block->fn = posix_cpu_nsleep_restart;
restart_block->nanosleep.clockid = which_clock; restart_block->nanosleep.clockid = which_clock;
set_restart_fn(restart_block, posix_cpu_nsleep_restart);
} }
return error; return error;
} }