Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7322638 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Fix netevent notifier registration 



Currently the notifier is registered for every asic instance, however the
same block. Fix this by moving the registration to module init.

Fixes: c723c735 ("mlxsw: spectrum_router: Periodically update the kernel's neigh table")
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de7d6295

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+9 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <generated/utsrelease.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_mirred.h>

#include <net/netevent.h>



#include "spectrum.h"

#include "core.h"
@@ -4541,18 +4542,25 @@ static struct notifier_block mlxsw_sp_inetaddr_nb __read_mostly = { 
	.priority = 10,	/* Must be called before FIB notifier block */

};



static struct notifier_block mlxsw_sp_router_netevent_nb __read_mostly = {

	.notifier_call = mlxsw_sp_router_netevent_event,

};



static int __init mlxsw_sp_module_init(void)

{

	int err;



	register_netdevice_notifier(&mlxsw_sp_netdevice_nb);

	register_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	register_netevent_notifier(&mlxsw_sp_router_netevent_nb);



	err = mlxsw_core_driver_register(&mlxsw_sp_driver);

	if (err)

		goto err_core_driver_register;

	return 0;



err_core_driver_register:

	unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_netdevice_notifier(&mlxsw_sp_netdevice_nb);

	return err;
@@ -4561,6 +4569,7 @@ static int __init mlxsw_sp_module_init(void) 
static void __exit mlxsw_sp_module_exit(void)

{

	mlxsw_core_driver_unregister(&mlxsw_sp_driver);

	unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	unregister_inetaddr_notifier(&mlxsw_sp_inetaddr_nb);

	unregister_netdevice_notifier(&mlxsw_sp_netdevice_nb);

}

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ int mlxsw_sp_router_neigh_construct(struct net_device *dev, 
				    struct neighbour *n);

void mlxsw_sp_router_neigh_destroy(struct net_device *dev,

				   struct neighbour *n);

int mlxsw_sp_router_netevent_event(struct notifier_block *unused,

				   unsigned long event, void *ptr);



int mlxsw_sp_kvdl_alloc(struct mlxsw_sp *mlxsw_sp, unsigned int entry_count);

void mlxsw_sp_kvdl_free(struct mlxsw_sp *mlxsw_sp, int entry_index);

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+2 −15
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static void mlxsw_sp_router_neigh_update_hw(struct work_struct *work) 
	mlxsw_sp_port_dev_put(mlxsw_sp_port);

}



static int mlxsw_sp_router_netevent_event(struct notifier_block *unused,

int mlxsw_sp_router_netevent_event(struct notifier_block *unused,

				   unsigned long event, void *ptr)

{

	struct mlxsw_sp_neigh_entry *neigh_entry;
@@ -1015,10 +1015,6 @@ static int mlxsw_sp_router_netevent_event(struct notifier_block *unused, 
	return NOTIFY_DONE;

}



static struct notifier_block mlxsw_sp_router_netevent_nb __read_mostly = {

	.notifier_call = mlxsw_sp_router_netevent_event,

};



static int mlxsw_sp_neigh_init(struct mlxsw_sp *mlxsw_sp)

{

	int err;
@@ -1033,10 +1029,6 @@ static int mlxsw_sp_neigh_init(struct mlxsw_sp *mlxsw_sp) 
	 */

	mlxsw_sp_router_neighs_update_interval_init(mlxsw_sp);



	err = register_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	if (err)

		goto err_register_netevent_notifier;



	/* Create the delayed works for the activity_update */

	INIT_DELAYED_WORK(&mlxsw_sp->router.neighs_update.dw,

			  mlxsw_sp_router_neighs_update_work);
@@ -1045,17 +1037,12 @@ static int mlxsw_sp_neigh_init(struct mlxsw_sp *mlxsw_sp) 
	mlxsw_core_schedule_dw(&mlxsw_sp->router.neighs_update.dw, 0);

	mlxsw_core_schedule_dw(&mlxsw_sp->router.nexthop_probe_dw, 0);

	return 0;



err_register_netevent_notifier:

	rhashtable_destroy(&mlxsw_sp->router.neigh_ht);

	return err;

}



static void mlxsw_sp_neigh_fini(struct mlxsw_sp *mlxsw_sp)

{

	cancel_delayed_work_sync(&mlxsw_sp->router.neighs_update.dw);

	cancel_delayed_work_sync(&mlxsw_sp->router.nexthop_probe_dw);

	unregister_netevent_notifier(&mlxsw_sp_router_netevent_nb);

	rhashtable_destroy(&mlxsw_sp->router.neigh_ht);

}