From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schultz Subject: Re: [PATCH net-next v2 5/6] gtp: add socket to pdp context Date: Thu, 2 Feb 2017 15:12:55 +0100 (CET) Message-ID: <858150010.730228.1486044775198.JavaMail.zimbra@tpip.net> References: <20170130163713.17524-1-aschultz@tpip.net> <20170130163713.17524-6-aschultz@tpip.net> <20170202135656.GA23901@salvia> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: netdev , laforge , Lionel Gauthier , openbsc To: pablo Return-path: Received: from mail.tpip.net ([92.43.49.48]:39173 "EHLO mail.tpip.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbdBBOM6 (ORCPT ); Thu, 2 Feb 2017 09:12:58 -0500 In-Reply-To: <20170202135656.GA23901@salvia> Sender: netdev-owner@vger.kernel.org List-ID: Hi, ----- On Feb 2, 2017, at 2:56 PM, pablo pablo@netfilter.org wrote: > On Mon, Jan 30, 2017 at 05:37:12PM +0100, Andreas Schultz wrote: >> Having the socket present in context simplifies the sending logic. >> It also fixes the invalid assumption that we have to use the same >> sending socket for all client IP's on a specific gtp interface. >> >> Signed-off-by: Andreas Schultz >> --- >> drivers/net/gtp.c | 72 ++++++++++++++++++++++++++++++------------------------- >> 1 file changed, 39 insertions(+), 33 deletions(-) >> >> diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c >> index 68c6c9b..ff00597 100644 >> --- a/drivers/net/gtp.c >> +++ b/drivers/net/gtp.c > [...] >> @@ -984,16 +966,26 @@ static int ipv4_pdp_add(struct gtp_dev *gtp, struct >> genl_info *info) >> return 0; >> } >> >> +static void pdp_context_free(struct rcu_head *head) >> +{ >> + struct pdp_ctx *pctx = container_of(head, struct pdp_ctx, rcu_head); >> + >> + sock_put(pctx->sk); >> + kfree(pctx); >> +} >> + >> static void pdp_context_delete(struct pdp_ctx *pctx) >> { >> hlist_del_rcu(&pctx->hlist_tid); >> hlist_del_rcu(&pctx->hlist_addr); >> - kfree(pctx); >> + call_rcu(&pctx->rcu_head, pdp_context_free); > > This is fixing incorrect rcu conversion in 4/6. Please, fix this there. Ehm, right, but the kfree in 4/6 could have been a kfree_rcu instead without the call_rcu. Do you prefer to introduce the call_rcu in 4/6 and then just add the sock_put in this patch or should I change 4/6 to kfree_rcu and do the call_rcu conversion here? Andreas