Commit fbe3d0c7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'create-netdevsim-instances-in-namespace' 



Jiri Pirko says:

====================
create netdevsim instances in namespace

Allow user to create netdevsim devlink and netdevice instances in a
network namespace according to the namespace where the user resides in.
Add a selftest to test this.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 128d23c3 c04d71b5

drivers/net/netdevsim/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count) 
	nsim_bus_dev->dev.bus = &nsim_bus;

	nsim_bus_dev->dev.type = &nsim_bus_dev_type;

	nsim_bus_dev->port_count = port_count;

	nsim_bus_dev->initial_net = current->nsproxy->net_ns;



	err = device_register(&nsim_bus_dev->dev);

	if (err)

drivers/net/netdevsim/dev.c

+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) 
	devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev));

	if (!devlink)

		return ERR_PTR(-ENOMEM);

	devlink_net_set(devlink, nsim_bus_dev->initial_net);

	nsim_dev = devlink_priv(devlink);

	nsim_dev->nsim_bus_dev = nsim_bus_dev;

	nsim_dev->switch_id.id_len = sizeof(nsim_dev->switch_id.id);

drivers/net/netdevsim/netdevsim.h

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ struct nsim_bus_dev { 
	struct device dev;

	struct list_head list;

	unsigned int port_count;

	struct net *initial_net; /* Purpose of this is to carry net pointer

				  * during the probe time only.

				  */

	unsigned int num_vfs;

	struct nsim_vf_config *vfconfigs;

};

include/net/devlink.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct devlink { 
	possible_net_t _net;

	struct mutex lock;

	bool reload_failed;

	bool registered;

	char priv[0] __aligned(NETDEV_ALIGN);

};
@@ -772,6 +773,7 @@ static inline struct devlink *netdev_to_devlink(struct net_device *dev) 
struct ib_device;



struct net *devlink_net(const struct devlink *devlink);

void devlink_net_set(struct devlink *devlink, struct net *net);

struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size);

int devlink_register(struct devlink *devlink, struct device *dev);

void devlink_unregister(struct devlink *devlink);

net/core/devlink.c

+12 −3
Original line number Diff line number Diff line
@@ -101,11 +101,19 @@ struct net *devlink_net(const struct devlink *devlink) 
}

EXPORT_SYMBOL_GPL(devlink_net);



static void devlink_net_set(struct devlink *devlink, struct net *net)

static void __devlink_net_set(struct devlink *devlink, struct net *net)

{

	write_pnet(&devlink->_net, net);

}



void devlink_net_set(struct devlink *devlink, struct net *net)

{

	if (WARN_ON(devlink->registered))

		return;

	__devlink_net_set(devlink, net);

}

EXPORT_SYMBOL_GPL(devlink_net_set);



static struct devlink *devlink_get_from_attrs(struct net *net,

					      struct nlattr **attrs)

{
@@ -2750,7 +2758,7 @@ static void devlink_reload_netns_change(struct devlink *devlink, 
				     DEVLINK_CMD_PARAM_DEL);

	devlink_notify(devlink, DEVLINK_CMD_DEL);



	devlink_net_set(devlink, dest_net);

	__devlink_net_set(devlink, dest_net);



	devlink_notify(devlink, DEVLINK_CMD_NEW);

	list_for_each_entry(param_item, &devlink->param_list, list)
@@ -6278,7 +6286,7 @@ struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size) 
	if (!devlink)

		return NULL;

	devlink->ops = ops;

	devlink_net_set(devlink, &init_net);

	__devlink_net_set(devlink, &init_net);

	INIT_LIST_HEAD(&devlink->port_list);

	INIT_LIST_HEAD(&devlink->sb_list);

	INIT_LIST_HEAD_RCU(&devlink->dpipe_table_list);
@@ -6304,6 +6312,7 @@ int devlink_register(struct devlink *devlink, struct device *dev) 
{

	mutex_lock(&devlink_mutex);

	devlink->dev = dev;

	devlink->registered = true;

	list_add_tail(&devlink->list, &devlink_list);

	devlink_notify(devlink, DEVLINK_CMD_NEW);

	mutex_unlock(&devlink_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE