lockdep fix
Linus,
Please pull the latest locking-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-for-linus
# HEAD: cee34d88cabd1ba5fc93e09b5b12232bc9338c7c lockdep: Fix a race between /proc/lock_stat and module unload
A lockdep/modules unload race fix that can oops.
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
lockdep: Fix a race between /proc/lock_stat and module unload
kernel/locking/lockdep.c | 3 ++- kernel/locking/lockdep_proc.c | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-)
kernel/locking/lockdep.c +2 -1
@@ -3900,7 +3900,8 @@ static void zap_class(struct lock_class *class)list_del_rcu (&class->hash_entry);list_del_rcu (&class->lock_entry); - class->key =NULL ; +RCU_INIT_POINTER (class->key,NULL ); +RCU_INIT_POINTER (class->name,NULL ); }static inline int within (const void *addr,void *start,unsigned long size)
kernel/locking/lockdep_proc.c +17 -5
@@ -426,10 +426,12 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)static void seq_stats (struct seq_file *m,struct lock_stat_data *data) { -char name[39 ]; -struct lock_class *class; +struct lockdep_subclass_key *ckey;struct lock_class_stats *stats; +struct lock_class *class; +const char *cname;int i, namelen; +char name[39 ]; class = data->class; stats = &data->stats;
@@ -440,15 +442,25 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)if (class->subclass) namelen -=2 ; -if (!class->name) { +rcu_read_lock_sched (); + cname =rcu_dereference_sched (class->name); + ckey =rcu_dereference_sched (class->key); + +if (!cname && !ckey) { +rcu_read_unlock_sched (); +return ; + + }else if (!cname) {char str[KSYM_NAME_LEN ];const char *key_name; - key_name =__get_key_name (class->key, str); + key_name =__get_key_name (ckey, str);snprintf (name, namelen,"%s" , key_name); }else { -snprintf (name, namelen,"%s" , class->name); +snprintf (name, namelen,"%s" , cname); } +rcu_read_unlock_sched (); + namelen =strlen (name);if (class->name_version >1 ) {snprintf (name+namelen,3 ,"#%d" , class->name_version);