From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: davem@davemloft.net, vyasevic@redhat.com,
kstewart@linuxfoundation.org, pombredanne@nexb.com,
vyasevich@gmail.com, mark.rutland@arm.com,
gregkh@linuxfoundation.org, adobriyan@gmail.com, fw@strlen.de,
nicolas.dichtel@6wind.com, xiyou.wangcong@gmail.com,
roman.kapl@sysgo.com, paul@paul-moore.com, dsahern@gmail.com,
daniel@iogearbox.net, lucien.xin@gmail.com,
mschiffer@universe-factory.net, rshearma@brocade.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
ktkhai@virtuozzo.com, ebiederm@xmission.com,
avagin@virtuozzo.com, gorcunov@virtuozzo.com,
eric.dumazet@gmail.com, stephen@networkplumber.org,
ktkhai@virtuozzo.com
Subject: [PATCH v2 01/31] net: Assign net to net_namespace_list in setup_net()
Date: Mon, 20 Nov 2017 21:32:16 +0300 [thread overview]
Message-ID: <151120273642.3159.6622419948722697029.stgit@localhost.localdomain> (raw)
In-Reply-To: <151120175301.3159.9577108443167812854.stgit@localhost.localdomain>
This patch merges two repeating pieces of code in one,
and they will live in setup_net() now.
It acts as cleanup even despite init_net_initialized
assignment is reordered with the linking of net now.
This variable is need for proc_net_init() called from:
start_kernel()->proc_root_init()->proc_net_init(),
which can't race with net_ns_init(), called from
initcall.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
net/core/net_namespace.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index b797832565d3..7ecf71050ffa 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -296,6 +296,9 @@ static __net_init int setup_net(struct net *net, struct user_namespace *user_ns)
if (error < 0)
goto out_undo;
}
+ rtnl_lock();
+ list_add_tail_rcu(&net->list, &net_namespace_list);
+ rtnl_unlock();
out:
return error;
@@ -417,11 +420,6 @@ struct net *copy_net_ns(unsigned long flags,
net->ucounts = ucounts;
rv = setup_net(net, user_ns);
- if (rv == 0) {
- rtnl_lock();
- list_add_tail_rcu(&net->list, &net_namespace_list);
- rtnl_unlock();
- }
mutex_unlock(&net_mutex);
if (rv < 0) {
dec_net_namespaces(ucounts);
@@ -847,11 +845,6 @@ static int __init net_ns_init(void)
panic("Could not setup the initial network namespace");
init_net_initialized = true;
-
- rtnl_lock();
- list_add_tail_rcu(&init_net.list, &net_namespace_list);
- rtnl_unlock();
-
mutex_unlock(&net_mutex);
register_pernet_subsys(&net_ns_ops);
next prev parent reply other threads:[~2017-11-20 18:32 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 18:32 [PATCH v2 00/31] Replacing net_mutex with rw_semaphore Kirill Tkhai
2017-11-20 18:32 ` Kirill Tkhai [this message]
2017-11-20 18:32 ` [PATCH v2 02/31] net: Cleanup copy_net_ns() Kirill Tkhai
2017-11-20 18:32 ` [PATCH v2 03/31] net: Introduce net_sem for protection of pernet_list Kirill Tkhai
2018-01-17 20:04 ` Andrei Vagin
2018-01-18 10:14 ` Kirill Tkhai
2017-11-20 18:32 ` [PATCH v2 04/31] net: Move mutex_unlock() in cleanup_net() up Kirill Tkhai
2017-11-20 18:32 ` [PATCH v2 05/31] net: Allow pernet_operations to be executed in parallel Kirill Tkhai
2018-01-17 18:34 ` Andrei Vagin
2018-01-18 10:16 ` Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 06/31] net: Convert proc_net_ns_ops Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 07/31] net: Convert net_ns_ops methods Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 08/31] net: Convert sysctl_pernet_ops Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 09/31] net: Convert netfilter_net_ops Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 10/31] net: Convert nf_log_net_ops Kirill Tkhai
2017-11-20 18:33 ` [PATCH v2 11/31] net: Convert net_inuse_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 12/31] net: Convert net_defaults_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 13/31] net: Convert netlink_net_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 14/31] net: Convert rtnetlink_net_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 15/31] net: Convert audit_net_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 16/31] net: Convert uevent_net_ops Kirill Tkhai
2017-11-20 18:34 ` [PATCH v2 17/31] net: Convert proto_net_ops Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 18/31] net: Convert pernet_subsys ops, registered via net_dev_init() Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 19/31] net: Convert fib_* pernet_operations, registered via subsys_initcall Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 20/31] net: Convert subsys_initcall() registered pernet_operations from net/sched Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 21/31] net: Convert genl_pernet_ops Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 22/31] net: Convert wext_pernet_ops Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 23/31] net: Convert sysctl_core_ops Kirill Tkhai
2017-11-20 18:35 ` [PATCH v2 24/31] net: Convert pernet_subsys, registered from inet_init() Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 25/31] net: Convert unix_net_ops Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 26/31] net: Convert packet_net_ops Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 27/31] net: Convert ipv4_sysctl_ops Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 28/31] net: Convert addrconf_ops Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 29/31] net: Convert loopback_net_ops Kirill Tkhai
2017-11-20 18:36 ` [PATCH v2 30/31] net: Convert default_device_ops Kirill Tkhai
2017-11-20 18:37 ` [PATCH v2 31/31] net: Convert diag_net_ops Kirill Tkhai
2017-12-04 15:54 ` [PATCH v2 00/31] Replacing net_mutex with rw_semaphore Kirill Tkhai
2017-12-04 16:10 ` David Miller
2017-12-04 16:11 ` Kirill Tkhai
2018-01-18 17:43 ` Andrei Vagin
2018-01-19 8:25 ` Kirill Tkhai
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=151120273642.3159.6622419948722697029.stgit@localhost.localdomain \
--to=ktkhai@virtuozzo.com \
--cc=adobriyan@gmail.com \
--cc=avagin@virtuozzo.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=fw@strlen.de \
--cc=gorcunov@virtuozzo.com \
--cc=gregkh@linuxfoundation.org \
--cc=kstewart@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucien.xin@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mschiffer@universe-factory.net \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=paul@paul-moore.com \
--cc=pombredanne@nexb.com \
--cc=roman.kapl@sysgo.com \
--cc=rshearma@brocade.com \
--cc=stephen@networkplumber.org \
--cc=vyasevic@redhat.com \
--cc=vyasevich@gmail.com \
--cc=xiyou.wangcong@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).