RCU fixes
Linus,
Please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
# HEAD: 7c4f1c694bf84eac538bee3e411aed10ae617d46 Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
Two RCU fixes:
- Work around bug with recent GCC versions.
- Fix false positive lockdep splat.
Thanks,
Ingo
------------------>
Oleg Nesterov (1):
rcu: Change _wait_rcu_gp() to work around GCC bug 67055
Paul E. McKenney (1):
rcu: Suppress lockdep false positive for rcp->exp_funnel_mutex
include/linux/rcupdate.h | 11 +++++------ kernel/rcu/tree.c | 5 +++++ 2 files changed, 10 insertions(+), 6 deletions(-)
include/linux/rcupdate.h +5 -6
@@ -230,12 +230,11 @@ void __wait_rcu_gp(bool checktiny, int n, call_rcu_func_t *crcu_array, struct rcu_synchronize *rs_array);#define _wait_rcu_gp (checktiny, ...) \ -do { \ - call_rcu_func_t __crcu_array[] = { __VA_ARGS__ }; \ - const int __n = ARRAY_SIZE(__crcu_array); \ - struct rcu_synchronize __rs_array[__n]; \ - \ - __wait_rcu_gp(checktiny, __n, __crcu_array, __rs_array); \ +do { \ + call_rcu_func_t __crcu_array[] = { __VA_ARGS__ }; \ + struct rcu_synchronize __rs_array[ARRAY_SIZE(__crcu_array)]; \ + __wait_rcu_gp(checktiny, ARRAY_SIZE(__crcu_array), \ + __crcu_array, __rs_array); \ } while (0)#define wait_rcu_gp (...) _wait_rcu_gp(false, __VA_ARGS__)
kernel/rcu/tree.c +5 -0
@@ -3868,6 +3868,7 @@ static void rcu_init_new_rnp(struct rcu_node *rnp_leaf)static void __init rcu_boot_init_percpu_data (int cpu,struct rcu_state *rsp) { +static struct lock_class_key rcu_exp_sched_rdp_class;unsigned long flags;struct rcu_data *rdp =per_cpu_ptr (rsp->rda, cpu);struct rcu_node *rnp =rcu_get_root (rsp);
@@ -3883,6 +3884,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)mutex_init (&rdp->exp_funnel_mutex);rcu_boot_init_nocb_percpu_data (rdp);raw_spin_unlock_irqrestore (&rnp->lock, flags); +if (rsp == &rcu_sched_state) +lockdep_set_class_and_name (&rdp->exp_funnel_mutex, + &rcu_exp_sched_rdp_class, +"rcu_data_exp_sched" ); }/*