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 4C194C6FA86 for ; Thu, 22 Sep 2022 09:33:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230221AbiIVJdS (ORCPT ); Thu, 22 Sep 2022 05:33:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbiIVJdP (ORCPT ); Thu, 22 Sep 2022 05:33:15 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63B69CC8EC for ; Thu, 22 Sep 2022 02:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663839193; 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=zAzZ4b2xCwJUs3fed+WhbNmI9QSD0ajnVVgLX9sfbQQ=; b=az6gVCuC32VLv2e+pJ6IjBu7MSec5NRnJV0LFxrYBmS1bxWOm/qSIzFNl9JCbjFAZnY0uR HrzhC7jyUr5wvZ3UQ8nOoTNWwywy2VzI97gmWApGg5mDlRdXQLJ3mBnsCs+P9bBZgSEapO 4s5eRO0iSsw5nh2uo7yW/ukVfwISwPA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-413-C081mpycNRmhPS6tV3RLNQ-1; Thu, 22 Sep 2022 05:33:12 -0400 X-MC-Unique: C081mpycNRmhPS6tV3RLNQ-1 Received: by mail-wm1-f71.google.com with SMTP id ay21-20020a05600c1e1500b003b45fd14b53so2415790wmb.1 for ; Thu, 22 Sep 2022 02:33:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date; bh=zAzZ4b2xCwJUs3fed+WhbNmI9QSD0ajnVVgLX9sfbQQ=; b=TZTStRlvs9hWgtwasYDoVMtwxNPqUrbDeLctdBaX8G+R4aXS1EXcaIzBoEo6zBZo0W Yk2ADttGYGfUXzJPT/k7xz1geocmhpJVHohUqpHorWZxIO9LG5OYO1wB/Zh2m7YlF5oe sbZASYs2+6JfOq3UaXOhlje0hrt8CvveZwEUPEEKY76+hM6bS6aHJbDn9s1w8YVwNdov PaME8Ks1iImtd86WxQz0VrRt3QCmy0rCw1dwVFgeyD52EKMjkRx2B1cSjw/rxpi9GLaS R/0RwPCMTFlYrRBCdh/JZ/K517uBi1VcjwiABysXtCFl5Q8aw1riibkXuY3Wbix2Mjns 0AOg== X-Gm-Message-State: ACrzQf1kWWq3RhK+fEqryxJmOdl/CWBpnrWk25KnbPEx4ScfqINOe3oI awMPGVaqQ9O3oGu9+ai0IALjCalMcVDBqMN4KvCo/rLgSKKhdkdfo2+XPsMwAaxL0XFzfuuxM6h cAMq6fbrN2ZjlDZzOsB3eRfIf X-Received: by 2002:a05:600c:3546:b0:3b4:b7da:d8e2 with SMTP id i6-20020a05600c354600b003b4b7dad8e2mr1706420wmq.188.1663839191127; Thu, 22 Sep 2022 02:33:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4H2AvKwfjzXmU575/WbPmpQEkzcirG3TvXmTVnoQD84Z4jeYRFidKb0Nb+O6oKjyJVoDUYzw== X-Received: by 2002:a05:600c:3546:b0:3b4:b7da:d8e2 with SMTP id i6-20020a05600c354600b003b4b7dad8e2mr1706404wmq.188.1663839190908; Thu, 22 Sep 2022 02:33:10 -0700 (PDT) Received: from gerbillo.redhat.com (146-241-104-76.dyn.eolo.it. [146.241.104.76]) by smtp.gmail.com with ESMTPSA id l30-20020a05600c1d1e00b003a62400724bsm6330347wms.0.2022.09.22.02.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 02:33:10 -0700 (PDT) Message-ID: Subject: Re: [PATCH net-next v5 2/9] net: marvell: prestera: Add cleanup of allocated fib_nodes From: Paolo Abeni To: Yevhen Orlov , netdev@vger.kernel.org Cc: Volodymyr Mytnyk , Taras Chornyi , Mickey Rachamim , Serhiy Pshyk , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Andrew Lunn , Stephen Hemminger , linux-kernel@vger.kernel.org, Taras Chornyi , Oleksandr Mazur Date: Thu, 22 Sep 2022 11:33:09 +0200 In-Reply-To: <20220908225211.31482-3-yevhen.orlov@plvision.eu> References: <20220908225211.31482-1-yevhen.orlov@plvision.eu> <20220908225211.31482-3-yevhen.orlov@plvision.eu> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.4 (3.42.4-2.fc35) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2022-09-09 at 01:52 +0300, Yevhen Orlov wrote: > Do explicity cleanup on router_hw_fini, to ensure, that all allocated > objects cleaned. This will be used in cases, > when upper layer (cache) is not mapped to router_hw layer. > > Co-developed-by: Taras Chornyi > Signed-off-by: Taras Chornyi > Co-developed-by: Oleksandr Mazur > Signed-off-by: Oleksandr Mazur > Signed-off-by: Yevhen Orlov > --- > .../marvell/prestera/prestera_router_hw.c | 23 +++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c > index db9d2e9d9904..1b9feb396811 100644 > --- a/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c > +++ b/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c > @@ -56,6 +56,7 @@ static int prestera_nexthop_group_set(struct prestera_switch *sw, > static bool > prestera_nexthop_group_util_hw_state(struct prestera_switch *sw, > struct prestera_nexthop_group *nh_grp); > +static void prestera_fib_node_destroy_ht(struct prestera_switch *sw); > > /* TODO: move to router.h as macros */ > static bool prestera_nh_neigh_key_is_valid(struct prestera_nh_neigh_key *key) > @@ -97,6 +98,7 @@ int prestera_router_hw_init(struct prestera_switch *sw) > > void prestera_router_hw_fini(struct prestera_switch *sw) > { > + prestera_fib_node_destroy_ht(sw); > WARN_ON(!list_empty(&sw->router->vr_list)); > WARN_ON(!list_empty(&sw->router->rif_entry_list)); > rhashtable_destroy(&sw->router->fib_ht); > @@ -605,6 +607,27 @@ void prestera_fib_node_destroy(struct prestera_switch *sw, > kfree(fib_node); > } > > +static void prestera_fib_node_destroy_ht(struct prestera_switch *sw) > +{ > + struct prestera_fib_node *node; > + struct rhashtable_iter iter; > + > + while (1) { > + rhashtable_walk_enter(&sw->router->fib_ht, &iter); > + rhashtable_walk_start(&iter); > + node = rhashtable_walk_next(&iter); > + rhashtable_walk_stop(&iter); > + rhashtable_walk_exit(&iter); > + > + if (!node) > + break; > + else if (IS_ERR(node)) > + continue; > + else if (node) > + prestera_fib_node_destroy(sw, node); > + } > +} You should use instead rhashtable_free_and_destroy(), providing a callback which just frees the node, without removing it from the hash table. The same in the next patch Cheers, Paolo