| Message ID | 4A9B94B8.4050808@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Aug 31, 2009 at 11:15:36AM +0200, Eric Dumazet wrote: > From: Jarek Poplawski <jarkao2@gmail.com> > > After commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 > (net: No more expensive sock_hold()/sock_put() on each tx) > sk_free() frees socks conditionally and depends > on sk_wmem_alloc beeing set e.g. in sock_init_data(). But in some Very nice, but I hope David could fix btw. my "beeing" misspelling. Thanks everyone, Jarek P. > cases sk_free() is called earlier, usually after other alloc errors. > > Fix is to move sk_wmem_alloc initialization from sock_init_data() > to sk_alloc() itself. > > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > --- > diff --git a/net/core/sock.c b/net/core/sock.c > index bbb25be..7633422 100644 > --- a/net/core/sock.c > +++ b/net/core/sock.c > @@ -1025,6 +1025,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, > sk->sk_prot = sk->sk_prot_creator = prot; > sock_lock_init(sk); > sock_net_set(sk, get_net(net)); > + atomic_set(&sk->sk_wmem_alloc, 1); > } > > return sk; > @@ -1872,7 +1873,6 @@ void sock_init_data(struct socket *sock, struct sock *sk) > */ > smp_wmb(); > atomic_set(&sk->sk_refcnt, 1); > - atomic_set(&sk->sk_wmem_alloc, 1); > atomic_set(&sk->sk_drops, 0); > } > EXPORT_SYMBOL(sock_init_data); > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jarek Poplawski <jarkao2@gmail.com> Date: Mon, 31 Aug 2009 09:30:19 +0000 > On Mon, Aug 31, 2009 at 11:15:36AM +0200, Eric Dumazet wrote: >> From: Jarek Poplawski <jarkao2@gmail.com> >> >> After commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 >> (net: No more expensive sock_hold()/sock_put() on each tx) >> sk_free() frees socks conditionally and depends >> on sk_wmem_alloc beeing set e.g. in sock_init_data(). But in some > > Very nice, but I hope David could fix btw. my "beeing" misspelling. I will :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller a écrit : > From: Jarek Poplawski <jarkao2@gmail.com> > Date: Mon, 31 Aug 2009 09:30:19 +0000 > >> On Mon, Aug 31, 2009 at 11:15:36AM +0200, Eric Dumazet wrote: >>> From: Jarek Poplawski <jarkao2@gmail.com> >>> >>> After commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 >>> (net: No more expensive sock_hold()/sock_put() on each tx) >>> sk_free() frees socks conditionally and depends >>> on sk_wmem_alloc beeing set e.g. in sock_init_data(). But in some >> Very nice, but I hope David could fix btw. my "beeing" misspelling. > > I will :-) Thanks :) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Mon, 31 Aug 2009 14:12:02 +0200 > David Miller a écrit : >> From: Jarek Poplawski <jarkao2@gmail.com> >> Date: Mon, 31 Aug 2009 09:30:19 +0000 >> >>> On Mon, Aug 31, 2009 at 11:15:36AM +0200, Eric Dumazet wrote: >>>> From: Jarek Poplawski <jarkao2@gmail.com> >>>> >>>> After commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 >>>> (net: No more expensive sock_hold()/sock_put() on each tx) >>>> sk_free() frees socks conditionally and depends >>>> on sk_wmem_alloc beeing set e.g. in sock_init_data(). But in some >>> Very nice, but I hope David could fix btw. my "beeing" misspelling. >> >> I will :-) > > Thanks :) Applied to net-2.6, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/sock.c b/net/core/sock.c index bbb25be..7633422 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1025,6 +1025,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, sk->sk_prot = sk->sk_prot_creator = prot; sock_lock_init(sk); sock_net_set(sk, get_net(net)); + atomic_set(&sk->sk_wmem_alloc, 1); } return sk; @@ -1872,7 +1873,6 @@ void sock_init_data(struct socket *sock, struct sock *sk) */ smp_wmb(); atomic_set(&sk->sk_refcnt, 1); - atomic_set(&sk->sk_wmem_alloc, 1); atomic_set(&sk->sk_drops, 0); } EXPORT_SYMBOL(sock_init_data);