From patchwork Wed Jul 18 19:06:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rustad, Mark D" X-Patchwork-Id: 171811 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 6D5612C00B8 for ; Thu, 19 Jul 2012 05:06:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755673Ab2GRTGz (ORCPT ); Wed, 18 Jul 2012 15:06:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:40161 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755649Ab2GRTGx (ORCPT ); Wed, 18 Jul 2012 15:06:53 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 18 Jul 2012 12:06:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="173852044" Received: from host1-mdrustad.jf.intel.com (HELO host1-mdrustad.localdomain) ([10.23.155.89]) by orsmga002.jf.intel.com with ESMTP; 18 Jul 2012 12:06:53 -0700 Received: from host1-mdrustad.localdomain (localhost [127.0.0.1]) by host1-mdrustad.localdomain (8.14.5/8.14.5) with ESMTP id q6IJ67YT022953; Wed, 18 Jul 2012 12:06:07 -0700 From: Mark Rustad Subject: [PATCH] net: Statically initialize init_net.dev_base_head To: netdev@vger.kernel.org, davem@davemloft.net, gaofeng@cn.fujitsu.com, nhorman@tuxdriver.com, eric.dumazet@gmail.com Date: Wed, 18 Jul 2012 12:06:07 -0700 Message-ID: <20120718190607.22923.77935.stgit@host1-mdrustad.localdomain> 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 This change eliminates an initialization-order hazard most recently seen when netprio_cgroup is built into the kernel. With thanks to Eric Dumazet for catching a bug. Signed-off-by: Mark Rustad Acked-by: Eric Dumazet --- net/core/dev.c | 3 ++- net/core/net_namespace.c | 4 +++- 2 files changed, 5 insertions(+), 2 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/core/dev.c b/net/core/dev.c index 0f28a9e..1cb0d8a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6283,7 +6283,8 @@ static struct hlist_head *netdev_create_hash(void) /* Initialize per network namespace state */ static int __net_init netdev_init(struct net *net) { - INIT_LIST_HEAD(&net->dev_base_head); + if (net != &init_net) + INIT_LIST_HEAD(&net->dev_base_head); net->dev_name_head = netdev_create_hash(); if (net->dev_name_head == NULL) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index dddbacb..42f1e1c 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -27,7 +27,9 @@ static DEFINE_MUTEX(net_mutex); LIST_HEAD(net_namespace_list); EXPORT_SYMBOL_GPL(net_namespace_list); -struct net init_net; +struct net init_net = { + .dev_base_head = LIST_HEAD_INIT(init_net.dev_base_head), +}; EXPORT_SYMBOL(init_net); #define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */