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

mlxsw: spectrum: Take devlink net instead of init_net 



Follow-up patch is going to allow to reload devlink instance into
different network namespace, so use devlink_net() helper instead
of init_net.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 471f894f

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

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/types.h>

#include <linux/skbuff.h>

#include <linux/workqueue.h>

#include <linux/net_namespace.h>

#include <net/devlink.h>



#include "trap.h"
@@ -350,6 +351,11 @@ u64 mlxsw_core_res_get(struct mlxsw_core *mlxsw_core, 
#define MLXSW_CORE_RES_GET(mlxsw_core, short_res_id)			\

	mlxsw_core_res_get(mlxsw_core, MLXSW_RES_ID_##short_res_id)



static inline struct net *mlxsw_core_net(struct mlxsw_core *mlxsw_core)

{

	return devlink_net(priv_to_devlink(mlxsw_core));

}



#define MLXSW_BUS_F_TXRX	BIT(0)

#define MLXSW_BUS_F_RESET	BIT(1)

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

+3 −3
Original line number Diff line number Diff line
@@ -4864,7 +4864,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
	 * respin.

	 */

	mlxsw_sp->netdevice_nb.notifier_call = mlxsw_sp_netdevice_event;

	err = register_netdevice_notifier_net(&init_net,

	err = register_netdevice_notifier_net(mlxsw_sp_net(mlxsw_sp),

					      &mlxsw_sp->netdevice_nb);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to register netdev notifier\n");
@@ -4888,7 +4888,7 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
err_ports_create:

	mlxsw_sp_dpipe_fini(mlxsw_sp);

err_dpipe_init:

	unregister_netdevice_notifier_net(&init_net,

	unregister_netdevice_notifier_net(mlxsw_sp_net(mlxsw_sp),

					  &mlxsw_sp->netdevice_nb);

err_netdev_notifier:

	if (mlxsw_sp->clock)
@@ -4975,7 +4975,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 


	mlxsw_sp_ports_remove(mlxsw_sp);

	mlxsw_sp_dpipe_fini(mlxsw_sp);

	unregister_netdevice_notifier_net(&init_net,

	unregister_netdevice_notifier_net(mlxsw_sp_net(mlxsw_sp),

					  &mlxsw_sp->netdevice_nb);

	if (mlxsw_sp->clock) {

		mlxsw_sp->ptp_ops->fini(mlxsw_sp->ptp_state);

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

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/dcbnl.h>

#include <linux/in6.h>

#include <linux/notifier.h>

#include <linux/net_namespace.h>

#include <net/psample.h>

#include <net/pkt_cls.h>

#include <net/red.h>
@@ -982,4 +983,9 @@ int mlxsw_sp_trap_action_set(struct mlxsw_core *mlxsw_core, 
int mlxsw_sp_trap_group_init(struct mlxsw_core *mlxsw_core,

			     const struct devlink_trap_group *group);



static inline struct net *mlxsw_sp_net(struct mlxsw_sp *mlxsw_sp)

{

	return mlxsw_core_net(mlxsw_sp->core);

}



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ void mlxsw_sp_nve_fid_disable(struct mlxsw_sp *mlxsw_sp, 
		    mlxsw_sp_fid_vni(fid, &vni)))

		goto out;



	nve_dev = dev_get_by_index(&init_net, nve_ifindex);

	nve_dev = dev_get_by_index(mlxsw_sp_net(mlxsw_sp), nve_ifindex);

	if (!nve_dev)

		goto out;

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

+17 −12
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/if_macvlan.h>

#include <linux/refcount.h>

#include <linux/jhash.h>

#include <linux/net_namespace.h>

#include <net/netevent.h>

#include <net/neighbour.h>

#include <net/arp.h>
@@ -2551,14 +2552,14 @@ static int mlxsw_sp_router_schedule_work(struct net *net, 
	struct mlxsw_sp_netevent_work *net_work;

	struct mlxsw_sp_router *router;



	if (!net_eq(net, &init_net))

	router = container_of(nb, struct mlxsw_sp_router, netevent_nb);

	if (!net_eq(net, mlxsw_sp_net(router->mlxsw_sp)))

		return NOTIFY_DONE;



	net_work = kzalloc(sizeof(*net_work), GFP_ATOMIC);

	if (!net_work)

		return NOTIFY_BAD;



	router = container_of(nb, struct mlxsw_sp_router, netevent_nb);

	INIT_WORK(&net_work->work, cb);

	net_work->mlxsw_sp = router->mlxsw_sp;

	mlxsw_core_schedule_work(&net_work->work);
@@ -6195,7 +6196,7 @@ static int mlxsw_sp_router_fib_rule_event(unsigned long event, 
	rule = fr_info->rule;



	/* Rule only affects locally generated traffic */

	if (rule->iifindex == init_net.loopback_dev->ifindex)

	if (rule->iifindex == mlxsw_sp_net(mlxsw_sp)->loopback_dev->ifindex)

		return 0;



	switch (info->family) {
@@ -7953,9 +7954,10 @@ static void mlxsw_sp_mp_hash_field_set(char *recr2_pl, int field) 
	mlxsw_reg_recr2_outer_header_fields_enable_set(recr2_pl, field, true);

}



static void mlxsw_sp_mp4_hash_init(char *recr2_pl)

static void mlxsw_sp_mp4_hash_init(struct mlxsw_sp *mlxsw_sp, char *recr2_pl)

{

	bool only_l3 = !init_net.ipv4.sysctl_fib_multipath_hash_policy;

	struct net *net = mlxsw_sp_net(mlxsw_sp);

	bool only_l3 = !net->ipv4.sysctl_fib_multipath_hash_policy;



	mlxsw_sp_mp_hash_header_set(recr2_pl,

				    MLXSW_REG_RECR2_IPV4_EN_NOT_TCP_NOT_UDP);
@@ -7970,9 +7972,9 @@ static void mlxsw_sp_mp4_hash_init(char *recr2_pl) 
	mlxsw_sp_mp_hash_field_set(recr2_pl, MLXSW_REG_RECR2_TCP_UDP_DPORT);

}



static void mlxsw_sp_mp6_hash_init(char *recr2_pl)

static void mlxsw_sp_mp6_hash_init(struct mlxsw_sp *mlxsw_sp, char *recr2_pl)

{

	bool only_l3 = !ip6_multipath_hash_policy(&init_net);

	bool only_l3 = !ip6_multipath_hash_policy(mlxsw_sp_net(mlxsw_sp));



	mlxsw_sp_mp_hash_header_set(recr2_pl,

				    MLXSW_REG_RECR2_IPV6_EN_NOT_TCP_NOT_UDP);
@@ -8000,8 +8002,8 @@ static int mlxsw_sp_mp_hash_init(struct mlxsw_sp *mlxsw_sp) 


	seed = jhash(mlxsw_sp->base_mac, sizeof(mlxsw_sp->base_mac), 0);

	mlxsw_reg_recr2_pack(recr2_pl, seed);

	mlxsw_sp_mp4_hash_init(recr2_pl);

	mlxsw_sp_mp6_hash_init(recr2_pl);

	mlxsw_sp_mp4_hash_init(mlxsw_sp, recr2_pl);

	mlxsw_sp_mp6_hash_init(mlxsw_sp, recr2_pl);



	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(recr2), recr2_pl);

}
@@ -8032,7 +8034,8 @@ static int mlxsw_sp_dscp_init(struct mlxsw_sp *mlxsw_sp) 


static int __mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp)

{

	bool usp = init_net.ipv4.sysctl_ip_fwd_update_priority;

	struct net *net = mlxsw_sp_net(mlxsw_sp);

	bool usp = net->ipv4.sysctl_ip_fwd_update_priority;

	char rgcr_pl[MLXSW_REG_RGCR_LEN];

	u64 max_rifs;

	int err;
@@ -8134,7 +8137,8 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
		goto err_dscp_init;



	mlxsw_sp->router->fib_nb.notifier_call = mlxsw_sp_router_fib_event;

	err = register_fib_notifier(&init_net, &mlxsw_sp->router->fib_nb,

	err = register_fib_notifier(mlxsw_sp_net(mlxsw_sp),

				    &mlxsw_sp->router->fib_nb,

				    mlxsw_sp_router_fib_dump_flush, NULL);

	if (err)

		goto err_register_fib_notifier;
@@ -8174,7 +8178,8 @@ err_register_inetaddr_notifier: 


void mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp)

{

	unregister_fib_notifier(&init_net, &mlxsw_sp->router->fib_nb);

	unregister_fib_notifier(mlxsw_sp_net(mlxsw_sp),

				&mlxsw_sp->router->fib_nb);

	unregister_netevent_notifier(&mlxsw_sp->router->netevent_nb);

	mlxsw_sp_neigh_fini(mlxsw_sp);

	mlxsw_sp_vrs_fini(mlxsw_sp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE