From: Jason Wang <jasowang@redhat.com> To: mst@redhat.com, netdev@vger.kernel.org, jasowang@redhat.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, davem@davemloft.net Cc: krkumar2@in.ibm.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, kvm@vger.kernel.org, mirq-linux@rere.qmqm.pl Subject: [net-next RFC PATCH 2/7] tuntap: categorize ioctl Date: Fri, 12 Aug 2011 09:55:00 +0800 [thread overview] Message-ID: <20110812015500.31613.29559.stgit@intel-e5620-16-2.englab.nay.redhat.com> (raw) In-Reply-To: <20110812015221.31613.95001.stgit@intel-e5620-16-2.englab.nay.redhat.com> As we've moved socket related structure to file->private_data, we can separate system calls that only touch tfile from others as they don't need hold rtnl lock. Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/net/tun.c | 52 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 2739887..4cd292a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1240,10 +1240,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, struct tun_file *tfile = file->private_data; struct tun_struct *tun; void __user* argp = (void __user*)arg; - struct sock_fprog fprog; struct ifreq ifr; - int sndbuf; - int vnet_hdr_sz; int ret; if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) @@ -1348,14 +1345,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = set_offload(tun, arg); break; - case TUNSETTXFILTER: - /* Can be set only for TAPs */ - ret = -EINVAL; - if ((tfile->flags & TUN_TYPE_MASK) != TUN_TAP_DEV) - break; - ret = update_filter(&tfile->txflt, (void __user *)arg); - break; - case SIOCGIFHWADDR: /* Get hw address */ memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); @@ -1372,6 +1361,37 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); break; + default: + ret = -EINVAL; + break; + } + +unlock: + rtnl_unlock(); + if (tun) + tun_put(tun); + return ret; +} + +static long __tun_socket_ioctl(struct file *file, unsigned int cmd, + unsigned long arg, int ifreq_len) +{ + struct tun_file *tfile = file->private_data; + void __user* argp = (void __user*)arg; + struct sock_fprog fprog; + int sndbuf; + int vnet_hdr_sz; + int ret = 0; + + switch (cmd) { + case TUNSETTXFILTER: + /* Can be set only for TAPs */ + ret = -EINVAL; + if ((tfile->flags & TUN_TYPE_MASK) != TUN_TAP_DEV) + break; + ret = update_filter(&tfile->txflt, (void __user *)arg); + break; + case TUNGETSNDBUF: sndbuf = tfile->socket.sk->sk_sndbuf; if (copy_to_user(argp, &sndbuf, sizeof(sndbuf))) @@ -1427,21 +1447,17 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, break; default: - ret = -EINVAL; + ret = __tun_chr_ioctl(file, cmd, arg, ifreq_len); break; } -unlock: - rtnl_unlock(); - if (tun) - tun_put(tun); return ret; } static long tun_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - return __tun_chr_ioctl(file, cmd, arg, sizeof (struct ifreq)); + return __tun_socket_ioctl(file, cmd, arg, sizeof (struct ifreq)); } #ifdef CONFIG_COMPAT @@ -1469,7 +1485,7 @@ static long tun_chr_compat_ioctl(struct file *file, * driver are compatible though, we don't need to convert the * contents. */ - return __tun_chr_ioctl(file, cmd, arg, sizeof(struct compat_ifreq)); + return __tun_socket_ioctl(file, cmd, arg, sizeof(struct compat_ifreq)); } #endif /* CONFIG_COMPAT */
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: mst@redhat.com, netdev@vger.kernel.org, jasowang@redhat.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, davem@davemloft.net Cc: krkumar2@in.ibm.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, kvm@vger.kernel.org, mirq-linux@rere.qmqm.pl Subject: [Qemu-devel] [net-next RFC PATCH 2/7] tuntap: categorize ioctl Date: Fri, 12 Aug 2011 09:55:00 +0800 [thread overview] Message-ID: <20110812015500.31613.29559.stgit@intel-e5620-16-2.englab.nay.redhat.com> (raw) In-Reply-To: <20110812015221.31613.95001.stgit@intel-e5620-16-2.englab.nay.redhat.com> As we've moved socket related structure to file->private_data, we can separate system calls that only touch tfile from others as they don't need hold rtnl lock. Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/net/tun.c | 52 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 2739887..4cd292a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1240,10 +1240,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, struct tun_file *tfile = file->private_data; struct tun_struct *tun; void __user* argp = (void __user*)arg; - struct sock_fprog fprog; struct ifreq ifr; - int sndbuf; - int vnet_hdr_sz; int ret; if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) @@ -1348,14 +1345,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = set_offload(tun, arg); break; - case TUNSETTXFILTER: - /* Can be set only for TAPs */ - ret = -EINVAL; - if ((tfile->flags & TUN_TYPE_MASK) != TUN_TAP_DEV) - break; - ret = update_filter(&tfile->txflt, (void __user *)arg); - break; - case SIOCGIFHWADDR: /* Get hw address */ memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); @@ -1372,6 +1361,37 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr); break; + default: + ret = -EINVAL; + break; + } + +unlock: + rtnl_unlock(); + if (tun) + tun_put(tun); + return ret; +} + +static long __tun_socket_ioctl(struct file *file, unsigned int cmd, + unsigned long arg, int ifreq_len) +{ + struct tun_file *tfile = file->private_data; + void __user* argp = (void __user*)arg; + struct sock_fprog fprog; + int sndbuf; + int vnet_hdr_sz; + int ret = 0; + + switch (cmd) { + case TUNSETTXFILTER: + /* Can be set only for TAPs */ + ret = -EINVAL; + if ((tfile->flags & TUN_TYPE_MASK) != TUN_TAP_DEV) + break; + ret = update_filter(&tfile->txflt, (void __user *)arg); + break; + case TUNGETSNDBUF: sndbuf = tfile->socket.sk->sk_sndbuf; if (copy_to_user(argp, &sndbuf, sizeof(sndbuf))) @@ -1427,21 +1447,17 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, break; default: - ret = -EINVAL; + ret = __tun_chr_ioctl(file, cmd, arg, ifreq_len); break; } -unlock: - rtnl_unlock(); - if (tun) - tun_put(tun); return ret; } static long tun_chr_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - return __tun_chr_ioctl(file, cmd, arg, sizeof (struct ifreq)); + return __tun_socket_ioctl(file, cmd, arg, sizeof (struct ifreq)); } #ifdef CONFIG_COMPAT @@ -1469,7 +1485,7 @@ static long tun_chr_compat_ioctl(struct file *file, * driver are compatible though, we don't need to convert the * contents. */ - return __tun_chr_ioctl(file, cmd, arg, sizeof(struct compat_ifreq)); + return __tun_socket_ioctl(file, cmd, arg, sizeof(struct compat_ifreq)); } #endif /* CONFIG_COMPAT */
next prev parent reply other threads:[~2011-08-12 1:57 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-12 1:54 [net-next RFC PATCH 0/7] multiqueue support for tun/tap Jason Wang 2011-08-12 1:54 ` [Qemu-devel] " Jason Wang 2011-08-12 1:54 ` [net-next RFC PATCH 1/7] tuntap: move socket/sock related structures to tun_file Jason Wang 2011-08-12 1:54 ` [Qemu-devel] " Jason Wang 2011-08-12 1:54 ` Jason Wang 2011-08-12 1:55 ` Jason Wang [this message] 2011-08-12 1:55 ` [Qemu-devel] [net-next RFC PATCH 2/7] tuntap: categorize ioctl Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [net-next RFC PATCH 3/7] tuntap: introduce multiqueue related flags Jason Wang 2011-08-12 1:55 ` [Qemu-devel] " Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [net-next RFC PATCH 4/7] tuntap: multiqueue support Jason Wang 2011-08-12 1:55 ` [Qemu-devel] " Jason Wang 2011-08-12 14:29 ` Eric Dumazet 2011-08-12 14:29 ` [Qemu-devel] " Eric Dumazet 2011-08-12 14:29 ` Eric Dumazet 2011-08-14 6:05 ` Jason Wang 2011-08-14 6:05 ` Jason Wang 2011-08-14 6:05 ` [Qemu-devel] " Jason Wang 2011-08-14 6:05 ` Jason Wang 2011-08-12 14:29 ` Eric Dumazet 2011-08-12 23:21 ` Paul E. McKenney 2011-08-12 23:21 ` Paul E. McKenney 2011-08-12 23:21 ` [Qemu-devel] " Paul E. McKenney 2011-08-12 23:21 ` Paul E. McKenney 2011-08-14 6:07 ` Jason Wang 2011-08-14 6:07 ` [Qemu-devel] " Jason Wang 2011-08-14 6:07 ` Jason Wang 2011-08-14 6:07 ` Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [net-next RFC PATCH 5/7] tuntap: add ioctls to attach or detach a file form tap device Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [Qemu-devel] " Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [net-next RFC PATCH 6/7] Change virtqueue structure Jason Wang 2011-08-12 1:55 ` Jason Wang 2011-08-12 1:55 ` [Qemu-devel] " Jason Wang 2011-08-12 1:55 ` [net-next RFC PATCH 7/7] virtio-net changes Jason Wang 2011-08-12 1:55 ` [Qemu-devel] " Jason Wang 2011-08-12 9:09 ` Sasha Levin 2011-08-12 9:09 ` Sasha Levin 2011-08-12 9:09 ` Sasha Levin 2011-08-12 9:09 ` Sasha Levin 2011-08-14 5:59 ` [Qemu-devel] " Jason Wang 2011-08-14 5:59 ` Jason Wang 2011-08-14 5:59 ` Jason Wang 2011-08-14 5:59 ` Jason Wang 2011-08-17 13:24 ` WANG Cong 2011-08-17 13:24 ` [Qemu-devel] " WANG Cong 2011-08-12 1:55 ` Jason Wang 2011-08-12 2:11 ` [net-next RFC PATCH 0/7] multiqueue support for tun/tap Jason Wang 2011-08-12 2:11 ` Jason Wang 2011-08-12 2:11 ` [Qemu-devel] " Jason Wang 2011-08-12 2:11 ` Jason Wang 2011-08-13 0:46 ` Sridhar Samudrala 2011-08-13 0:46 ` Sridhar Samudrala 2011-08-13 0:46 ` [Qemu-devel] " Sridhar Samudrala 2011-08-14 6:19 ` Jason Wang 2011-08-14 6:19 ` Jason Wang 2011-08-14 6:19 ` [Qemu-devel] " Jason Wang 2011-08-14 6:19 ` Jason Wang
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=20110812015500.31613.29559.stgit@intel-e5620-16-2.englab.nay.redhat.com \ --to=jasowang@redhat.com \ --cc=davem@davemloft.net \ --cc=krkumar2@in.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mirq-linux@rere.qmqm.pl \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ --cc=rusty@rustcorp.com.au \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.