From patchwork Wed Nov 24 23:14:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 72961 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 9211CB6F11 for ; Thu, 25 Nov 2010 10:18:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756590Ab0KXXRd (ORCPT ); Wed, 24 Nov 2010 18:17:33 -0500 Received: from mga14.intel.com ([143.182.124.37]:24238 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756567Ab0KXXRb (ORCPT ); Wed, 24 Nov 2010 18:17:31 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 24 Nov 2010 15:17:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,250,1288594800"; d="scan'208";a="352953394" Received: from unknown (HELO [127.0.0.1]) ([10.23.209.48]) by azsmga001.ch.intel.com with ESMTP; 24 Nov 2010 15:17:10 -0800 From: John Fastabend Subject: [net-next-2.6 PATCH] 8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues To: netdev@vger.kernel.org Cc: eric.dumazet@gmail.com Date: Wed, 24 Nov 2010 15:14:50 -0800 Message-ID: <20101124231450.3158.67194.stgit@jf-dev1-dcblab> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that the vlan device is lockless and single queue do not transfer the real num queues. This is causing a BUG_ON to occur. kernel BUG at net/8021q/vlan.c:345! Call Trace: [] ? fib_rules_event+0x28/0x1b0 [] notifier_call_chain+0x55/0x80 [] raw_notifier_call_chain+0x16/0x20 [] call_netdevice_notifiers+0x37/0x70 [] netdev_features_change+0x16/0x20 [] ixgbe_fcoe_enable+0xae/0x100 [ixgbe] [] vlan_dev_fcoe_enable+0x2a/0x30 [8021q] [] fcoe_create+0x163/0x630 [fcoe] [] ? mmap_region+0x255/0x5a0 [] param_attr_store+0x50/0x80 [] module_attr_store+0x26/0x30 [] sysfs_write_file+0xf2/0x180 [] vfs_write+0xc8/0x190 [] sys_write+0x51/0x90 [] system_call_fastpath+0x16/0x1b Signed-off-by: John Fastabend --- net/8021q/vlan.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) -- 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 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index dc10713..6e64f7c 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -341,9 +341,6 @@ static void vlan_transfer_features(struct net_device *dev, #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE) vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid; #endif - vlandev->real_num_tx_queues = dev->real_num_tx_queues; - BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues); - if (old_features != vlandev->features) netdev_features_change(vlandev); }