Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yevhen Orlov <yevhen.orlov@plvision.eu>
To:     netdev@vger.kernel.org
Cc:     Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>,
        Taras Chornyi <taras.chornyi@plvision.eu>,
        Mickey Rachamim <mickeyr@marvell.com>,
        Serhiy Pshyk <serhiy.pshyk@plvision.eu>,
        "David S . Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, Andrew Lunn <andrew@lunn.ch>,
        Stephen Hemminger <stephen@networkplumber.org>,
        linux-kernel@vger.kernel.org,
        Yevhen Orlov <yevhen.orlov@plvision.eu>,
        Taras Chornyi <tchornyi@marvell.com>,
        Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Subject: [PATCH net-next v6 2/9] net: marvell: prestera: Add cleanup of allocated fib_nodes
Date:   Sun, 18 Sep 2022 22:46:53 +0300
Message-Id: <20220918194700.19905-3-yevhen.orlov@plvision.eu>
In-Reply-To: <20220918194700.19905-1-yevhen.orlov@plvision.eu>
References: <20220918194700.19905-1-yevhen.orlov@plvision.eu>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VEPg63fULGKcJta3hsbNE2uNI1OpUb14DZYeRDLfr6AXKCyZC6xTFAB6jH2M?=
 =?us-ascii?Q?0KfQWVwoxvBX9MZQi/5pGJMF++Vkvv1iKBz64CMLc8Ch6WGsYSiNOUzIivWg?=
 =?us-ascii?Q?Kq27ltemFmHnNPcJi7FK7jJSpOpMkho1cjRXuM2usQSdO8xmqcS/jI4ivomv?=
 =?us-ascii?Q?6n2jCWFMPU8zQZEwetOlMzqp0yvZn3xCsGEOsPUXoqqc5kyEFo8ZZtvPJ/W3?=
 =?us-ascii?Q?jt0IOFTJTt2sAnk2vBjWclnAMad1DFCvGnwWgKZ8nZ136WfqqyOAuo9spbij?=
 =?us-ascii?Q?AKYggAlSzQxOdbatf0iO95jjW589uDskGqMUx15WEAPYQ5Ag+aAzS4/mq+Sx?=
 =?us-ascii?Q?MwpfgJllngSITecpX9Vq0dDrEO4URoP+WPnQDqL9gu1rt9g9A3RE3nQdck5N?=
 =?us-ascii?Q?IIcYr5dJZyinoRsvlV9+vVblzC9Y0YcRi8/eV/7OQ56Lok1ldjwRm3QRduet?=
 =?us-ascii?Q?9ewPvmB98Lda60GJhEGkMEL5glGx7wfUC9PrCbosIHUsEMruqu8leG9ruuUC?=
 =?us-ascii?Q?e7QsLkpVllHhhZb5KqmKJwyKRyBVuMqNa/Bv+ecRsSg1L5NYe6onlkVvEk1w?=
 =?us-ascii?Q?ampafxaqSK3AC/5wBpQV0Zqj2mO3+WFavUMG32SGipXpb+ouzTjVAm10qEXC?=
 =?us-ascii?Q?4PmJgCApEancEQaQLwqZdMjL8mGNRXcBsIk2mTETad80uovQjZzFIDMBWIY4?=
 =?us-ascii?Q?hnwdbeOO6wxu6ELNEG/XrFpOnD31+WCTLHvoy9tImmeiHn8rJlXRB4tsfqdP?=
 =?us-ascii?Q?AH6mqw48/xDKrmcm6RnhJbG//LYRbXjxWOO78TytFy4o5HbEyIXWSACd3Kog?=
 =?us-ascii?Q?ef46zTv1RdzyStnH1fpqWtMDeycjG/fqsIJTo3mOExTmsIfJe7p71PtHtiX4?=
 =?us-ascii?Q?DkWNESQ620kgESNWlc8gMMdi/jR1FbTNrlx56VYUc/y+hhGOzdW2KeTCjXoo?=
 =?us-ascii?Q?j47+YMIFKISP2pKxS9kDKT09w5W7Uunt07sBRXVTmJRYrZNc9N7dcfey2a1Y?=
 =?us-ascii?Q?cqxXHvQq7BgSalIX8p6tGFiWJdajZDvh2bu5jFuCbRQzr/Rf1rf6t+dcz77t?=
 =?us-ascii?Q?MwuYepHMuVx09I5nZNuFZkUJ15gWKuDMHaduNnLmbH+kJqserl3j3xGDX+x2?=
 =?us-ascii?Q?ZsfnfIzf1eXHlHk7aA1LWZAorjfimxi1xkl69ZIW+qJVdoXN5VuZ+efy9Op4?=
 =?us-ascii?Q?SeR+zzqDxHnpLDNMNThK1Q4BCwU3QziMHLFAW1l9FANh5Dgc1qAULvHMz7Tf?=
 =?us-ascii?Q?m+AuChKaYzKJmOtanS1J0rYejl4i25Q5ahmXe7SwaoA1TYCA750H/jVP4q6D?=
 =?us-ascii?Q?F1+LtgNOOewN0ORfIBH6Nl0pP4ylZvAbxFnbwtpNb0WPuxLAxKoqNOsQbXfL?=
 =?us-ascii?Q?Pjd+keIIdA9g4PJ35ZrGYB4BMl62ICUXDQkbhApNm7mW7sobZkqbDHssratU?=
 =?us-ascii?Q?XQh9bO+71KGhT9pgqHaYAUf/CUUIol35uyMvpDTLXqw7hfidbA3HBi8mWpnl?=
 =?us-ascii?Q?uq9fI+8CDBfqAYYXSXFYxx4KDGeAwZAfRaAbcoM999al7sg0vtMN+c4uKuhu?=
 =?us-ascii?Q?mq8DZcFER/QF4e2ZLT3cQ1/lkMp0rTDQoc7K6EIr53j3ymlyt5LP8aoxIIxD?=
 =?us-ascii?Q?dA=3D=3D?=
X-OriginatorOrg: plvision.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b689586-3d25-4cc2-2d5b-08da99ae9856
X-MS-Exchange-CrossTenant-AuthSource: PAXP190MB1789.EURP190.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 19:47:18.6896
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 03707b74-30f3-46b6-a0e0-ff0a7438c9c4
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: KOkxpKkJd3atCWFq+1f1sBUVtY+yatx0kd3kIYqDGWfE/38mKfhCYvFe8u5hrFOcR+U/nUQ3Hntyh8Xx3zRIjmTFCPX9Du5+xW0xd/sr/2M=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P190MB1927
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <tchornyi@marvell.com>
Signed-off-by: Taras Chornyi <tchornyi@marvell.com>
Co-developed-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
Signed-off-by: Yevhen Orlov <yevhen.orlov@plvision.eu>
---
 .../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);
+	}
+}
+
 struct prestera_fib_node *
 prestera_fib_node_create(struct prestera_switch *sw,
 			 struct prestera_fib_key *key,
-- 
2.17.1