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

net: devlink: allow to change namespaces during reload 



All devlink instances are created in init_net and stay there for a
lifetime. Allow user to be able to move devlink instances into
namespaces during devlink reload operation. That ensures proper
re-instantiation of driver objects, including netdevices.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Acked-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f174bbc

drivers/net/ethernet/mellanox/mlx4/main.c

+5 −1
Original line number Diff line number Diff line
@@ -3935,13 +3935,17 @@ static void mlx4_restart_one_down(struct pci_dev *pdev); 
static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,

			       struct devlink *devlink);



static int mlx4_devlink_reload_down(struct devlink *devlink,

static int mlx4_devlink_reload_down(struct devlink *devlink, bool netns_change,

				    struct netlink_ext_ack *extack)

{

	struct mlx4_priv *priv = devlink_priv(devlink);

	struct mlx4_dev *dev = &priv->dev;

	struct mlx4_dev_persistent *persist = dev->persist;



	if (netns_change) {

		NL_SET_ERR_MSG_MOD(extack, "Namespace change is not supported");

		return -EOPNOTSUPP;

	}

	if (persist->num_vfs)

		mlx4_warn(persist->dev, "Reload performed on PF, will cause reset on operating Virtual Functions\n");

	mlx4_restart_one_down(persist->pdev);

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

+1 −0
Original line number Diff line number Diff line
@@ -985,6 +985,7 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 


static int

mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,

					  bool netns_change,

					  struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

drivers/net/netdevsim/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static int nsim_dev_reload_create(struct nsim_dev *nsim_dev, 
				  struct netlink_ext_ack *extack);

static void nsim_dev_reload_destroy(struct nsim_dev *nsim_dev);



static int nsim_dev_reload_down(struct devlink *devlink,

static int nsim_dev_reload_down(struct devlink *devlink, bool netns_change,

				struct netlink_ext_ack *extack)

{

	struct nsim_dev *nsim_dev = devlink_priv(devlink);

include/net/devlink.h

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ enum devlink_trap_group_generic_id { 
	}



struct devlink_ops {

	int (*reload_down)(struct devlink *devlink,

	int (*reload_down)(struct devlink *devlink, bool netns_change,

			   struct netlink_ext_ack *extack);

	int (*reload_up)(struct devlink *devlink,

			 struct netlink_ext_ack *extack);

include/uapi/linux/devlink.h

+4 −0
Original line number Diff line number Diff line
@@ -421,6 +421,10 @@ enum devlink_attr { 


	DEVLINK_ATTR_RELOAD_FAILED,			/* u8 0 or 1 */



	DEVLINK_ATTR_NETNS_FD,			/* u32 */

	DEVLINK_ATTR_NETNS_PID,			/* u32 */

	DEVLINK_ATTR_NETNS_ID,			/* u32 */



	/* add new attributes above here, update the policy in devlink.c */



	__DEVLINK_ATTR_MAX,