diff options
Diffstat (limited to 'include/linux/thread_info.h')
| -rw-r--r-- | include/linux/thread_info.h | 128 |
1 files changed, 93 insertions, 35 deletions
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index d252f45a0f9..ff307b548ed 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -7,12 +7,45 @@ #ifndef _LINUX_THREAD_INFO_H #define _LINUX_THREAD_INFO_H +#include <linux/types.h> +#include <linux/bug.h> + +struct timespec; +struct compat_timespec; + /* - * System call restart block. + * System call restart block. */ struct restart_block { long (*fn)(struct restart_block *); - unsigned long arg0, arg1, arg2, arg3; + union { + /* For futex_wait and futex_wait_requeue_pi */ + struct { + u32 __user *uaddr; + u32 val; + u32 flags; + u32 bitset; + u64 time; + u32 __user *uaddr2; + } futex; + /* For nanosleep */ + struct { + clockid_t clockid; + struct timespec __user *rmtp; +#ifdef CONFIG_COMPAT + struct compat_timespec __user *compat_rmtp; +#endif + u64 expires; + } nanosleep; + /* For poll */ + struct { + struct pollfd __user *ufds; + int nfds; + int has_timeout; + unsigned long tv_sec; + unsigned long tv_nsec; + } poll; + }; }; extern long do_no_restart_syscall(struct restart_block *parm); @@ -22,71 +55,96 @@ extern long do_no_restart_syscall(struct restart_block *parm); #ifdef __KERNEL__ +#ifdef CONFIG_DEBUG_STACK_USAGE +# define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO) +#else +# define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK) +#endif + /* * flag set/clear/test wrappers * - pass TIF_xxxx constants to these functions */ -static inline void set_thread_flag(int flag) +static inline void set_ti_thread_flag(struct thread_info *ti, int flag) { - set_bit(flag,¤t_thread_info()->flags); + set_bit(flag, (unsigned long *)&ti->flags); } -static inline void clear_thread_flag(int flag) +static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) { - clear_bit(flag,¤t_thread_info()->flags); + clear_bit(flag, (unsigned long *)&ti->flags); } -static inline int test_and_set_thread_flag(int flag) +static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) { - return test_and_set_bit(flag,¤t_thread_info()->flags); + return test_and_set_bit(flag, (unsigned long *)&ti->flags); } -static inline int test_and_clear_thread_flag(int flag) +static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) { - return test_and_clear_bit(flag,¤t_thread_info()->flags); + return test_and_clear_bit(flag, (unsigned long *)&ti->flags); } -static inline int test_thread_flag(int flag) +static inline int test_ti_thread_flag(struct thread_info *ti, int flag) { - return test_bit(flag,¤t_thread_info()->flags); + return test_bit(flag, (unsigned long *)&ti->flags); } -static inline void set_ti_thread_flag(struct thread_info *ti, int flag) -{ - set_bit(flag,&ti->flags); -} +#define set_thread_flag(flag) \ + set_ti_thread_flag(current_thread_info(), flag) +#define clear_thread_flag(flag) \ + clear_ti_thread_flag(current_thread_info(), flag) +#define test_and_set_thread_flag(flag) \ + test_and_set_ti_thread_flag(current_thread_info(), flag) +#define test_and_clear_thread_flag(flag) \ + test_and_clear_ti_thread_flag(current_thread_info(), flag) +#define test_thread_flag(flag) \ + test_ti_thread_flag(current_thread_info(), flag) -static inline void clear_ti_thread_flag(struct thread_info *ti, int flag) -{ - clear_bit(flag,&ti->flags); -} +#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED) -static inline int test_and_set_ti_thread_flag(struct thread_info *ti, int flag) -{ - return test_and_set_bit(flag,&ti->flags); -} +#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK +/* + * An arch can define its own version of set_restore_sigmask() to get the + * job done however works, with or without TIF_RESTORE_SIGMASK. + */ +#define HAVE_SET_RESTORE_SIGMASK 1 -static inline int test_and_clear_ti_thread_flag(struct thread_info *ti, int flag) +/** + * set_restore_sigmask() - make sure saved_sigmask processing gets done + * + * This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code + * will run before returning to user mode, to process the flag. For + * all callers, TIF_SIGPENDING is already set or it's no harm to set + * it. TIF_RESTORE_SIGMASK need not be in the set of bits that the + * arch code will notice on return to user mode, in case those bits + * are scarce. We set TIF_SIGPENDING here to ensure that the arch + * signal code always gets run when TIF_RESTORE_SIGMASK is set. + */ +static inline void set_restore_sigmask(void) { - return test_and_clear_bit(flag,&ti->flags); + set_thread_flag(TIF_RESTORE_SIGMASK); + WARN_ON(!test_thread_flag(TIF_SIGPENDING)); } - -static inline int test_ti_thread_flag(struct thread_info *ti, int flag) +static inline void clear_restore_sigmask(void) { - return test_bit(flag,&ti->flags); + clear_thread_flag(TIF_RESTORE_SIGMASK); } - -static inline void set_need_resched(void) +static inline bool test_restore_sigmask(void) { - set_thread_flag(TIF_NEED_RESCHED); + return test_thread_flag(TIF_RESTORE_SIGMASK); } - -static inline void clear_need_resched(void) +static inline bool test_and_clear_restore_sigmask(void) { - clear_thread_flag(TIF_NEED_RESCHED); + return test_and_clear_thread_flag(TIF_RESTORE_SIGMASK); } +#endif /* TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK */ +#ifndef HAVE_SET_RESTORE_SIGMASK +#error "no set_restore_sigmask() provided and default one won't work" #endif +#endif /* __KERNEL__ */ + #endif /* _LINUX_THREAD_INFO_H */ |