Messages in this thread | | | Subject | Re: [PATCH net-next v6 2/9] net: marvell: prestera: Add cleanup of allocated fib_nodes | From | Paolo Abeni <> | Date | Thu, 22 Sep 2022 12:15:45 +0200 |
| |
Hello, On Sun, 2022-09-18 at 22:46 +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 <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,
I commented on v5 due to PEBKAC here, but the comment applies here, too:
You could use rhashtable_free_and_destroy() with a suitable callback freeing the node without removing it from the hash table. The same in the next patch.
Thanks!
Paolo
| |