core kernel fixes
Subsystems (5)
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Sigh ... this now looks a bit large for -rc3, due to the RCU cleanups. When i queued it up in -rc1 it looked acceptable :-/ Should we redo it again to extract the cleanups from the fixes (which cause most of the diffstat increase)?
Thanks,
Ingo
------------------>
Aaro Koskinen (1):
panic: Fix panic message visibility by calling bust_spinlocks(0) before dying
Anton Blanchard (1):
futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions
Darren Hart (1):
futex: fix requeue_pi key imbalance
Paul E. McKenney (10):
rcu: Clean up code based on review feedback from Josh Triplett
rcu: Clean up code based on review feedback from Josh Triplett, part 2
rcu: Clean up code to address Ingo's checkpatch feedback
rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y
rcu: Clean up code based on review feedback from Josh Triplett, part 3
rcu: Clean up code based on review feedback from Josh Triplett, part 4
rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function
rcu: Move rcu_barrier() to rcutree
rcu: Make hot-unplugged CPU relinquish its own RCU callbacks
rcu: Place root rcu_node structure in separate lockdep class
Peter Zijlstra (1):
futex: Nullify robust lists after cleanup
Thomas Gleixner (2):
futex: Fix locking imbalance
futex: Move exit_pi_state() call to release_mm()
include/linux/futex.h | 4 +- include/linux/rcupdate.h | 18 ++- include/linux/rcutree.h | 13 +- init/main.c | 1 - kernel/exit.c | 2 - kernel/fork.c | 10 +- kernel/futex.c | 3 +- kernel/panic.c | 3 +- kernel/rcupdate.c | 140 +------------------- kernel/rcutorture.c | 4 +- kernel/rcutree.c | 330 ++++++++++++++++++++++++++++++---------------- kernel/rcutree.h | 86 ++++++++++-- kernel/rcutree_plugin.h | 103 +++++++++++---- kernel/rcutree_trace.c | 14 +- 14 files changed, 410 insertions(+), 321 deletions(-)
include/linux/futex.h +2 -2
@@ -38,8 +38,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) +#define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG)#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ FUTEX_PRIVATE_FLAG)#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \
include/linux/rcupdate.h +11 -7
@@ -77,7 +77,7 @@ extern int rcu_scheduler_active;#error "Unknown RCU implementation specified to kernel configuration"#endif -#define RCU_HEAD_INIT { .next = NULL, .func = NULL } +#define RCU_HEAD_INIT { .next = NULL, .func = NULL }#define RCU_HEAD (head) struct rcu_head head = RCU_HEAD_INIT#define INIT_RCU_HEAD (ptr) do { \ (ptr)->next = NULL; (ptr)->func = NULL; \
@@ -129,12 +129,6 @@ static inline void rcu_read_lock(void)rcu_read_acquire (); } -/** -* rcu_read_unlock - marks the end of an RCU read-side critical section. -* -* See rcu_read_lock() for more information. -*/ -/* * So where is rcu_write_lock()? It does not exist, as there is no * way for writers to lock out RCU readers. This is a feature, not
@@ -144,6 +138,12 @@ static inline void rcu_read_lock(void)* used as well. RCU does not care how the writers keep out of each * others' way, as long as they do so. */ + +/** +* rcu_read_unlock - marks the end of an RCU read-side critical section. +* +* See rcu_read_lock() for more information. +*/ static inline void rcu_read_unlock (void ) {rcu_read_release ();
@@ -196,6 +196,8 @@ static inline void rcu_read_lock_sched(void)__acquire (RCU_SCHED );rcu_read_acquire (); } + +/* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */ static inline notrace void rcu_read_lock_sched_notrace(void) {preempt_disable_notrace ();
@@ -213,6 +215,8 @@ static inline void rcu_read_unlock_sched(void)__release (RCU_SCHED );preempt_enable (); } + +/* Used by lockdep and tracing: cannot be traced, cannot call lockdep. */ static inline notrace void rcu_read_unlock_sched_notrace(void) {__release (RCU_SCHED );
include/linux/rcutree.h +6 -7
@@ -30,10 +30,14 @@#ifndef __LINUX_RCUTREE_H#define __LINUX_RCUTREE_H +struct notifier_block ; +extern void rcu_sched_qs (int cpu);extern void rcu_bh_qs (int cpu); - +extern int rcu_cpu_notify (struct notifier_block *self, +unsigned long action,void *hcpu);extern int rcu_needs_cpu (int cpu); +extern int rcu_expedited_torture_stats (char *page);#ifdef CONFIG_TREE_PREEMPT_RCU
@@ -85,16 +89,11 @@ static inline void synchronize_rcu_bh_expedited(void)extern void __rcu_init (void );extern void rcu_check_callbacks (int cpu,int user); -extern void rcu_restart_cpu (int cpu);extern long rcu_batches_completed (void );extern long rcu_batches_completed_bh (void );extern long rcu_batches_completed_sched (void ); -static inline void rcu_init_sched (void ) -{ -} -#ifdef CONFIG_NO_HZ void rcu_enter_nohz (void );void rcu_exit_nohz (void );
@@ -107,7 +106,7 @@ static inline void rcu_exit_nohz(void) }#endif /* CONFIG_NO_HZ */ -/* A context switch is a grace period for rcutree. */ +/* A context switch is a grace period for RCU-sched and RCU-bh. */ static inline int rcu_blocking_is_gp (void ) {return num_online_cpus () ==1 ;
init/main.c +0 -1
@@ -782,7 +782,6 @@ static void __init do_initcalls(void)*/ static void __init do_basic_setup (void ) { -rcu_init_sched ();/* needed by module_init stage. */ init_workqueues ();cpuset_init_smp ();usermodehelper_init ();
kernel/exit.c +0 -2
@@ -989,8 +989,6 @@ NORET_TYPE void do_exit(long code) tsk->mempolicy =NULL ;#endif #ifdef CONFIG_FUTEX -if (unlikely (!list_empty (&tsk->pi_state_list))) -exit_pi_state_list (tsk);if (unlikely (current->pi_state_cache))kfree (current->pi_state_cache);#endif
kernel/fork.c +8 -2
@@ -543,12 +543,18 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)/* Get rid of any futexes when releasing the mm */ #ifdef CONFIG_FUTEX -if (unlikely (tsk->robust_list)) +if (unlikely (tsk->robust_list)) {exit_robust_list (tsk); + tsk->robust_list =NULL ; + }#ifdef CONFIG_COMPAT -if (unlikely (tsk->compat_robust_list)) +if (unlikely (tsk->compat_robust_list)) {compat_exit_robust_list (tsk); + tsk->compat_robust_list =NULL ; + }#endif +if (unlikely (!list_empty (&tsk->pi_state_list))) +exit_pi_state_list (tsk);#endif /* Get rid of any cached register state */
kernel/futex.c +1 -2
@@ -916,8 +916,8 @@ retry: hb1 =hash_futex (&key1); hb2 =hash_futex (&key2); -double_lock_hb (hb1, hb2); retry_private: +double_lock_hb (hb1, hb2); op_ret =futex_atomic_op_inuser (op, uaddr2);if (unlikely (op_ret <0 )) {
@@ -2111,7 +2111,6 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,* Unqueue the futex_q and determine which it was. */ plist_del (&q->list, &q->list.plist); -drop_futex_key_refs (&q->key);if (timeout && !timeout->task) ret = -ETIMEDOUT ;
kernel/panic.c +2 -1
@@ -90,6 +90,8 @@ NORET_TYPE void panic(const char * fmt, ...)atomic_notifier_call_chain (&panic_notifier_list,0 , buf); +bust_spinlocks (0 ); +if (!panic_blink) panic_blink = no_blink;
@@ -136,7 +138,6 @@ NORET_TYPE void panic(const char * fmt, ...)mdelay (1 ); i++; } -bust_spinlocks (0 ); }EXPORT_SYMBOL (panic);
kernel/rcupdate.c +7 -133
158 lines not on this page · raw message
kernel/rcutorture.c +1 -3
@@ -606,8 +606,6 @@ static struct rcu_torture_ops sched_ops_sync = { .name = "sched_sync" }; -extern int rcu_expedited_torture_stats (char *page); -static struct rcu_torture_ops sched_expedited_ops = { .init = rcu_sync_torture_init, .cleanup =NULL ,
@@ -650,7 +648,7 @@ rcu_torture_writer(void *arg) old_rp = rcu_torture_current; rp->rtort_mbtest =1 ;rcu_assign_pointer (rcu_torture_current, rp); -smp_wmb (); +smp_wmb ();/* Mods to old_rp must follow rcu_assign_pointer() */ if (old_rp) { i = old_rp->rtort_pipe_count;if (i >RCU_TORTURE_PIPE_LEN )
kernel/rcutree.c +216 -114
521 lines not on this page · raw message
kernel/rcutree.h +73 -13
142 lines not on this page · raw message
kernel/rcutree_plugin.h +76 -27
185 lines not on this page · raw message
kernel/rcutree_trace.c +7 -7
@@ -93,7 +93,7 @@ static int rcudata_open(struct inode *inode, struct file *file)return single_open (file, show_rcudata,NULL ); } -static struct file_operations rcudata_fops = { +static const struct file_operations rcudata_fops = { .owner =THIS_MODULE , .open = rcudata_open, .read = seq_read,
@@ -145,7 +145,7 @@ static int rcudata_csv_open(struct inode *inode, struct file *file)return single_open (file, show_rcudata_csv,NULL ); } -static struct file_operations rcudata_csv_fops = { +static const struct file_operations rcudata_csv_fops = { .owner =THIS_MODULE , .open = rcudata_csv_open, .read = seq_read,
@@ -159,13 +159,13 @@ static void print_one_rcu_state(struct seq_file *m, struct rcu_state *rsp)struct rcu_node *rnp;seq_printf (m,"c=%ld g=%ld s=%d jfq=%ld j=%x " -"nfqs=%lu/nfqsng=%lu(%lu) fqlh=%lu\n" , +"nfqs=%lu/nfqsng=%lu(%lu) fqlh=%lu oqlen=%ld\n" , rsp->completed, rsp->gpnum, rsp->signaled, (long )(rsp->jiffies_force_qs - jiffies), (int )(jiffies &0xffff ), rsp->n_force_qs, rsp->n_force_qs_ngp, rsp->n_force_qs - rsp->n_force_qs_ngp, - rsp->n_force_qs_lh); + rsp->n_force_qs_lh, rsp->orphan_qlen);for (rnp = &rsp->node[0 ]; rnp - &rsp->node[0 ] <NUM_RCU_NODES ; rnp++) {if (rnp->level != level) {seq_puts (m,"\n" );
@@ -196,7 +196,7 @@ static int rcuhier_open(struct inode *inode, struct file *file)return single_open (file, show_rcuhier,NULL ); } -static struct file_operations rcuhier_fops = { +static const struct file_operations rcuhier_fops = { .owner =THIS_MODULE , .open = rcuhier_open, .read = seq_read,
@@ -222,7 +222,7 @@ static int rcugp_open(struct inode *inode, struct file *file)return single_open (file, show_rcugp,NULL ); } -static struct file_operations rcugp_fops = { +static const struct file_operations rcugp_fops = { .owner =THIS_MODULE , .open = rcugp_open, .read = seq_read,
@@ -276,7 +276,7 @@ static int rcu_pending_open(struct inode *inode, struct file *file)return single_open (file, show_rcu_pending,NULL ); } -static struct file_operations rcu_pending_fops = { +static const struct file_operations rcu_pending_fops = { .owner =THIS_MODULE , .open = rcu_pending_open, .read = seq_read,
Quoted 9 lines · Ingo Molnar
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitcore-fixes-for-linusSigh ... this now looks a bit large for -rc3, due to the RCU cleanups. When i queued it up in -rc1 it looked acceptable :-/ Should we redo it again to extract the cleanups from the fixes (which cause most of the diffstat increase)?
Gaah.
Looking at the actual patch, it looks ok to me. But I really would have preferred to see just fixes by now.
But I'll take it this way.
Linus
Quoted 13 lines · Linus Torvalds
Quoted 9 lines · Ingo Molnar
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitcore-fixes-for-linusSigh ... this now looks a bit large for -rc3, due to the RCU cleanups. When i queued it up in -rc1 it looked acceptable :-/ Should we redo it again to extract the cleanups from the fixes (which cause most of the diffstat increase)?
Quoted 6 lines
Gaah.
Looking at the actual patch, it looks ok to me. But I really would have preferred to see just fixes by now.
But I'll take it this way.
Thanks. Will be more careful ...
Ingo