ed2ddbf88c
Each ipc_namespace contains a table of 3 pointers to struct ipc_ids (3 for msg, sem and shm, structure used to store all ipcs) These 'struct ipc_ids' are dynamically allocated for each icp_namespace as the ipc_namespace itself (for the init namespace, they are initialized with pointers to static variables instead) It is so for historical reason: in fact, before the use of idr to store the ipcs, the ipcs were stored in tables of variable length, depending of the maximum number of ipc allowed. Now, these 'struct ipc_ids' have a fixed size. As they are allocated in any cases for each new ipc_namespace, there is no gain of memory in having them allocated separately of the struct ipc_namespace. This patch proposes to make this table static in the struct ipc_namespace. Thus, we can allocate all in once and get rid of all the code needed to allocate and free these ipc_ids separately. Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net> Acked-by: Cedric Le Goater <clg@fr.ibm.com> Cc: Pavel Emelyanov <xemul@openvz.org> Cc: Nadia Derbey <Nadia.Derbey@bull.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
56 lines
1 KiB
C
56 lines
1 KiB
C
/*
|
|
* linux/ipc/namespace.c
|
|
* Copyright (C) 2006 Pavel Emelyanov <xemul@openvz.org> OpenVZ, SWsoft Inc.
|
|
*/
|
|
|
|
#include <linux/ipc.h>
|
|
#include <linux/msg.h>
|
|
#include <linux/ipc_namespace.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "util.h"
|
|
|
|
static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns)
|
|
{
|
|
struct ipc_namespace *ns;
|
|
|
|
ns = kmalloc(sizeof(struct ipc_namespace), GFP_KERNEL);
|
|
if (ns == NULL)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
sem_init_ns(ns);
|
|
msg_init_ns(ns);
|
|
shm_init_ns(ns);
|
|
|
|
kref_init(&ns->kref);
|
|
return ns;
|
|
}
|
|
|
|
struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns)
|
|
{
|
|
struct ipc_namespace *new_ns;
|
|
|
|
BUG_ON(!ns);
|
|
get_ipc_ns(ns);
|
|
|
|
if (!(flags & CLONE_NEWIPC))
|
|
return ns;
|
|
|
|
new_ns = clone_ipc_ns(ns);
|
|
|
|
put_ipc_ns(ns);
|
|
return new_ns;
|
|
}
|
|
|
|
void free_ipc_ns(struct kref *kref)
|
|
{
|
|
struct ipc_namespace *ns;
|
|
|
|
ns = container_of(kref, struct ipc_namespace, kref);
|
|
sem_exit_ns(ns);
|
|
msg_exit_ns(ns);
|
|
shm_exit_ns(ns);
|
|
kfree(ns);
|
|
}
|