From: "Serge E. Hallyn" <serue@us.ibm.com>
To: Alexey Dobriyan <adobriyan@gmail.com>
Cc: akpm@linux-foundation.org, containers@lists.linux-foundation.org,
xemul@parallels.com, dave@linux.vnet.ibm.com, mingo@elte.hu,
orenl@cs.columbia.edu, hch@infradead.org,
torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 07/30] netns: extract net_create()
Date: Fri, 10 Apr 2009 17:56:36 -0500 [thread overview]
Message-ID: <20090410225636.GD13873@us.ibm.com> (raw)
In-Reply-To: <20090410023448.GH27788@x200.localdomain>
Quoting Alexey Dobriyan (adobriyan@gmail.com):
> net_create() will be used by C/R code to create fresh netns on restart.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Although this ends up making a new assumption that setup_net(), and
therefore the pernet_ops->init() functions, do not return error > 0.
There's nothing actually stopping that (outside of code review, but
there appears to be no comment anywhere saying that's uncooth).
If it returns > 0, then we return the ns as though it were valid, but
don't add it to the list of namespaces... Do we care?
-serge
> ---
>
> include/net/net_namespace.h | 1 +
> net/core/net_namespace.c | 44 ++++++++++++++++++++------------------------
> 2 files changed, 21 insertions(+), 24 deletions(-)
>
> --- a/include/net/net_namespace.h
> +++ b/include/net/net_namespace.h
> @@ -107,6 +107,7 @@ static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns)
> extern struct list_head net_namespace_list;
>
> #ifdef CONFIG_NET_NS
> +struct net *net_create(void);
> extern void __put_net(struct net *net);
>
> static inline struct net *get_net(struct net *net)
> --- a/net/core/net_namespace.c
> +++ b/net/core/net_namespace.c
> @@ -115,38 +115,34 @@ static void net_free(struct net *net)
> kmem_cache_free(net_cachep, net);
> }
>
> -struct net *copy_net_ns(unsigned long flags, struct net *old_net)
> +struct net *net_create(void)
> {
> - struct net *new_net = NULL;
> - int err;
> -
> - if (!(flags & CLONE_NEWNET))
> - return get_net(old_net);
> -
> - err = -ENOMEM;
> - new_net = net_alloc();
> - if (!new_net)
> - goto out_err;
> + struct net *net;
> + int rv;
>
> + net = net_alloc();
> + if (!net)
> + return ERR_PTR(-ENOMEM);
> mutex_lock(&net_mutex);
> - err = setup_net(new_net);
> - if (!err) {
> + rv = setup_net(net);
> + if (rv == 0) {
> rtnl_lock();
> - list_add_tail(&new_net->list, &net_namespace_list);
> + list_add_tail(&net->list, &net_namespace_list);
> rtnl_unlock();
> }
> mutex_unlock(&net_mutex);
> + if (rv < 0) {
> + net_free(net);
> + return ERR_PTR(rv);
> + }
> + return net;
> +}
>
> - if (err)
> - goto out_free;
> -out:
> - return new_net;
> -
> -out_free:
> - net_free(new_net);
> -out_err:
> - new_net = ERR_PTR(err);
> - goto out;
> +struct net *copy_net_ns(unsigned long flags, struct net *old_net)
> +{
> + if (!(flags & CLONE_NEWNET))
> + return get_net(old_net);
> + return net_create();
> }
>
> static void cleanup_net(struct work_struct *work)
next prev parent reply other threads:[~2009-04-10 22:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-10 2:34 [PATCH 07/30] netns: extract net_create() Alexey Dobriyan
2009-04-10 9:04 ` Ingo Molnar
2009-04-10 22:56 ` Serge E. Hallyn [this message]
2009-04-13 7:11 ` Alexey Dobriyan
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=20090410225636.GD13873@us.ibm.com \
--to=serue@us.ibm.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=orenl@cs.columbia.edu \
--cc=torvalds@linux-foundation.org \
--cc=xemul@parallels.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).