OpenVZ Forum: Devel » [PATCH 0/13] Pid namespaces (OpenVZ view)

Home » Mailing lists » Devel » [PATCH 0/13] Pid namespaces (OpenVZ view)

Show: Today's Messages :: Show Polls :: Message Navigator
E-mail to friend

[PATCH 6/13] Pid allocation/freeing procedures [message #13290 is a reply to message #13284]

Thu, 24 May 2007 12:49

Pavel Emelianov
Messages: 1149
Registered: September 2006

Senior Member

This patch make alloc_pid() and free_pid() aware of the
namespaces. When a pid is created not in init namespace
it gets into two hashes and holds the pointer to the
namespace itself.

Signed-off-by: Pavel Emelianov <xemul@openvz.org>

---

diff --git a/kernel/pid.c b/kernel/pid.c
index eb66bd2..1815af4 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -54,6 +54,12 @@ static inline int mk_pid(struct pid_name
#define find_next_offset(map, off) \
find_next_zero_bit((map)->page, BITS_PER_PAGE, off)

+#ifdef CONFIG_PID_NS
+static struct hlist_head *vpid_hash;
+#define vpid_hashfn(nr, ns) hash_long((unsigned long)nr + (unsigned long)ns, \
+ pidhash_shift)
+#endif
+
/*
* PID-map pages start out as NULL, they get allocated upon
* first use and are never deallocated. This way a low pid_max
@@ -197,9 +203,19 @@ fastcall void free_pid(struct pid *pid)

spin_lock_irqsave(&pidmap_lock, flags);
hlist_del_rcu(&pid->pid_chain);
+#ifdef CONFIG_PID_NS
+ if (pid->ns != &init_pid_ns)
+ hlist_del_rcu(&pid->vpid_chain);
+#endif
spin_unlock_irqrestore(&pidmap_lock, flags);

free_pidmap(&init_pid_ns, pid->nr);
+#ifdef CONFIG_PID_NS
+ if (pid->ns != &init_pid_ns) {
+ free_pidmap(pid->ns, pid->vnr);
+ put_pid_ns(pid->ns);
+ }
+#endif
call_rcu(&pid->rcu, delayed_put_pid);
}

@@ -207,28 +223,52 @@ struct pid *alloc_pid(void)
{
struct pid *pid;
enum pid_type type;
- int nr = -1;
+ int nr, vnr;
+ struct pid_namespace *ns;

pid = kmem_cache_alloc(pid_cachep, GFP_KERNEL);
if (!pid)
goto out;

- nr = alloc_pidmap(current->nsproxy->pid_ns);
+ vnr = nr = alloc_pidmap(&init_pid_ns);
if (nr < 0)
goto out_free;

+ ns = current->nsproxy->pid_ns;
+#ifdef CONFIG_PID_NS
+ if (ns != &init_pid_ns) {
+ vnr = alloc_pidmap(ns);
+ if (vnr < 0)
+ goto out_free_map;
+
+ get_pid_ns(ns);
+ }
+#endif
atomic_set(&pid->count, 1);
pid->nr = nr;
+#ifdef CONFIG_PID_NS
+ pid->vnr = vnr;
+ pid->ns = ns;
+#endif
for (type = 0; type < PIDTYPE_MAX; ++type)
INIT_HLIST_HEAD(&pid->tasks[type]);

spin_lock_irq(&pidmap_lock);
hlist_add_head_rcu(&pid->pid_chain, &pid_hash[pid_hashfn(pid->nr)]);
+#ifdef CONFIG_PID_NS
+ if (ns != &init_pid_ns)
+ hlist_add_head_rcu(&pid->vpid_chain,
+ &vpid_hash[vpid_hashfn(vnr, ns)]);
+#endif
spin_unlock_irq(&pidmap_lock);

out:
return pid;

+#ifdef CONFIG_PID_NS
+out_free_map:
+ free_pidmap(&init_pid_ns, nr);
+#endif
out_free:
kmem_cache_free(pid_cachep, pid);
pid = NULL;
@@ -397,12 +607,17 @@ void __init pidhash_init(void)
printk("PID hash table entries: %d (order: %d, %Zd bytes)\n",
pidhash_size, pidhash_shift,
pidhash_size * sizeof(struct hlist_head));
-
+#ifdef CONFIG_PID_NS
+ pidhash_size *= 2;
+#endif
pid_hash = alloc_bootmem(pidhash_size * sizeof(*(pid_hash)));
if (!pid_hash)
panic("Could not alloc pidhash!\n");
for (i = 0; i < pidhash_size; i++)
INIT_HLIST_HEAD(&pid_hash[i]);
+#ifdef CONFIG_PID_NS
+ vpid_hash = pid_hash + (pidhash_size / 2);
+#endif
}

void __init pidmap_init(void)

Report message to a moderator

[Message index]

		[PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Thu, 24 May 2007 12:32
		[PATCH 1/13] Round up the API By: Pavel Emelianov on Thu, 24 May 2007 12:35
		Re: [PATCH 1/13] Round up the API By: serue on Thu, 24 May 2007 16:09
		Re: [PATCH 1/13] Round up the API By: ebiederm on Thu, 24 May 2007 16:22
		Re: [PATCH 1/13] Round up the API By: Pavel Emelianov on Thu, 24 May 2007 16:31
		Re: [PATCH 1/13] Round up the API By: serue on Thu, 24 May 2007 16:48
		Re: [PATCH 1/13] Round up the API By: Pavel Emelianov on Fri, 25 May 2007 07:00
		Re: [PATCH 1/13] Round up the API By: serue on Fri, 25 May 2007 13:02
		[PATCH 2/13] Small preparations for namespaces By: Pavel Emelianov on Thu, 24 May 2007 12:37
		Re: [PATCH 2/13] Small preparations for namespaces By: serue on Thu, 24 May 2007 16:08
		Re: [PATCH 2/13] Small preparations for namespaces By: Pavel Emelianov on Fri, 25 May 2007 06:58
		Re: [PATCH 2/13] Small preparations for namespaces By: serue on Fri, 25 May 2007 13:01
		Re: [PATCH 2/13] Small preparations for namespaces By: Pavel Emelianov on Fri, 25 May 2007 13:21
		Re: [PATCH 2/13] Small preparations for namespaces By: serue on Fri, 25 May 2007 13:55
		[PATCH 3/13] Introduciton of config option and clone flag By: Pavel Emelianov on Thu, 24 May 2007 12:42
		Re: [PATCH 3/13] Introduciton of config option and clone flag By: ebiederm on Thu, 24 May 2007 15:39
		[PATCH 4/13] Introduce the vpid fields and helpers for getting them By: Pavel Emelianov on Thu, 24 May 2007 12:44
		[PATCH 5/13] Expand the pid/task seeking functions set By: Pavel Emelianov on Thu, 24 May 2007 12:46
		Re: [PATCH 5/13] Expand the pid/task seeking functions set By: Dave Hansen on Thu, 24 May 2007 17:11
		Re: [PATCH 5/13] Expand the pid/task seeking functions set By: Pavel Emelianov on Fri, 25 May 2007 07:08
		Re: [PATCH 5/13] Expand the pid/task seeking functions set By: Sukadev Bhattiprolu on Fri, 25 May 2007 23:36
		[PATCH 6/13] Pid allocation/freeing procedures By: Pavel Emelianov on Thu, 24 May 2007 12:49
		[PATCH 7/13] Set virtual pids for a newly cloned task By: Pavel Emelianov on Thu, 24 May 2007 12:53
		[PATCH 8/13] The namespace cloning By: Pavel Emelianov on Thu, 24 May 2007 12:57
		[PATCH 9/13] Make proc be able to have multiple super blocks By: Pavel Emelianov on Thu, 24 May 2007 13:01
		[PATCH 10/13] Make proc draw pids from appropriate namespace By: Pavel Emelianov on Thu, 24 May 2007 13:04
		[PATCH 11/13] Changes to show virtual ids to user By: Pavel Emelianov on Thu, 24 May 2007 13:06
		Re: [PATCH 11/13] Changes to show virtual ids to user By: ebiederm on Thu, 24 May 2007 16:05
		Re: [PATCH 11/13] Changes to show virtual ids to user By: xemul on Thu, 24 May 2007 16:15
		Re: [PATCH 11/13] Changes to show virtual ids to user By: ebiederm on Thu, 24 May 2007 16:33
		Re: [PATCH 11/13] Changes to show virtual ids to user By: Pavel Emelianov on Fri, 25 May 2007 06:33
		Re: [PATCH 11/13] Changes to show virtual ids to user By: ebiederm on Fri, 25 May 2007 15:48
		Re: [PATCH 11/13] Changes to show virtual ids to user By: Cedric Le Goater on Tue, 29 May 2007 12:32
		Re: [PATCH 11/13] Changes to show virtual ids to user By: Pavel Emelianov on Thu, 31 May 2007 07:57
		Re: [PATCH 11/13] Changes to show virtual ids to user By: Pavel Emelianov on Thu, 31 May 2007 08:00
		Re: [PATCH 11/13] Changes to show virtual ids to user By: ebiederm on Thu, 31 May 2007 11:26
		Re: [PATCH 11/13] Changes to show virtual ids to user By: Pavel Emelianov on Thu, 31 May 2007 11:46
		Re: [PATCH 11/13] Changes to show virtual ids to user By: ebiederm on Thu, 31 May 2007 13:41
		[PATCH 12/13] Show appropriate pids in proc By: Pavel Emelianov on Thu, 24 May 2007 13:08
		[PATCH 13/13] Make all proc entres accessible in a namespace By: Pavel Emelianov on Thu, 24 May 2007 13:13
		Instructions of how to make testing easy By: Pavel Emelianov on Thu, 24 May 2007 13:19
		Re: Instructions of how to make testing easy By: Pavel Emelianov on Thu, 24 May 2007 16:16
		Re: Instructions of how to make testing easy By: Cedric Le Goater on Thu, 24 May 2007 14:55
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Thu, 24 May 2007 15:09
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: xemul on Thu, 24 May 2007 16:11
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Thu, 24 May 2007 16:59
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Thu, 24 May 2007 18:56
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Thu, 24 May 2007 19:10
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 07:08
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Fri, 25 May 2007 13:25
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 13:53
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Fri, 25 May 2007 14:25
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Mon, 28 May 2007 07:48
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Tue, 29 May 2007 04:30
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Tue, 29 May 2007 07:47
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Tue, 29 May 2007 12:36
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 07:06
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Fri, 25 May 2007 14:55
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Thu, 24 May 2007 16:00
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Thu, 24 May 2007 16:20
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 06:29
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: serue on Fri, 25 May 2007 13:29
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Thu, 24 May 2007 16:26
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Thu, 24 May 2007 19:18
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 07:15
		Re: Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: dev on Mon, 28 May 2007 11:50
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: ebiederm on Tue, 29 May 2007 13:07
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Daniel Lezcano on Thu, 24 May 2007 16:41
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Pavel Emelianov on Fri, 25 May 2007 07:26
		Re: [PATCH 0/13] Pid namespaces (OpenVZ view) By: Daniel Lezcano on Fri, 25 May 2007 08:30

Previous Topic:	Re: [ckrm-tech] [RFC] [PATCH 0/3] Add group fairness to CFS
Next Topic:	[RFC][PATCH 0/16] Enable cloning of pid namespace

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

] [

]

Current Time: Sun Aug 03 09:43:00 GMT 2025

Total time taken to generate the page: 1.19945 seconds