From patchwork Fri Sep 14 20:32:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 970097 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s2cPQHrR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42BnJp4f4dz9s2P for ; Sat, 15 Sep 2018 06:32:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728005AbeIOBtA (ORCPT ); Fri, 14 Sep 2018 21:49:00 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:43578 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726969AbeIOBtA (ORCPT ); Fri, 14 Sep 2018 21:49:00 -0400 Received: by mail-pf1-f194.google.com with SMTP id j26-v6so4793639pfi.10 for ; Fri, 14 Sep 2018 13:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/EzQXDxladl+jNenbjd1v7SqHBaIhPQ2SfuyiF3FYgs=; b=s2cPQHrRZIElXBME63EcpuCj4dKXVcS0IsnG4OqyJ7BLLmNA9Jdm5jgXM3gugUl2xh xZlYMWbBlzn/65TW7udwpYJPCm53ZeNDXhVaQRIv52FTrc1gq3c1W3Adqsl8mn1dwRlS RZXA9NLEcwwn7wV+setfUGXyDUeGJW5zUmc8vzgnA9HTBBkEWFzkgdBfSPuRxVfEMa3D xix3sJir45GG+wq1qDDOx1EzHvAIvcgkdmZKqPKZhvLIoGdM3zLxnH7BMLaWHC+054pT WjEjNdjrC0lS2Z/MGBq7iocVp9xlNih6oz19a26lQ6bNcvyuIGthNWfH9k4rGYtQggeZ y8Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/EzQXDxladl+jNenbjd1v7SqHBaIhPQ2SfuyiF3FYgs=; b=GxiiDndrulOUft1wzwQTUCGPCivhA+ADT9e1v0BFWJqMuihLDRGczpHmksFKgUyM6J zxDHWqH6jLCPKfC6RMZBxhA9SYhpgi4jOf2O1ypRVQX4vGpTTPy/nekWQoH1MDQzNHts UrnQTrbD8devklP1W8mVaJuVXu++uXr/lTSXJHr8LR6Mklnebu7gg5dkewV5E52/Fjpb dsq3Nz1X2yTaPDOHAjhSLbStvE1pp1DpBi7NEAGbko51xWrZUmcdbRFobnZfMWvzxbp2 7C8hsm1rcoaoFUKaqnMG59748QTXd7UzboOzZJkUoAM0r+50J1jxMEoxFjklnwWBXSI6 DjjA== X-Gm-Message-State: APzg51CdqgTgdOdMKOrHStqk+ElPoVbyjx2HcgWzh+89n92zJhvRpnD7 Bq3+8QNmt2zq5DB6AbSJnYH/lQ/w X-Google-Smtp-Source: ANB0VdYU6S6PrWni0RqFjxWVs58gkkhYsEmffc4lNZ6qiB78AiVKhoJ3PM6biRDQ1/nOwtmFOrfqAg== X-Received: by 2002:a63:221b:: with SMTP id i27-v6mr12997041pgi.212.1536957175656; Fri, 14 Sep 2018 13:32:55 -0700 (PDT) Received: from tw-172-25-29-37.office.twttr.net ([8.25.197.25]) by smtp.gmail.com with ESMTPSA id m27-v6sm11108987pff.152.2018.09.14.13.32.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Sep 2018 13:32:54 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Kirill Tkhai Subject: [Patch net-next] ipv4: initialize ra_mutex in inet_init_net() Date: Fri, 14 Sep 2018 13:32:42 -0700 Message-Id: <20180914203242.2712-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.14.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ra_mutex is a IPv4 specific mutex, it is inside struct netns_ipv4, but its initialization is in the generic netns code, setup_net(). Move it to IPv4 specific net init code, inet_init_net(). Fixes: d9ff3049739e ("net: Replace ip_ra_lock with per-net mutex") Cc: Kirill Tkhai Signed-off-by: Cong Wang --- net/core/net_namespace.c | 1 - net/ipv4/af_inet.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 670c84b1bfc2..b272ccfcbf63 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -308,7 +308,6 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns) net->user_ns = user_ns; idr_init(&net->netns_ids); spin_lock_init(&net->nsid_lock); - mutex_init(&net->ipv4.ra_mutex); list_for_each_entry(ops, &pernet_list, list) { error = ops_init(ops, net); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 20fda8fb8ffd..57b7bffb93e5 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1817,6 +1817,8 @@ static __net_init int inet_init_net(struct net *net) net->ipv4.sysctl_igmp_llm_reports = 1; net->ipv4.sysctl_igmp_qrv = 2; + mutex_init(&net->ipv4.ra_mutex); + return 0; }