Commit 881d966b authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

[NET]: Make the device list and device lookups per namespace. 



This patch makes most of the generic device layer network
namespace safe.  This patch makes dev_base_head a
network namespace variable, and then it picks up
a few associated variables.  The functions:
dev_getbyhwaddr
dev_getfirsthwbytype
dev_get_by_flags
dev_get_by_name
__dev_get_by_name
dev_get_by_index
__dev_get_by_index
dev_ioctl
dev_ethtool
dev_load
wireless_process_ioctl

were modified to take a network namespace argument, and
deal with it.

vlan_ioctl_set and brioctl_set were modified so their
hooks will receive a network namespace argument.

So basically anthing in the core of the network stack that was
affected to by the change of dev_base was modified to handle
multiple network namespaces.  The rest of the network stack was
simply modified to explicitly use &init_net the initial network
namespace.  This can be fixed when those components of the network
stack are modified to handle multiple network namespaces.

For now the ifindex generator is left global.

Fundametally ifindex numbers are per namespace, or else
we will have corner case problems with migration when
we get that far.

At the same time there are assumptions in the network stack
that the ifindex of a network device won't change.  Making
the ifindex number global seems a good compromise until
the network stack can cope with ifindex changes when
you change namespaces, and the like.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4b51029

arch/s390/appldata/appldata_net_sum.c

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/errno.h>

#include <linux/kernel_stat.h>

#include <linux/netdevice.h>

#include <net/net_namespace.h>



#include "appldata.h"
@@ -107,7 +108,7 @@ static void appldata_get_net_sum_data(void *data) 
	tx_dropped = 0;

	collisions = 0;

	read_lock(&dev_base_lock);

	for_each_netdev(dev) {

	for_each_netdev(&init_net, dev) {

		stats = dev->get_stats(dev);

		rx_packets += stats->rx_packets;

		tx_packets += stats->tx_packets;

arch/sparc64/solaris/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/compat.h>



#include <net/sock.h>

#include <net/net_namespace.h>



#include <asm/uaccess.h>

#include <asm/termios.h>
@@ -686,7 +687,7 @@ static inline int solaris_i(unsigned int fd, unsigned int cmd, u32 arg) 
			int i = 0;

			

			read_lock_bh(&dev_base_lock);

			for_each_netdev(d)

			for_each_netdev(&init_net, d)

				i++;

			read_unlock_bh(&dev_base_lock);

drivers/atm/idt77252.c

+1 −1
Original line number Diff line number Diff line
@@ -3576,7 +3576,7 @@ init_card(struct atm_dev *dev) 
	 * XXX: <hack>

	 */

	sprintf(tname, "eth%d", card->index);

	tmp = dev_get_by_name(tname);	/* jhs: was "tmp = dev_get(tname);" */

	tmp = dev_get_by_name(&init_net, tname);	/* jhs: was "tmp = dev_get(tname);" */

	if (tmp) {

		memcpy(card->atmdev->esi, tmp->dev_addr, 6);

drivers/block/aoe/aoecmd.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <linux/genhd.h>

#include <net/net_namespace.h>

#include <asm/unaligned.h>

#include "aoe.h"
@@ -194,7 +195,7 @@ aoecmd_cfg_pkts(ushort aoemajor, unsigned char aoeminor, struct sk_buff **tail) 
	sl = sl_tail = NULL;



	read_lock(&dev_base_lock);

	for_each_netdev(ifp) {

	for_each_netdev(&init_net, ifp) {

		dev_hold(ifp);

		if (!is_aoe_netif(ifp))

			goto cont;

drivers/infiniband/hw/cxgb3/cxio_hal.c

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/spinlock.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <net/net_namespace.h>



#include "cxio_resource.h"

#include "cxio_hal.h"
@@ -894,7 +895,7 @@ int cxio_rdev_open(struct cxio_rdev *rdev_p) 
		if (cxio_hal_find_rdev_by_name(rdev_p->dev_name)) {

			return -EBUSY;

		}

		netdev_p = dev_get_by_name(rdev_p->dev_name);

		netdev_p = dev_get_by_name(&init_net, rdev_p->dev_name);

		if (!netdev_p) {

			return -EINVAL;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE