From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD3BDEB64D7 for ; Wed, 21 Jun 2023 02:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229523AbjFUCN5 (ORCPT ); Tue, 20 Jun 2023 22:13:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjFUCN4 (ORCPT ); Tue, 20 Jun 2023 22:13:56 -0400 Received: from out-57.mta1.migadu.com (out-57.mta1.migadu.com [IPv6:2001:41d0:203:375::39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BC9C1987 for ; Tue, 20 Jun 2023 19:13:55 -0700 (PDT) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1687313631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V7W1TXpLeC+jZKenxiIQBwi/2DRSOIPMzpcHz92tunc=; b=UN44HocSmb7BwxHwWKrs0nzX3mjPSU4aCUCnWYnZrNl2u/YbDd1/D5Ud1mEUdbMLwvCYmP TfeQ6VSz5rWHcT4DXzQu8GdgiZ9AG4bXGDhvJ69aHk3P1n/fTYYPg8ivX1vqyIS0g+Lzxf FfAwx5+8QTl1nYd7pb3lyRY79pV4vWY= Date: Wed, 21 Jun 2023 10:13:45 +0800 MIME-Version: 1.0 Subject: Re: [PATCHv5 for-rc1 v5 4/8] RDMA/rxe: Implement dellink in rxe To: Bob Pearson , Zhu Yanjun , zyjzyj2000@gmail.com, jgg@ziepe.ca, leon@kernel.org, linux-rdma@vger.kernel.org, parav@nvidia.com, lehrer@gmail.com Cc: Rain River References: <20230428093914.2121131-1-yanjun.zhu@intel.com> <20230428093914.2121131-5-yanjun.zhu@intel.com> <28959f27-46a2-6b51-e0cc-f80546d0f27f@gmail.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zhu Yanjun In-Reply-To: <28959f27-46a2-6b51-e0cc-f80546d0f27f@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org 在 2023/6/21 4:21, Bob Pearson 写道: > On 4/28/23 04:39, Zhu Yanjun wrote: >> From: Zhu Yanjun >> >> When running "rdma link del" command, dellink function will be called. >> If the sock refcnt is greater than the refcnt needed for udp tunnel, >> the sock refcnt will be decreased by 1. >> >> If equal, the last rdma link is removed. The udp tunnel will be >> destroyed. >> >> Tested-by: Rain River >> Signed-off-by: Zhu Yanjun >> --- >> drivers/infiniband/sw/rxe/rxe.c | 12 +++++++++++- >> drivers/infiniband/sw/rxe/rxe_net.c | 17 +++++++++++++++-- >> drivers/infiniband/sw/rxe/rxe_net.h | 1 + >> 3 files changed, 27 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c >> index 0ce6adb43cfc..ebfabc6d6b76 100644 >> --- a/drivers/infiniband/sw/rxe/rxe.c >> +++ b/drivers/infiniband/sw/rxe/rxe.c >> @@ -166,10 +166,12 @@ void rxe_set_mtu(struct rxe_dev *rxe, unsigned int ndev_mtu) >> /* called by ifc layer to create new rxe device. >> * The caller should allocate memory for rxe by calling ib_alloc_device. >> */ >> +static struct rdma_link_ops rxe_link_ops; >> int rxe_add(struct rxe_dev *rxe, unsigned int mtu, const char *ibdev_name) >> { >> rxe_init(rxe); >> rxe_set_mtu(rxe, mtu); >> + rxe->ib_dev.link_ops = &rxe_link_ops; >> >> return rxe_register_device(rxe, ibdev_name); >> } >> @@ -206,9 +208,17 @@ static int rxe_newlink(const char *ibdev_name, struct net_device *ndev) >> return err; >> } >> >> -struct rdma_link_ops rxe_link_ops = { >> +static int rxe_dellink(struct ib_device *dev) >> +{ >> + rxe_net_del(dev); >> + >> + return 0; >> +} >> + >> +static struct rdma_link_ops rxe_link_ops = { >> .type = "rxe", >> .newlink = rxe_newlink, >> + .dellink = rxe_dellink, >> }; >> >> static int __init rxe_module_init(void) >> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c >> index 3ca92e062800..4cc7de7b115b 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_net.c >> +++ b/drivers/infiniband/sw/rxe/rxe_net.c >> @@ -530,6 +530,21 @@ int rxe_net_add(const char *ibdev_name, struct net_device *ndev) >> return 0; >> } >> >> +#define SK_REF_FOR_TUNNEL 2 >> +void rxe_net_del(struct ib_device *dev) >> +{ >> + if (refcount_read(&recv_sockets.sk6->sk->sk_refcnt) > SK_REF_FOR_TUNNEL) >> + __sock_put(recv_sockets.sk6->sk); >> + else >> + rxe_release_udp_tunnel(recv_sockets.sk6); >> + >> + if (refcount_read(&recv_sockets.sk4->sk->sk_refcnt) > SK_REF_FOR_TUNNEL) >> + __sock_put(recv_sockets.sk4->sk); >> + else >> + rxe_release_udp_tunnel(recv_sockets.sk4); >> +} >> +#undef SK_REF_FOR_TUNNEL >> + >> static void rxe_port_event(struct rxe_dev *rxe, >> enum ib_event_type event) >> { >> @@ -689,8 +704,6 @@ int rxe_register_notifier(void) >> >> void rxe_net_exit(void) >> { >> - rxe_release_udp_tunnel(recv_sockets.sk6); >> - rxe_release_udp_tunnel(recv_sockets.sk4); >> unregister_netdevice_notifier(&rxe_net_notifier); >> } > These calls are moved to rxe_net_del which is called by an explicit unlink command. > But if rxe_net_init fails and returns an error code this will never happen. > This will result in leaking resources. Thanks a lot. Bob. Sure, if ipv6 tunnel fails to be created, the resource related with ipv4 should be released. I will fix it in the latest version. Zhu Yanjun > > Bob >> >> diff --git a/drivers/infiniband/sw/rxe/rxe_net.h b/drivers/infiniband/sw/rxe/rxe_net.h >> index a222c3eeae12..f48f22f3353b 100644 >> --- a/drivers/infiniband/sw/rxe/rxe_net.h >> +++ b/drivers/infiniband/sw/rxe/rxe_net.h >> @@ -17,6 +17,7 @@ struct rxe_recv_sockets { >> }; >> >> int rxe_net_add(const char *ibdev_name, struct net_device *ndev); >> +void rxe_net_del(struct ib_device *dev); >> >> int rxe_register_notifier(void); >> int rxe_net_init(void);