From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: davem@davemloft.net, xiyou.wangcong@gmail.com,
yoshfuji@linux-ipv6.org, ktkhai@virtuozzo.com,
avagin@virtuozzo.com, edumazet@google.com, ebiederm@xmission.com,
netdev@vger.kernel.org
Subject: [PATCH 3/3] ipv4: initialize ra_mutex in inet_init_net()
Date: Thu, 20 Sep 2018 12:12:13 +0300 [thread overview]
Message-ID: <153743472937.21312.592412049853708197.stgit@localhost.localdomain> (raw)
In-Reply-To: <153743451940.21312.15708795592586962785.stgit@localhost.localdomain>
From: Cong Wang <xiyou.wangcong@gmail.com>
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")
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
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 bbd3a072ffea..d4623144e237 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1818,6 +1818,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;
}
next prev parent reply other threads:[~2018-09-20 14:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 9:11 [PATCH net-next 0/3] Refactorings on af_inet pernet initialization Kirill Tkhai
2018-09-20 9:11 ` [PATCH 1/3] net: Remove inet_exit_net() Kirill Tkhai
2018-09-20 9:12 ` [PATCH 2/3] net: Register af_inet_ops earlier Kirill Tkhai
2018-09-20 17:03 ` Cong Wang
2018-09-20 9:12 ` Kirill Tkhai [this message]
2018-09-20 17:01 ` [PATCH 3/3] ipv4: initialize ra_mutex in inet_init_net() Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=153743472937.21312.592412049853708197.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=avagin@virtuozzo.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=edumazet@google.com \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox