Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932615AbbHXIdV (ORCPT ); Mon, 24 Aug 2015 04:33:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45536 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbbHXIdT (ORCPT ); Mon, 24 Aug 2015 04:33:19 -0400 From: Jason Wang To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jason Wang , Patrick McHardy , Vladislav Yasevich , "Michael S. Tsirkin" Subject: [PATCH net-next] macvtap/macvlan: use IFF_NO_QUEUE Date: Mon, 24 Aug 2015 16:33:12 +0800 Message-Id: <1440405192-25926-1-git-send-email-jasowang@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1756 Lines: 47 For macvlan, switch to use IFF_NO_QUEUE instead of tx_queue_len = 0. For macvtap, after commit 6acf54f1cf0a6747bac9fea26f34cfc5a9029523 ("macvtap: Add support of packet capture on macvtap device."). Multiqueue macvtap suffers from single qdisc lock contention. This is because macvtap claims a non zero tx_queue_len and it reuses this value as it socket receive queue size.Thanks to IFF_NO_QUEUE, we can remove the lock contention without breaking existing socket receive queue length logic. Cc: Patrick McHardy Cc: Vladislav Yasevich Cc: Michael S. Tsirkin Signed-off-by: Jason Wang --- drivers/net/macvlan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 47da435..09d8718 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -1056,7 +1056,7 @@ void macvlan_common_setup(struct net_device *dev) dev->priv_flags &= ~IFF_TX_SKB_SHARING; netif_keep_dst(dev); - dev->priv_flags |= IFF_UNICAST_FLT; + dev->priv_flags |= IFF_UNICAST_FLT | IFF_NO_QUEUE; dev->netdev_ops = &macvlan_netdev_ops; dev->destructor = free_netdev; dev->header_ops = &macvlan_hard_header_ops; @@ -1067,7 +1067,6 @@ EXPORT_SYMBOL_GPL(macvlan_common_setup); static void macvlan_setup(struct net_device *dev) { macvlan_common_setup(dev); - dev->tx_queue_len = 0; } static int macvlan_port_create(struct net_device *dev) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/