From: Pavel Emelyanov <xemul@openvz.org>
To: Linux Netdev List <netdev@vger.kernel.org>
Cc: Daniel Lezcano <dlezcano@fr.ibm.com>,
Denis Lunev <den@openvz.org>,
Linux Containers <containers@lists.osdl.org>,
Benjamin Thery <benjamin.thery@bull.net>
Subject: [PATCH 1/14][NETNS]: Introduce the net-subsys id generator.
Date: Thu, 10 Apr 2008 19:01:09 +0400 [thread overview]
Message-ID: <47FE2BB5.4070708@openvz.org> (raw)
In-Reply-To: <47FE2AD4.9080609@openvz.org>
To make some per-net generic pointers, we need some way to
address them, i.e. - IDs. This is simple IDA-based IDs
generator for pernet subsystems. They will be used in the
next patches.
Since it will be used by devices only (tun and vlan), I make
it resemble the register_pernet_device functionality.
The new ids is stored in the *id pointer _before_ calling the
init callback to make this id available in this callback.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
include/net/net_namespace.h | 2 ++
net/core/net_namespace.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 0ab62ed..6971fdb 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -181,6 +181,8 @@ extern int register_pernet_subsys(struct pernet_operations *);
extern void unregister_pernet_subsys(struct pernet_operations *);
extern int register_pernet_device(struct pernet_operations *);
extern void unregister_pernet_device(struct pernet_operations *);
+extern int register_pernet_gen_device(int *id, struct pernet_operations *);
+extern void unregister_pernet_gen_device(int id, struct pernet_operations *);
struct ctl_path;
struct ctl_table;
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 7b66083..7ef3bac 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -5,6 +5,7 @@
#include <linux/list.h>
#include <linux/delay.h>
#include <linux/sched.h>
+#include <linux/idr.h>
#include <net/net_namespace.h>
/*
@@ -253,6 +254,8 @@ static void unregister_pernet_operations(struct pernet_operations *ops)
}
#endif
+static DEFINE_IDA(net_generic_ids);
+
/**
* register_pernet_subsys - register a network namespace subsystem
* @ops: pernet operations structure for the subsystem
@@ -330,6 +333,28 @@ int register_pernet_device(struct pernet_operations *ops)
}
EXPORT_SYMBOL_GPL(register_pernet_device);
+int register_pernet_gen_device(int *id, struct pernet_operations *ops)
+{
+ int error;
+ mutex_lock(&net_mutex);
+again:
+ error = ida_get_new_above(&net_generic_ids, 1, id);
+ if (error) {
+ if (error == -EAGAIN) {
+ ida_pre_get(&net_generic_ids, GFP_KERNEL);
+ goto again;
+ }
+ }
+ error = register_pernet_operations(first_device, ops);
+ if (error)
+ ida_remove(&net_generic_ids, *id);
+ else if (first_device == &pernet_list)
+ first_device = &ops->list;
+ mutex_unlock(&net_mutex);
+ return error;
+}
+EXPORT_SYMBOL_GPL(register_pernet_gen_device);
+
/**
* unregister_pernet_device - unregister a network namespace netdevice
* @ops: pernet operations structure to manipulate
@@ -348,3 +373,14 @@ void unregister_pernet_device(struct pernet_operations *ops)
mutex_unlock(&net_mutex);
}
EXPORT_SYMBOL_GPL(unregister_pernet_device);
+
+void unregister_pernet_gen_device(int id, struct pernet_operations *ops)
+{
+ mutex_lock(&net_mutex);
+ if (&ops->list == first_device)
+ first_device = first_device->next;
+ unregister_pernet_operations(ops);
+ ida_remove(&net_generic_ids, id);
+ mutex_unlock(&net_mutex);
+}
+EXPORT_SYMBOL_GPL(unregister_pernet_gen_device);
--
1.5.3.4
next prev parent reply other threads:[~2008-04-10 14:37 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-10 14:57 [PATCH 0/14 (3 subsets)] Make tuns and vlans devices work per-net Pavel Emelyanov
2008-04-10 15:01 ` Pavel Emelyanov [this message]
2008-04-10 17:37 ` [Devel] [PATCH 1/14][NETNS]: Introduce the net-subsys id generator Paul Menage
2008-04-10 20:52 ` Daniel Lezcano
2008-04-11 7:56 ` Pavel Emelyanov
2008-04-10 15:06 ` [PATCH 3/14][TUN]: Introduce the tun_net structure Pavel Emelyanov
2008-04-11 1:01 ` Paul E. McKenney
2008-04-11 7:55 ` Pavel Emelyanov
2008-04-11 15:04 ` Paul E. McKenney
2008-04-11 15:45 ` Pavel Emelyanov
2008-04-11 16:27 ` Paul E. McKenney
2008-04-12 8:44 ` Pavel Emelyanov
2008-04-15 7:44 ` David Miller
2008-04-15 10:31 ` Pavel Emelyanov
[not found] ` <48048411.5030506-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-15 10:06 ` David Miller
2008-04-10 15:07 ` [PATCH 4/14][TUN]: Actually make the tun_dev_list per-net Pavel Emelyanov
2008-04-10 15:09 ` [PATCH 5/14][TUN]: Allow to register tun devices in namespace Pavel Emelyanov
2008-04-10 15:10 ` [PATCH 6/14][RTNL]: Introduce the rtnl_kill_links call Pavel Emelyanov
[not found] ` <47FE2E01.6030000-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-10 22:09 ` Daniel Hokka Zakrisson
2008-04-11 8:01 ` Pavel Emelyanov
2008-04-11 12:48 ` Patrick McHardy
2008-04-10 15:13 ` [PATCH 7/14][VLAN]: Tag vlan_group with device, not ifindex Pavel Emelyanov
2008-04-10 15:16 ` [PATCH 9/14][VLAN]: Add net argument to proc init/cleanup calls Pavel Emelyanov
2008-04-10 15:19 ` [PATCH 11/14][VLAN]: Make /proc/net/vlan/conf file show per-net info Pavel Emelyanov
2008-04-10 15:20 ` [PATCH 12/14][VLAN]: Make vlan_name_type per-net Pavel Emelyanov
2008-04-10 15:22 ` [PATCH 13/14][VLAN]: Allows vlan devices registration in net namespace Pavel Emelyanov
[not found] ` <47FE2AD4.9080609-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2008-04-10 15:04 ` [PATCH 2/14][NETNS]: Generic per-net pointers Pavel Emelyanov
2008-04-11 13:43 ` Daniel Lezcano
[not found] ` <47FF6B1B.5090106-NmTC/0ZBporQT0dZR+AlfA@public.gmane.org>
2008-04-11 14:29 ` Pavel Emelyanov
2008-04-10 15:14 ` [PATCH 8/14][VLAN]: Introduce the vlan_net structure Pavel Emelyanov
2008-04-10 15:18 ` [PATCH 10/14][VLAN]: Create proc files in proper net Pavel Emelyanov
2008-04-10 15:23 ` [PATCH 14/14][VLAN]: Migrate proc files when vlan device is moved to namespace Pavel Emelyanov
2008-04-11 15:42 ` [PATCH 0/14 (3 subsets)] Make tuns and vlans devices work per-net Daniel Lezcano
2008-04-11 15:57 ` Pavel Emelyanov
2008-04-11 18:11 ` 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=47FE2BB5.4070708@openvz.org \
--to=xemul@openvz.org \
--cc=benjamin.thery@bull.net \
--cc=containers@lists.osdl.org \
--cc=den@openvz.org \
--cc=dlezcano@fr.ibm.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).