Commit da21f24d authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate sock_lock_init()



Teach special (multi-initialized, per-address-family) locking code to the lock
validator.  Has no effect on non-lockdep kernels.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 54365524
...@@ -80,8 +80,12 @@ typedef struct { ...@@ -80,8 +80,12 @@ typedef struct {
wait_queue_head_t wq; wait_queue_head_t wq;
} socket_lock_t; } socket_lock_t;
extern struct lock_class_key af_family_keys[AF_MAX];
#define sock_lock_init(__sk) \ #define sock_lock_init(__sk) \
do { spin_lock_init(&((__sk)->sk_lock.slock)); \ do { spin_lock_init(&((__sk)->sk_lock.slock)); \
lockdep_set_class(&(__sk)->sk_lock.slock, \
af_family_keys + (__sk)->sk_family); \
(__sk)->sk_lock.owner = NULL; \ (__sk)->sk_lock.owner = NULL; \
init_waitqueue_head(&((__sk)->sk_lock.wq)); \ init_waitqueue_head(&((__sk)->sk_lock.wq)); \
} while(0) } while(0)
......
...@@ -129,6 +129,18 @@ ...@@ -129,6 +129,18 @@
#include <net/tcp.h> #include <net/tcp.h>
#endif #endif
/*
* Each address family might have different locking rules, so we have
* one slock key per address family:
*/
struct lock_class_key af_family_keys[AF_MAX];
/*
* sk_callback_lock locking rules are per-address-family,
* so split the lock classes by using a per-AF key:
*/
static struct lock_class_key af_callback_keys[AF_MAX];
/* Take into consideration the size of the struct sk_buff overhead in the /* Take into consideration the size of the struct sk_buff overhead in the
* determination of these values, since that is non-constant across * determination of these values, since that is non-constant across
* platforms. This makes socket queueing behavior and performance * platforms. This makes socket queueing behavior and performance
...@@ -848,6 +860,8 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority) ...@@ -848,6 +860,8 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
rwlock_init(&newsk->sk_dst_lock); rwlock_init(&newsk->sk_dst_lock);
rwlock_init(&newsk->sk_callback_lock); rwlock_init(&newsk->sk_callback_lock);
lockdep_set_class(&newsk->sk_callback_lock,
af_callback_keys + newsk->sk_family);
newsk->sk_dst_cache = NULL; newsk->sk_dst_cache = NULL;
newsk->sk_wmem_queued = 0; newsk->sk_wmem_queued = 0;
...@@ -1422,6 +1436,8 @@ void sock_init_data(struct socket *sock, struct sock *sk) ...@@ -1422,6 +1436,8 @@ void sock_init_data(struct socket *sock, struct sock *sk)
rwlock_init(&sk->sk_dst_lock); rwlock_init(&sk->sk_dst_lock);
rwlock_init(&sk->sk_callback_lock); rwlock_init(&sk->sk_callback_lock);
lockdep_set_class(&sk->sk_callback_lock,
af_callback_keys + sk->sk_family);
sk->sk_state_change = sock_def_wakeup; sk->sk_state_change = sock_def_wakeup;
sk->sk_data_ready = sock_def_readable; sk->sk_data_ready = sock_def_readable;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment