From patchwork Mon Nov 12 21:22:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 198460 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E2C262C0089 for ; Tue, 13 Nov 2012 08:23:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754174Ab2KLVXr (ORCPT ); Mon, 12 Nov 2012 16:23:47 -0500 Received: from mail.vyatta.com ([76.74.103.46]:52625 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754117Ab2KLVXp (ORCPT ); Mon, 12 Nov 2012 16:23:45 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id C16601410471; Mon, 12 Nov 2012 13:23:44 -0800 (PST) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TKVScKzE-Rfh; Mon, 12 Nov 2012 13:23:42 -0800 (PST) Received: from nehalam.linuxnetplumber.net (static-50-53-80-93.bvtn.or.frontiernet.net [50.53.80.93]) by mail.vyatta.com (Postfix) with ESMTPSA id 89F5E14101AC; Mon, 12 Nov 2012 13:23:42 -0800 (PST) Date: Mon, 12 Nov 2012 13:22:41 -0800 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [RFC net-next] tun: implement BQL Message-ID: <20121112132241.12bb94e4@nehalam.linuxnetplumber.net> Organization: Vyatta Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add multiqueue BQL to tap device. Tested with VPN, doesn't have a big impact, most likely because there is little queueing occuring at TAP device except under case of forwarding. Signed-off-by: Stephen Hemminger --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/tun.c 2012-11-12 07:58:45.527037947 -0800 +++ b/drivers/net/tun.c 2012-11-12 11:20:26.017512742 -0800 @@ -412,6 +412,7 @@ static void __tun_detach(struct tun_file tun_flow_delete_by_queue(tun, tun->numqueues + 1); /* Drop read queue */ skb_queue_purge(&tfile->sk.sk_receive_queue); + netdev_tx_reset_queue(netdev_get_tx_queue(dev, index)); tun_set_real_num_queues(tun); if (tun->numqueues == 0 && !(tun->flags & TUN_PERSIST)) @@ -455,6 +456,7 @@ static void tun_detach_all(struct net_de lockdep_rtnl_is_held()); /* Drop read queue */ skb_queue_purge(&tfile->sk.sk_receive_queue); + netdev_tx_reset_queue(netdev_get_tx_queue(dev, i)); sock_put(&tfile->sk); } } @@ -712,6 +714,8 @@ static netdev_tx_t tun_net_xmit(struct s * for indefinite time. */ if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC))) goto drop; + + netdev_tx_sent_queue(netdev_get_tx_queue(dev, txq), skb->len); skb_orphan(skb); /* Enqueue packet */ @@ -1324,6 +1328,10 @@ static ssize_t tun_do_read(struct tun_st netif_wake_subqueue(tun->dev, tfile->queue_index); ret = tun_put_user(tun, tfile, skb, iv, len); + + netdev_tx_completed_queue(netdev_get_tx_queue(tun->dev, + tfile->queue_index), + 1, skb->len); kfree_skb(skb); break; }