From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Emelyanov Subject: Re: [PATCH 6/8] Make the sk_clone() lighter Date: Thu, 01 Nov 2007 11:46:46 +0300 Message-ID: <47299276.7070508@openvz.org> References: <472885B1.7090103@openvz.org> <4728891A.30305@openvz.org> <20071101.002606.172611674.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, devel@openvz.org To: David Miller Return-path: Received: from sacred.ru ([62.205.161.221]:38465 "EHLO sacred.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbXKAHoe (ORCPT ); Thu, 1 Nov 2007 03:44:34 -0400 In-Reply-To: <20071101.002606.172611674.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org David Miller wrote: > From: Pavel Emelyanov > Date: Wed, 31 Oct 2007 16:54:34 +0300 > >> The sk_prot_alloc() already performs all the stuff needed by the >> sk_clone(). Besides, the sk_prot_alloc() requires almost twice >> less arguments than the sk_alloc() does, so call the sk_prot_alloc() >> saving the stack a bit. >> >> Signed-off-by: Pavel Emelyanov >> >> --- >> >> diff --git a/net/core/sock.c b/net/core/sock.c >> index e7537e4..c032f48 100644 >> --- a/net/core/sock.c >> +++ b/net/core/sock.c >> @@ -976,8 +976,9 @@ void sk_free(struct sock *sk) >> >> struct sock *sk_clone(const struct sock *sk, const gfp_t priority) >> { >> - struct sock *newsk = sk_alloc(sk->sk_net, sk->sk_family, priority, sk->sk_prot, 0); >> - >> + struct sock *newsk; >> + >> + newsk = sk_prot_alloc(sk->sk_prot, priority, sk->sk_family); >> if (newsk != NULL) { >> struct sk_filter *filter; >> > > After we make this change, what will set up newsk->sk_net? This will be done automatically in the sock_copy(). > That's part of what sk_alloc() was doing for us, and that's > why we need to pass the extra argument. > No it wasn't doing it for us, because the sk_net assignment was done inside the if (zero_it) branch, but zero_it is 0 in this case. Thanks, Pavel