scheduler and futex updates
Subsystems (6)
Linus, please pull the latest scheduler git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched.git
Fixes, plus the futex "bitset filter" conditional futex wakeup API variant that Ulrich asked for to reduce the number of false wakeups in user-space rwlocks. Thanks,
Ingo
------------------>
Heiko Carstens (1):
latencytop: Change Kconfig dependency.
Peter Zijlstra (1):
hrtimer: fix hrtimer_init_sleeper() users
Thomas Gleixner (5):
timekeeping: update xtime_cache when time(zone) changes
tick-sched: add more debug information
x86: replace LOCK_PREFIX in futex.h
futex: Remove warn on in return fixup path
futex: Add bitset conditional wait/wakeup functionality
arch/x86/Kconfig | 3 +++ include/asm-x86/futex.h | 6 +++--- include/linux/futex.h | 10 ++++++++++ include/linux/thread_info.h | 1 + include/linux/tick.h | 4 ++++ include/linux/time.h | 1 + kernel/futex.c | 42 ++++++++++++++++++++++++++++++++---------- kernel/futex_compat.c | 3 ++- kernel/hrtimer.c | 2 ++ kernel/time.c | 1 + kernel/time/tick-sched.c | 2 ++ kernel/time/timekeeping.c | 6 ++++-- kernel/time/timer_list.c | 2 ++ lib/Kconfig.debug | 2 +- 14 files changed, 68 insertions(+), 17 deletions(-)
arch/x86/Kconfig +3 -0
@@ -44,6 +44,9 @@ config LOCKDEP_SUPPORT config STACKTRACE_SUPPORT def_bool y +config HAVE_LATENCYTOP_SUPPORT + def_bool y + config SEMAPHORE_SLEEPERS def_bool y
include/asm-x86/futex.h +3 -3
@@ -30,7 +30,7 @@"1: movl %2, %0\n \ movl %0, %3\n" \ insn"\n" \ -"2: " LOCK_PREFIX "cmpxchgl %3, %2\n \ +"2: lock; cmpxchgl %3, %2\n \ jnz 1b\n \ 3: .section .fixup,\"ax\"\n \ 4: mov %5, %1\n \
@@ -72,7 +72,7 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr)__futex_atomic_op1 ("xchgl %0, %2" , ret, oldval, uaddr, oparg);break ;case FUTEX_OP_ADD : -__futex_atomic_op1 (LOCK_PREFIX "xaddl %0, %2" , ret, oldval, +__futex_atomic_op1 ("lock; xaddl %0, %2" , ret, oldval, uaddr, oparg);break ;case FUTEX_OP_OR :
@@ -111,8 +111,8 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)return -EFAULT ; __asm__ __volatile__( -"1: " LOCK_PREFIX "cmpxchgl %3, %1 \n" +"1: lock; cmpxchgl %3, %1 \n" "2: .section .fixup, \"ax\" \n" "3: mov %2, %0 \n" " jmp 2b \n"
include/linux/futex.h +10 -0
@@ -21,6 +21,8 @@ union ktime;#define FUTEX_LOCK_PI 6#define FUTEX_UNLOCK_PI 7#define FUTEX_TRYLOCK_PI 8 +#define FUTEX_WAIT_BITSET 9 +#define FUTEX_WAKE_BITSET 10#define FUTEX_PRIVATE_FLAG 128#define FUTEX_CMD_MASK ~FUTEX_PRIVATE_FLAG
@@ -33,6 +35,8 @@ union ktime;#define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG)#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG)#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITS | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITS | FUTEX_PRIVATE_FLAG)/* * Support for robust futexes: the kernel cleans up held futexes at
@@ -111,6 +115,12 @@ struct robust_list_head {*/ #define ROBUST_LIST_LIMIT 2048 +/* +* bitset with all bits set for the FUTEX_xxx_BITSET OPs to request a +* match of any bit. +*/ +#define FUTEX_BITSET_MATCH_ANY 0xffffffff +#ifdef __KERNEL__long do_futex (u32 __user *uaddr,int op,u32 val,union ktime *timeout,u32 __user *uaddr2,u32 val2,u32 val3);
include/linux/thread_info.h +1 -0
@@ -23,6 +23,7 @@ struct restart_block {u32 *uaddr;u32 val;u32 flags; +u32 bitset;u64 time; } futex; };
include/linux/tick.h +4 -0
@@ -39,6 +39,8 @@ enum tick_nohz_mode {* @idle_calls: Total number of idle calls * @idle_sleeps: Number of idle calls, where the sched tick was stopped * @idle_entrytime: Time when the idle call was entered +* @idle_waketime: Time when the idle was interrupted +* @idle_exittime: Time when the idle state was left * @idle_sleeptime: Sum of the time slept in idle with sched tick stopped * @sleep_length: Duration of the current idle sleep */
@@ -53,6 +55,8 @@ struct tick_sched {unsigned long idle_sleeps;int idle_active;ktime_t idle_entrytime; +ktime_t idle_waketime; +ktime_t idle_exittime;ktime_t idle_sleeptime;ktime_t idle_lastupdate;ktime_t sleep_length;
include/linux/time.h +1 -0
@@ -122,6 +122,7 @@ extern void monotonic_to_bootbased(struct timespec *ts);extern struct timespec timespec_trunc (struct timespec t,unsigned gran);extern int timekeeping_is_continuous (void );extern void update_wall_time (void ); +extern void update_xtime_cache (u64 nsec);/** * timespec_to_ns - Convert timespec to nanoseconds
kernel/futex.c +32 -10
123 lines not on this page · raw message
kernel/futex_compat.c +2 -1
@@ -167,7 +167,8 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,int val2 =0 ;int cmd = op &FUTEX_CMD_MASK ; -if (utime && (cmd ==FUTEX_WAIT || cmd ==FUTEX_LOCK_PI )) { +if (utime && (cmd ==FUTEX_WAIT || cmd ==FUTEX_LOCK_PI || + cmd ==FUTEX_WAIT_BITSET )) {if (get_compat_timespec (&ts, utime))return -EFAULT ;if (!timespec_valid (&ts))
kernel/hrtimer.c +2 -0
@@ -1315,6 +1315,8 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod }while (t->task && !signal_pending (current)); +__set_current_state (TASK_RUNNING ); +return t->task ==NULL ; }
kernel/time.c +1 -0
@@ -129,6 +129,7 @@ static inline void warp_clock(void)write_seqlock_irq (&xtime_lock); wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest *60 ; xtime.tv_sec += sys_tz.tz_minuteswest *60 ; +update_xtime_cache (0 );write_sequnlock_irq (&xtime_lock);clock_was_set (); }
kernel/time/tick-sched.c +2 -0
@@ -137,6 +137,7 @@ void tick_nohz_update_jiffies(void)cpu_clear (cpu, nohz_cpu_mask); now =ktime_get (); + ts->idle_waketime = now;local_irq_save (flags);tick_do_update_jiffies64 (now);
@@ -400,6 +401,7 @@ void tick_nohz_restart_sched_tick(void)* Cancel the scheduled timer and restore the tick */ ts->tick_stopped =0 ; + ts->idle_exittime = now;hrtimer_cancel (&ts->sched_timer); ts->sched_timer.expires = ts->idle_tick;
kernel/time/timekeeping.c +4 -2
@@ -47,7 +47,7 @@ struct timespec wall_to_monotonic __attribute__ ((aligned (16)));static unsigned long total_sleep_time;/* seconds */ static struct timespec xtime_cache __attribute__ ((aligned (16))); -static inline void update_xtime_cache (u64 nsec) +void update_xtime_cache (u64 nsec) { xtime_cache = xtime;timespec_add_ns (&xtime_cache, nsec);
@@ -145,6 +145,7 @@ int do_settimeofday(struct timespec *tv)set_normalized_timespec (&xtime, sec, nsec);set_normalized_timespec (&wall_to_monotonic, wtm_sec, wtm_nsec); +update_xtime_cache (0 ); clock->error =0 ;ntp_clear ();
@@ -252,8 +253,8 @@ void __init timekeeping_init(void) xtime.tv_nsec =0 ;set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); +update_xtime_cache (0 ); total_sleep_time =0 ; -write_sequnlock_irqrestore (&xtime_lock, flags); }
@@ -290,6 +291,7 @@ static int timekeeping_resume(struct sys_device *dev) }/* Make sure that we have the correct xtime reference */ timespec_add_ns (&xtime, timekeeping_suspend_nsecs); +update_xtime_cache (0 );/* re-base the last cycle value */ clock->cycle_last =clocksource_read (clock); clock->error =0 ;
kernel/time/timer_list.c +2 -0
@@ -166,6 +166,8 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)P (idle_calls);P (idle_sleeps);P_ns (idle_entrytime); +P_ns (idle_waketime); +P_ns (idle_exittime);P_ns (idle_sleeptime);P (last_jiffies);P (next_jiffies);
lib/Kconfig.debug +1 -1
@@ -581,7 +581,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS select SCHED_DEBUG - depends on X86 || X86_64 + depends on HAVE_LATENCYTOP_SUPPORT help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations.