From patchwork Sat Sep 17 06:02:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 115087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1BF79B7105 for ; Sat, 17 Sep 2011 15:59:41 +1000 (EST) Received: from localhost ([::1]:37629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4nw9-0007jG-0u for incoming@patchwork.ozlabs.org; Sat, 17 Sep 2011 01:59:37 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4nvr-0007C0-1O for qemu-devel@nongnu.org; Sat, 17 Sep 2011 01:59:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4nvp-0006dy-0J for qemu-devel@nongnu.org; Sat, 17 Sep 2011 01:59:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4nvo-0006dc-LQ for qemu-devel@nongnu.org; Sat, 17 Sep 2011 01:59:16 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8H5x6Zr001793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 17 Sep 2011 01:59:06 -0400 Received: from dhcp-91-7.nay.redhat.com.englab.nay.redhat.com (dhcp-8-146.nay.redhat.com [10.66.8.146]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8H5x1BA030852; Sat, 17 Sep 2011 01:59:02 -0400 To: krkumar2@in.ibm.com, eric.dumazet@gmail.com, mst@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, davem@davemloft.net From: Jason Wang Date: Sat, 17 Sep 2011 14:02:28 +0800 Message-ID: <20110917060228.32666.91035.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> In-Reply-To: <20110917055639.32666.89940.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> References: <20110917055639.32666.89940.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org, rusty@rustcorp.com.au, qemu-devel@nongnu.org, mirq-linux@rere.qmqm.pl, joe@perches.com, shemminger@vyatta.com Subject: [Qemu-devel] [net-next RFC V2 PATCH 2/5] tuntap: categorize ioctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As we've moved socket related structure to file->private_data, we move the ioctls that only touch socket out of tun_chr_ioctl() as it don't need hold rtnl lock. Signed-off-by: Jason Wang --- 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 b64ad05..dc768e0 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1238,10 +1238,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) @@ -1346,14 +1343,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); @@ -1370,6 +1359,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))) @@ -1425,21 +1445,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 @@ -1467,7 +1483,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 */