From: Pavel Emelyanov <xemul@openvz•org>
To: Linux Netdev List <netdev@vger•kernel.org>
Cc: Daniel Lezcano <dlezcano@fr•ibm.com>,
Denis Lunev <den@openvz•org>,
Linux Containers <containers@lists•osdl.org>,
Benjamin Thery <benjamin.thery@bull•net>
Subject: [PATCH 4/14][TUN]: Actually make the tun_dev_list per-net.
Date: Thu, 10 Apr 2008 19:07:38 +0400 [thread overview]
Message-ID: <47FE2D3A.7040908@openvz.org> (raw)
In-Reply-To: <47FE2AD4.9080609@openvz.org>
Remove the static tun_dev_list and replace its occurrences in
driver with per-net one.
It is used in two places - in tun_set_iff and tun_cleanup. In
the first case it's legal to use current net_ns. In the cleanup
call - move the loop, that unregisters all devices in net exit
hook.
This shows how to use the generic pointer.
Signed-off-by: Pavel Emelyanov <xemul@openvz•org>
---
drivers/net/tun.c | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 9bfba02..74263a4 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -62,6 +62,7 @@
#include <linux/if_ether.h>
#include <linux/if_tun.h>
#include <linux/crc32.h>
+#include <linux/nsproxy.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
@@ -79,7 +80,6 @@ struct tun_net {
struct list_head dev_list;
};
-static LIST_HEAD(tun_dev_list);
static const struct ethtool_ops tun_ethtool_ops;
/* Net device open. */
@@ -443,12 +443,12 @@ static void tun_setup(struct net_device *dev)
dev->destructor = free_netdev;
}
-static struct tun_struct *tun_get_by_name(const char *name)
+static struct tun_struct *tun_get_by_name(struct tun_net *tn, const char *name)
{
struct tun_struct *tun;
ASSERT_RTNL();
- list_for_each_entry(tun, &tun_dev_list, list) {
+ list_for_each_entry(tun, &tn->dev_list, list) {
if (!strncmp(tun->dev->name, name, IFNAMSIZ))
return tun;
}
@@ -456,13 +456,15 @@ static struct tun_struct *tun_get_by_name(const char *name)
return NULL;
}
-static int tun_set_iff(struct file *file, struct ifreq *ifr)
+static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
{
+ struct tun_net *tn;
struct tun_struct *tun;
struct net_device *dev;
int err;
- tun = tun_get_by_name(ifr->ifr_name);
+ tn = net_generic(net, tun_net_id);
+ tun = tun_get_by_name(tn, ifr->ifr_name);
if (tun) {
if (tun->attached)
return -EBUSY;
@@ -475,7 +477,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
!capable(CAP_NET_ADMIN))
return -EPERM;
}
- else if (__dev_get_by_name(&init_net, ifr->ifr_name))
+ else if (__dev_get_by_name(net, ifr->ifr_name))
return -EINVAL;
else {
char *name;
@@ -528,7 +530,7 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
if (err < 0)
goto err_free_dev;
- list_add(&tun->list, &tun_dev_list);
+ list_add(&tun->list, &tn->dev_list);
}
DBG(KERN_INFO "%s: tun_set_iff\n", tun->dev->name);
@@ -573,7 +575,7 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
ifr.ifr_name[IFNAMSIZ-1] = '\0';
rtnl_lock();
- err = tun_set_iff(file, &ifr);
+ err = tun_set_iff(current->nsproxy->net_ns, file, &ifr);
rtnl_unlock();
if (err)
@@ -900,8 +902,17 @@ static int tun_init_net(struct net *net)
static void tun_exit_net(struct net *net)
{
struct tun_net *tn;
+ struct tun_struct *tun, *nxt;
tn = net_generic(net, tun_net_id);
+
+ rtnl_lock();
+ list_for_each_entry_safe(tun, nxt, &tn->dev_list, list) {
+ DBG(KERN_INFO "%s cleaned up\n", tun->dev->name);
+ unregister_netdevice(tun->dev);
+ }
+ rtnl_unlock();
+
kfree(tn);
}
@@ -938,17 +949,7 @@ err_pernet:
static void tun_cleanup(void)
{
- struct tun_struct *tun, *nxt;
-
misc_deregister(&tun_miscdev);
-
- rtnl_lock();
- list_for_each_entry_safe(tun, nxt, &tun_dev_list, list) {
- DBG(KERN_INFO "%s cleaned up\n", tun->dev->name);
- unregister_netdevice(tun->dev);
- }
- rtnl_unlock();
-
unregister_pernet_gen_device(tun_net_id, &tun_net_ops);
}
--
1.5.3.4
next prev parent reply other threads:[~2008-04-10 14:44 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-10 14:57 [PATCH 0/14 (3 subsets)] Make tuns and vlans devices work per-net Pavel Emelyanov
2008-04-10 15:01 ` [PATCH 1/14][NETNS]: Introduce the net-subsys id generator Pavel Emelyanov
2008-04-10 17:37 ` [Devel] " Paul Menage
2008-04-10 20:52 ` Daniel Lezcano
2008-04-11 7:56 ` Pavel Emelyanov
[not found] ` <47FE2AD4.9080609-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-10 15:04 ` [PATCH 2/14][NETNS]: Generic per-net pointers Pavel Emelyanov
2008-04-11 13:43 ` Daniel Lezcano
[not found] ` <47FF6B1B.5090106-NmTC/0ZBporQT0dZR+AlfA@public.gmane.org>
2008-04-11 14:29 ` Pavel Emelyanov
2008-04-10 15:14 ` [PATCH 8/14][VLAN]: Introduce the vlan_net structure Pavel Emelyanov
2008-04-10 15:18 ` [PATCH 10/14][VLAN]: Create proc files in proper net Pavel Emelyanov
2008-04-10 15:23 ` [PATCH 14/14][VLAN]: Migrate proc files when vlan device is moved to namespace Pavel Emelyanov
2008-04-10 15:06 ` [PATCH 3/14][TUN]: Introduce the tun_net structure Pavel Emelyanov
2008-04-11 1:01 ` Paul E. McKenney
2008-04-11 7:55 ` Pavel Emelyanov
2008-04-11 15:04 ` Paul E. McKenney
2008-04-11 15:45 ` Pavel Emelyanov
2008-04-11 16:27 ` Paul E. McKenney
2008-04-12 8:44 ` Pavel Emelyanov
2008-04-15 7:44 ` David Miller
2008-04-15 10:31 ` Pavel Emelyanov
[not found] ` <48048411.5030506-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-15 10:06 ` David Miller
2008-04-10 15:07 ` Pavel Emelyanov [this message]
2008-04-10 15:09 ` [PATCH 5/14][TUN]: Allow to register tun devices in namespace Pavel Emelyanov
2008-04-10 15:10 ` [PATCH 6/14][RTNL]: Introduce the rtnl_kill_links call Pavel Emelyanov
[not found] ` <47FE2E01.6030000-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-10 22:09 ` Daniel Hokka Zakrisson
2008-04-11 8:01 ` Pavel Emelyanov
2008-04-11 12:48 ` Patrick McHardy
2008-04-10 15:13 ` [PATCH 7/14][VLAN]: Tag vlan_group with device, not ifindex Pavel Emelyanov
2008-04-10 15:16 ` [PATCH 9/14][VLAN]: Add net argument to proc init/cleanup calls Pavel Emelyanov
2008-04-10 15:19 ` [PATCH 11/14][VLAN]: Make /proc/net/vlan/conf file show per-net info Pavel Emelyanov
2008-04-10 15:20 ` [PATCH 12/14][VLAN]: Make vlan_name_type per-net Pavel Emelyanov
2008-04-10 15:22 ` [PATCH 13/14][VLAN]: Allows vlan devices registration in net namespace Pavel Emelyanov
2008-04-11 15:42 ` [PATCH 0/14 (3 subsets)] Make tuns and vlans devices work per-net Daniel Lezcano
2008-04-11 15:57 ` Pavel Emelyanov
2008-04-11 18:11 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=47FE2D3A.7040908@openvz.org \
--to=xemul@openvz$(echo .)org \
--cc=benjamin.thery@bull$(echo .)net \
--cc=containers@lists$(echo .)osdl.org \
--cc=den@openvz$(echo .)org \
--cc=dlezcano@fr$(echo .)ibm.com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox