| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 May 2014 10:54:17 +0300
From: "Michael S. Tsirkin" <mst@...hat.com>
To: Xi Wang <xii@...gle.com>
Cc: "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
Jason Wang <jasowang@...hat.com>,
Maxim Krasnyansky <maxk@....qualcomm.com>,
Neal Cardwell <ncardwell@...gle.com>,
Eric Dumazet <edumazet@...gle.com>
Subject: Re: [PATCH v2] net-tun: restructure tun_do_read for better
sleep/wakeup efficiency
On Fri, May 16, 2014 at 03:11:48PM -0700, Xi Wang wrote:
> tun_do_read always adds current thread to wait queue, even if a packet
> is ready to read. This is inefficient because both sleeper and waker
> want to acquire the wait queue spin lock when packet rate is high.
>
> We restructure the read function and use common kernel networking
> routines to handle receive, sleep and wakeup. With the change
> available packets are checked first before the reading thread is added
> to the wait queue.
>
> Ran performance tests with the following configuration:
>
> - my packet generator -> tap1 -> br0 -> tap0 -> my packet consumer
> - sender pinned to one core and receiver pinned to another core
> - sender send small UDP packets (64 bytes total) as fast as it can
> - sandy bridge cores
> - throughput are receiver side goodput numbers
>
> The results are
>
> baseline: 731k pkts/sec, cpu utilization at 1.50 cpus
> changed: 783k pkts/sec, cpu utilization at 1.53 cpus
>
> The performance difference is largely determined by packet rate and
> inter-cpu communication cost. For example, if the sender and
> receiver are pinned to different cpu sockets, the results are
>
> baseline: 558k pkts/sec, cpu utilization at 1.71 cpus
> changed: 690k pkts/sec, cpu utilization at 1.67 cpus
>
> Co-authored-by: Eric Dumazet <edumazet@...gle.com>
> Signed-off-by: Xi Wang <xii@...gle.com>
Less code and more performance, what's not to like.
I think userspace concerns/questions have been addressed in
this thread.
Acked-by: Michael S. Tsirkin <mst@...hat.com>
Thanks for your patience!
> ---
>
> Changelog since v1:
> - Added back error code. NETREG_REGISTERED behavior is different but
> should be compatible with the previous implementation
> - Removed non essential changes
>
>
> drivers/net/tun.c | 54 ++++++++++++++++--------------------------------------
> 1 file changed, 16 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/net/tun.c b/drivers/net/tun.c
> index ee328ba..98bad1f 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -498,12 +498,12 @@ static void tun_detach_all(struct net_device *dev)
> for (i = 0; i < n; i++) {
> tfile = rtnl_dereference(tun->tfiles[i]);
> BUG_ON(!tfile);
> - wake_up_all(&tfile->wq.wait);
> + tfile->socket.sk->sk_data_ready(tfile->socket.sk);
> RCU_INIT_POINTER(tfile->tun, NULL);
> --tun->numqueues;
> }
> list_for_each_entry(tfile, &tun->disabled, next) {
> - wake_up_all(&tfile->wq.wait);
> + tfile->socket.sk->sk_data_ready(tfile->socket.sk);
> RCU_INIT_POINTER(tfile->tun, NULL);
> }
> BUG_ON(tun->numqueues != 0);
> @@ -807,8 +807,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
> /* Notify and wake up reader process */
> if (tfile->flags & TUN_FASYNC)
> kill_fasync(&tfile->fasync, SIGIO, POLL_IN);
> - wake_up_interruptible_poll(&tfile->wq.wait, POLLIN |
> - POLLRDNORM | POLLRDBAND);
> + tfile->socket.sk->sk_data_ready(tfile->socket.sk);
>
> rcu_read_unlock();
> return NETDEV_TX_OK;
> @@ -965,7 +964,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait)
>
> tun_debug(KERN_INFO, tun, "tun_chr_poll\n");
>
> - poll_wait(file, &tfile->wq.wait, wait);
> + poll_wait(file, sk_sleep(sk), wait);
>
> if (!skb_queue_empty(&sk->sk_receive_queue))
> mask |= POLLIN | POLLRDNORM;
> @@ -1330,47 +1329,26 @@ done:
> static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
> const struct iovec *iv, ssize_t len, int noblock)
> {
> - DECLARE_WAITQUEUE(wait, current);
> struct sk_buff *skb;
> ssize_t ret = 0;
> + int peeked, err, off = 0;
>
> tun_debug(KERN_INFO, tun, "tun_do_read\n");
>
> - if (unlikely(!noblock))
> - add_wait_queue(&tfile->wq.wait, &wait);
> - while (len) {
> - if (unlikely(!noblock))
> - current->state = TASK_INTERRUPTIBLE;
> + if (!len)
> + return ret;
>
> - /* Read frames from the queue */
> - if (!(skb = skb_dequeue(&tfile->socket.sk->sk_receive_queue))) {
> - if (noblock) {
> - ret = -EAGAIN;
> - break;
> - }
> - if (signal_pending(current)) {
> - ret = -ERESTARTSYS;
> - break;
> - }
> - if (tun->dev->reg_state != NETREG_REGISTERED) {
> - ret = -EIO;
> - break;
> - }
> -
> - /* Nothing to read, let's sleep */
> - schedule();
> - continue;
> - }
> + if (tun->dev->reg_state != NETREG_REGISTERED)
> + return -EIO;
>
> + /* Read frames from queue */
> + skb = __skb_recv_datagram(tfile->socket.sk, noblock ? MSG_DONTWAIT : 0,
> + &peeked, &off, &err);
> + if (skb) {
> ret = tun_put_user(tun, tfile, skb, iv, len);
> kfree_skb(skb);
> - break;
> - }
> -
> - if (unlikely(!noblock)) {
> - current->state = TASK_RUNNING;
> - remove_wait_queue(&tfile->wq.wait, &wait);
> - }
> + } else
> + ret = err;
>
> return ret;
> }
> @@ -2199,8 +2177,8 @@ static int tun_chr_open(struct inode *inode, struct file * file)
> tfile->flags = 0;
> tfile->ifindex = 0;
>
> - rcu_assign_pointer(tfile->socket.wq, &tfile->wq);
> init_waitqueue_head(&tfile->wq.wait);
> + RCU_INIT_POINTER(tfile->socket.wq, &tfile->wq);
>
> tfile->socket.file = file;
> tfile->socket.ops = &tun_socket_ops;
> --
> 1.9.1.423.g4596e3a
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists