]> err.no Git - linux-2.6/commit
[PATCH] lockdep: annotate sk_locks
authorIngo Molnar <mingo@elte.hu>
Mon, 3 Jul 2006 07:25:35 +0000 (00:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Jul 2006 22:27:10 +0000 (15:27 -0700)
commita5b5bb9a053a973c23b867738c074acb3e80c0a0
tree8eb78d458cfb309c566d6aaafb25639723920bcd
parent0afffc723c8041a005134099847ac2a2fd0316a0
[PATCH] lockdep: annotate sk_locks

Teach sk_lock semantics to the lock validator.  In the softirq path the
slock has mutex_trylock()+mutex_unlock() semantics, in the process context
sock_lock() case it has mutex_lock()/mutex_unlock() semantics.

Thus we treat sock_owned_by_user() flagged areas as an exclusion area too,
not just those areas covered by a held sk_lock.slock.

Effect on non-lockdep kernels: minimal, sk_lock_sock_init() has been turned
into an inline function.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/net/sock.h
net/core/sock.c