Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-06 21:14:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mlxsw: spectrum_router: Reuse work neighbor initialization in work scheduler

Browse Source 
After the struct mlxsw_sp_netevent_work.n field initialization is moved
here, the body of code that handles NETEVENT_NEIGH_UPDATE is almost
identical to the one in the helper function. Therefore defer to the helper
instead of inlining the equivalent.

Note that previously, the code took and put a reference of the netdevice.
The new code defers to mlxsw_sp_dev_lower_is_port() to obviate the need for
taking the reference.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petr Machata 2023-06-09 19:32:10 +02:00 committed by David S. Miller
parent 14304e7063
commit 151b89f602
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
View File

@ -2749,6 +2749,7 @@ static void mlxsw_sp_router_update_priority_work(struct work_struct *work)
static int mlxsw_sp_router_schedule_work(struct net *net, static int mlxsw_sp_router_schedule_work(struct net *net,
struct mlxsw_sp_router *router, struct mlxsw_sp_router *router,
struct neighbour *n,
void (*cb)(struct work_struct *)) void (*cb)(struct work_struct *))
{ {
struct mlxsw_sp_netevent_work *net_work; struct mlxsw_sp_netevent_work *net_work;
@ -2762,6 +2763,7 @@ static int mlxsw_sp_router_schedule_work(struct net *net,
INIT_WORK(&net_work->work, cb); INIT_WORK(&net_work->work, cb);
net_work->mlxsw_sp = router->mlxsw_sp; net_work->mlxsw_sp = router->mlxsw_sp;
net_work->n = n;
mlxsw_core_schedule_work(&net_work->work); mlxsw_core_schedule_work(&net_work->work);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -2779,12 +2781,11 @@ static bool mlxsw_sp_dev_lower_is_port(struct net_device *dev)
static int mlxsw_sp_router_netevent_event(struct notifier_block *nb, static int mlxsw_sp_router_netevent_event(struct notifier_block *nb,
unsigned long event, void *ptr) unsigned long event, void *ptr)
{ {
struct mlxsw_sp_netevent_work *net_work;
struct mlxsw_sp_port *mlxsw_sp_port;
struct mlxsw_sp_router *router; struct mlxsw_sp_router *router;
unsigned long interval; unsigned long interval;
struct neigh_parms *p; struct neigh_parms *p;
struct neighbour *n; struct neighbour *n;
struct net *net;
router = container_of(nb, struct mlxsw_sp_router, netevent_nb); router = container_of(nb, struct mlxsw_sp_router, netevent_nb);
@ -2808,39 +2809,29 @@ static int mlxsw_sp_router_netevent_event(struct notifier_block *nb,
break; break;
case NETEVENT_NEIGH_UPDATE: case NETEVENT_NEIGH_UPDATE:
n = ptr; n = ptr;
net = neigh_parms_net(n->parms);
if (n->tbl->family != AF_INET && n->tbl->family != AF_INET6) if (n->tbl->family != AF_INET && n->tbl->family != AF_INET6)
return NOTIFY_DONE; return NOTIFY_DONE;
mlxsw_sp_port = mlxsw_sp_port_lower_dev_hold(n->dev); if (!mlxsw_sp_dev_lower_is_port(n->dev))
if (!mlxsw_sp_port)
return NOTIFY_DONE; return NOTIFY_DONE;
net_work = kzalloc(sizeof(*net_work), GFP_ATOMIC);
if (!net_work) {
mlxsw_sp_port_dev_put(mlxsw_sp_port);
return NOTIFY_BAD;
}
INIT_WORK(&net_work->work, mlxsw_sp_router_neigh_event_work);
net_work->mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
net_work->n = n;
/* Take a reference to ensure the neighbour won't be /* Take a reference to ensure the neighbour won't be
* destructed until we drop the reference in delayed * destructed until we drop the reference in delayed
* work. * work.
*/ */
neigh_clone(n); neigh_clone(n);
mlxsw_core_schedule_work(&net_work->work); return mlxsw_sp_router_schedule_work(net, router, n,
mlxsw_sp_port_dev_put(mlxsw_sp_port); mlxsw_sp_router_neigh_event_work);
break;
case NETEVENT_IPV4_MPATH_HASH_UPDATE: case NETEVENT_IPV4_MPATH_HASH_UPDATE:
case NETEVENT_IPV6_MPATH_HASH_UPDATE: case NETEVENT_IPV6_MPATH_HASH_UPDATE:
return mlxsw_sp_router_schedule_work(ptr, router, return mlxsw_sp_router_schedule_work(ptr, router, NULL,
mlxsw_sp_router_mp_hash_event_work); mlxsw_sp_router_mp_hash_event_work);
case NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE: case NETEVENT_IPV4_FWD_UPDATE_PRIORITY_UPDATE:
return mlxsw_sp_router_schedule_work(ptr, router, return mlxsw_sp_router_schedule_work(ptr, router, NULL,
mlxsw_sp_router_update_priority_work); mlxsw_sp_router_update_priority_work);
} }