core kernel (RCU mostly) fixes
Linus,
Please consider pulling 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
I'm sending this as an RFC pull request because this is bigger and has non-fix elements: the result of tree-rcu becoming the default and getting extra review scrutiny. The CPU hotplug fixes are a result of that review as well, which pulled in the cleanups and rcutiny (which were earlier commits).
It seems fine and stable to me (and rcutiny is non-default), but we could also restructure it, separate out the cpu-hotplug fixes/cleanups alone if you think it's too late for the tree in this form.
Thanks,
Ingo
------------------>
Aaro Koskinen (1):
panic: Fix panic message visibility by calling bust_spinlocks(0) before dying
Jin Dongming (1):
rcu: Clean up the warning message about RCU not defined
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-tiny: The Bloatwatch Edition, v6
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, make lightweight rcu_barrier() for rcutiny
rcu: Make hot-unplugged CPU relinquish its own RCU callbacks
include/linux/hardirq.h | 24 ++++ include/linux/rcupdate.h | 24 +++- include/linux/rcutiny.h | 103 +++++++++++++++ include/linux/rcutree.h | 13 +- init/Kconfig | 9 ++ init/main.c | 1 - kernel/Makefile | 1 + kernel/panic.c | 3 +- kernel/rcupdate.c | 142 ++------------------- kernel/rcutiny.c | 281 +++++++++++++++++++++++++++++++++++++++ kernel/rcutorture.c | 4 +- kernel/rcutree.c | 326 ++++++++++++++++++++++++++++++---------------- kernel/rcutree.h | 86 ++++++++++-- kernel/rcutree_plugin.h | 103 +++++++++++---- kernel/rcutree_trace.c | 14 +- 15 files changed, 823 insertions(+), 311 deletions(-) create mode 100644 include/linux/rcutiny.h create mode 100644 kernel/rcutiny.c
include/linux/hardirq.h +24 -0
@@ -139,10 +139,34 @@ static inline void account_system_vtime(struct task_struct *tsk)#endif #if defined(CONFIG_NO_HZ ) +#if defined(CONFIG_TINY_RCU ) +extern void rcu_enter_nohz (void ); +extern void rcu_exit_nohz (void ); + +static inline void rcu_irq_enter (void ) +{ +rcu_exit_nohz (); +} + +static inline void rcu_irq_exit (void ) +{ +rcu_enter_nohz (); +} + +static inline void rcu_nmi_enter (void ) +{ +} + +static inline void rcu_nmi_exit (void ) +{ +} + +#else extern void rcu_irq_enter (void );extern void rcu_irq_exit (void );extern void rcu_nmi_enter (void );extern void rcu_nmi_exit (void ); +#endif #else # define rcu_irq_enter () do { } while (0)# define rcu_irq_exit () do { } while (0)
include/linux/rcupdate.h +17 -7
@@ -68,16 +68,22 @@ extern int sched_expedited_torture_stats(char *page);/* Internal to kernel */ extern void rcu_init (void );extern void rcu_scheduler_starting (void ); +#ifndef CONFIG_TINY_RCU extern int rcu_needs_cpu (int cpu); +#else +static inline int rcu_needs_cpu (int cpu) {return 0 ; } +#endif extern int rcu_scheduler_active;#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_TREE_PREEMPT_RCU )#include <linux/rcutree.h> +#elif defined(CONFIG_TINY_RCU ) +#include <linux/rcutiny.h> #else #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 +135,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 +144,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 +202,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 +221,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/rcutiny.h new file +103 -0
103 lines not on this page · raw message
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/Kconfig +9 -0
@@ -334,6 +334,15 @@ config TREE_PREEMPT_RCU is also required. It also scales down nicely to smaller systems. +config TINY_RCU + bool "UP-only small-memory-footprint RCU" + depends on !SMP + help + This option selects the RCU implementation that is + designed for UP systems from which real-time response + is not required. This option greatly reduces the + memory footprint of RCU. + endchoice config RCU_TRACE
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/Makefile +1 -0
@@ -83,6 +83,7 @@ obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_TREE_RCU) += rcutree.o obj-$(CONFIG_TREE_PREEMPT_RCU) += rcutree.o obj-$(CONFIG_TREE_RCU_TRACE) += rcutree_trace.o +obj-$(CONFIG_TINY_RCU) += rcutiny.o obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
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 +10 -132
167 lines not on this page · raw message
kernel/rcutiny.c new file +281 -0
281 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 +213 -113
505 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,