This patch adds in 'id' member to struct net. This member contains an
IDA ID. The id is allocated at netns creation.

This id will be used to 'tag' net devices belonging to network namespace
in sysfs (in order to allow registration of net devices with the same name
in different network namespace: see last patch for the details).

The advantage of IDA IDs over using the netns pointer is the id values
are small starting at 0, thus they requires less bytes to be displayed
(we are limited to 3 characters: again see last patch for the details).
And they stay small as they are recycled when IDs are freed (unless you
have thousands of netns running on your host).

Signed-off-by: Benjamin Thery
Acked-by: Serge Hallyn
---
include/net/net_namespace.h | 2 ++
net/core/net_namespace.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)

Index: net-next-2.6/include/net/net_namespace.h
================================================== =================
--- net-next-2.6.orig/include/net/net_namespace.h
+++ net-next-2.6/include/net/net_namespace.h
@@ -75,6 +75,8 @@ struct net {
#endif
#endif
struct net_generic *gen;
+
+ int id;
};


Index: net-next-2.6/net/core/net_namespace.c
================================================== =================
--- net-next-2.6.orig/net/core/net_namespace.c
+++ net-next-2.6/net/core/net_namespace.c
@@ -26,6 +26,16 @@ EXPORT_SYMBOL(init_net);
#define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */

/*
+ * IDs allocated from this ida are used as a suffix in sysfs to tag
+ * devices belonging to each netns (other than init_net).
+ * Only 4 characters are left to store a separator plus this tag in sysfs
+ * (BUS_ID_SIZE-IFNAMSIZ)
+ * Thus, this limits us to 4095 ("FFF") simultaneous network namespaces.
+ */
+static DEFINE_IDA(net_id_ida);
+#define NET_ID_MAX 0xFFF
+
+/*
* setup_net runs the initializers for the network namespace object.
*/
static __net_init int setup_net(struct net *net)
@@ -40,7 +50,20 @@ static __net_init int setup_net(struct n
atomic_set(&net->use_count, 0);
#endif

+ /* Get an ID */
+again:
+ error = ida_get_new(&net_id_ida, &net->id);
+ if (error) {
+ if (error == -EAGAIN) {
+ ida_pre_get(&net_id_ida, GFP_KERNEL);
+ goto again;
+ }
+ goto out;
+ }
error = -ENOMEM;
+ if (net->id > NET_ID_MAX)
+ goto out;
+
ng = kzalloc(sizeof(struct net_generic) +
INITIAL_NET_GEN_PTRS * sizeof(void *), GFP_KERNEL);
if (ng == NULL)
@@ -97,6 +120,7 @@ static void net_free(struct net *net)
}
#endif

+ ida_remove(&net_id_ida, net->id);
kmem_cache_free(net_cachep, net);
}


--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/