From: Pavel Emelyanov <xemul@openvz.org>
To: David Miller <davem@davemloft.net>
Cc: Linux Netdev List <netdev@vger.kernel.org>,
devel@openvz.org, "Eric W. Biederman" <ebiederm@xmission.com>
Subject: [PATCH][NETNS] Make ifindex generation per-namespace
Date: Tue, 09 Oct 2007 16:19:25 +0400 [thread overview]
Message-ID: <470B71CD.3000706@openvz.org> (raw)
Currently indexes for netdevices come sequentially one by
one, and the same stays true even for devices that are
created for namespaces.
Side effects of this are:
* lo device has not 1 index in a namespace. This may break
some userspace that relies on it (and AFAIR something
really broke in OpenVZ VEs without this);
* after some time namespaces will have devices with indexes
like 1000000 os similar. This might be confusing for a
human (tools will not mind).
So move the (currently "global" and static) ifindex variable
on the struct net, making the indexes allocation look more
like on a standalone machine.
Moreover - when we have indexes intersect between namespaces,
we may catch more BUGs in the future related to "wrong device
was found for a given index".
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 93aa87d..83a18d0 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -29,6 +29,8 @@ struct net {
struct list_head dev_base_head;
struct hlist_head *dev_name_head;
struct hlist_head *dev_index_head;
+
+ int ifindex;
};
#ifdef CONFIG_NET
diff --git a/net/core/dev.c b/net/core/dev.c
index e7e728a..a08ed8c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3443,12 +3443,11 @@ int dev_ioctl(struct net *net, unsigned
*/
static int dev_new_index(struct net *net)
{
- static int ifindex;
for (;;) {
- if (++ifindex <= 0)
- ifindex = 1;
- if (!__dev_get_by_index(net, ifindex))
- return ifindex;
+ if (++net->ifindex <= 0)
+ net->ifindex = 1;
+ if (!__dev_get_by_index(net, net->ifindex))
+ return net->ifindex;
}
}
next reply other threads:[~2007-10-09 12:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-09 12:19 Pavel Emelyanov [this message]
2007-10-09 14:48 ` [PATCH][NETNS] Make ifindex generation per-namespace Daniel Lezcano
2007-10-09 16:18 ` David Stevens
2007-10-09 17:43 ` Eric W. Biederman
2007-10-09 20:11 ` David Miller
2007-10-09 21:00 ` Eric W. Biederman
2007-10-09 21:17 ` David Miller
2007-10-09 20:12 ` David Miller
2007-10-09 17:41 ` Eric W. Biederman
2007-10-10 8:55 ` Pavel Emelyanov
2007-10-10 18:15 ` Eric W. Biederman
2007-10-10 18:34 ` Johannes Berg
2007-10-10 19:51 ` Eric W. Biederman
2007-10-11 9:32 ` Johannes Berg
2007-10-11 17:22 ` Eric W. Biederman
2007-10-09 20:12 ` David Miller
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=470B71CD.3000706@openvz.org \
--to=xemul@openvz.org \
--cc=davem@davemloft.net \
--cc=devel@openvz.org \
--cc=ebiederm@xmission.com \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).