OpenVZ Forum


Home » Mailing lists » Devel » [PATCH v2] tun: don't hold network namespace by tun sockets
[PATCH v2] tun: don't hold network namespace by tun sockets [message #45469] Mon, 12 March 2012 11:20 Go to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
v2: sk_release_kernel() used for socket release. Dummy tun_release() is
required for sk_release_kernel() ---> sock_release() ---> sock->ops->release()
call.

TUN was designed to destroy it's socket on network namespace shutdown. But this
will never happen for persistent device, because it's socket holds network
namespace.
This patch removes of holding network namespace by TUN socket and replaces it
by creating socket in init_net and then changing it's net it to the desired
one. On shutdown socket is moved back to init_net prior to final put.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
drivers/net/tun.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 2c5d349..b13ee48 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -359,7 +359,7 @@ static void tun_free_netdev(struct net_device *dev)
{
struct tun_struct *tun = netdev_priv(dev);

- sock_put(tun->socket.sk);
+ sk_release_kernel(tun->socket.sk);
}

/* Net device open. */
@@ -980,10 +980,16 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
return ret;
}

+static int tun_release(struct socket *sock)
+{
+ return 0;
+}
+
/* Ops structure to mimic raw sockets with tun */
static const struct proto_ops tun_socket_ops = {
.sendmsg = tun_sendmsg,
.recvmsg = tun_recvmsg,
+ .release = tun_release,
};

static struct proto tun_proto = {
@@ -1110,10 +1116,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);

err = -ENOMEM;
- sk = sk_alloc(net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
+ sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
if (!sk)
goto err_free_dev;

+ sk_change_net(sk, net);
tun->socket.wq = &tun->wq;
init_waitqueue_head(&tun->wq.wait);
tun->socket.ops = &tun_socket_ops;
@@ -1174,7 +1181,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
return 0;

err_free_sk:
- sock_put(sk);
+ tun_free_netdev(dev);
err_free_dev:
free_netdev(dev);
failed:
Re: [PATCH v2] tun: don't hold network namespace by tun sockets [message #45473 is a reply to message #45469] Mon, 12 March 2012 13:02 Go to previous messageGo to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Drop this patch. There will be third version.
Sorry for inconvenience.

--
Best regards,
Stanislav Kinsbursky
Re: [PATCH v2] tun: don't hold network namespace by tun sockets [message #45474 is a reply to message #45469] Mon, 12 March 2012 13:05 Go to previous messageGo to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Drop this patch. There will be third version.
Sorry for inconvenience.

--
Best regards,
Stanislav Kinsbursky
Re: [PATCH v2] tun: don't hold network namespace by tun sockets [message #45475 is a reply to message #45469] Mon, 12 March 2012 13:07 Go to previous message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Drop this patch. There will be third version.
Sorry for inconvenience.

--
Best regards,
Stanislav Kinsbursky
Previous Topic: Re: [PATCH v2 02/13] memcg: Kernel memory accounting infrastructure.
Next Topic: [PATCH] tun: don't hold network namespace by tun sockets
Goto Forum:
  


Current Time: Mon Jul 22 08:07:04 GMT 2019