Messages in this thread Patch in this message | | | Date | Fri, 30 Oct 2009 15:55:51 +0100 | From | Eric Dumazet <> | Subject | Re: WARNING: at net/ipv4/af_inet.c:154 inet_sock_destruct |
| |
Francis Moreau a écrit : > On Fri, Oct 30, 2009 at 1:33 PM, Francis Moreau <francis.moro@gmail.com> wrote: >> On Fri, Oct 30, 2009 at 12:27 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote: >>> This oops occurring again and again with SUNRPC finally gave me the right pointer. >>> >>> David, we added two years ago memory accounting to UDP, and this changed >>> requirements about calling skb_free_datagram() in the right context. >>> >>> I wish we had an ASSERT_SOCK_LOCKED() debugging facility :( >>> >>> Francis, would you please test following patch ? >> I'm applying it and testing it during a couple of days and see if >> something wrong still happens. > > Hmm, with the patch applied on a 2.6.32-rc5, my machine locks hard > when starting nfsd. >
Please ignore/revert the last part of the patch (about net/sunrpc/xprtsock.c)
In xs_udp_data_ready() we really want to call skb_free_datagram(), not skb_free_datagram_locked(), because socket is already locked.
Thanks
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 37c5475..d61be4a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -883,7 +883,7 @@ static void xs_udp_data_ready(struct sock *sk, int len) out_unlock: spin_unlock(&xprt->transport_lock); dropit: + skb_free_datagram(sk, skb); - skb_free_datagram_locked(sk, skb); out: read_unlock(&sk->sk_callback_lock); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |