Commit c43ef228 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Do not assume RTNL is taken during nexthop init 



RTNL is going to be removed from route insertion path, so use
__in_dev_get_rcu() from an RCU read-side critical section instead of
__in_dev_get_rtnl() which assumes RTNL is taken.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb833eec

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

+6 −2
Original line number Diff line number Diff line
@@ -3840,10 +3840,14 @@ static int mlxsw_sp_nexthop4_init(struct mlxsw_sp *mlxsw_sp, 
	if (!dev)

		return 0;



	in_dev = __in_dev_get_rtnl(dev);

	rcu_read_lock();

	in_dev = __in_dev_get_rcu(dev);

	if (in_dev && IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN(in_dev) &&

	    fib_nh->fib_nh_flags & RTNH_F_LINKDOWN)

	    fib_nh->fib_nh_flags & RTNH_F_LINKDOWN) {

		rcu_read_unlock();

		return 0;

	}

	rcu_read_unlock();



	err = mlxsw_sp_nexthop4_type_init(mlxsw_sp, nh, fib_nh);

	if (err)