Re: [Bugme-new] [Bug 12515] New: possible circular locking #0: (sk_lock-AF_PACKET){--..}, at: [<c1279838>] sock_setsockopt+0x12b/0x4a4
From: David Miller <davem@davemloft.net>
Date: 2009-01-30 22:13:02
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Fri, 30 Jan 2009 23:49:47 +1100
packet: Avoid lock_sock in mmap handler As the mmap handler gets called under mmap_sem, and we may grab mmap_sem elsewhere under the socket lock to access user data, we should avoid grabbing the socket lock in the mmap handler. Since the only thing we care about in the mmap handler is for pg_vec* to be invariant, i.e., to exclude packet_set_ring, we can achieve this by simply using sk_receive_queue.lock. I resisted the temptation to create a new spin lock because the mmap path isn't exactly common. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Looks good, applied. I rewrote the commit message as follows so that it actually matches what happens in the fix ;-) -------------------- packet: Avoid lock_sock in mmap handler As the mmap handler gets called under mmap_sem, and we may grab mmap_sem elsewhere under the socket lock to access user data, we should avoid grabbing the socket lock in the mmap handler. Since the only thing we care about in the mmap handler is for pg_vec* to be invariant, i.e., to exclude packet_set_ring, we can achieve this by simply using a new mutex. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>