[PATCH 2/4] c/r: [ipc] allow shmat callers to specify ipc namespace

Oren Laadan orenl at cs.columbia.edu
Mon Jan 10 18:11:27 PST 2011


From: Nathan Lynch <ntl at pobox.com>

Restore of huge page shm regions will require that the restarting
process temporarily shmat-attach to regions which are not in the
current ipc namespace.  Add an ipc_namespace argument to
do_shmat_pgoff; convert callers to pass current->nsproxy->ipc_ns.

This depends on the patch "support ipc shm regions which are partially
mapped" posted to the containers list on 6 August.

Signed-off-by: Nathan Lynch <ntl at pobox.com>
Acked-by: Oren Laadan <orenl at cs.columbia.edu>
---
 include/linux/shm.h |   15 ++++++++++-----
 ipc/shm.c           |   17 +++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 1f6af8c..963591d 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -103,11 +103,14 @@ struct shmid_kernel /* private to the kernel */
 #define SHM_HUGETLB     04000   /* segment will use huge TLB pages */
 #define SHM_NORESERVE   010000  /* don't check for reservations */
 
+struct ipc_namespace;
+
 #ifdef CONFIG_SYSVIPC
-long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);
-long do_shmat_pgoff(int shmid, char __user *shmaddr,
-		    int shmflg, unsigned long *addr,
-		    unsigned long shmsize, unsigned long shmpgoff);
+extern long do_shmat(int shmid, char __user *shmaddr,
+		     int shmflg, unsigned long *addr);
+extern long do_shmat_ns_pgoff(struct ipc_namespace *ns, int shmid,
+			      char __user *shmaddr, int shmflg, unsigned long *addr,
+			      unsigned long shmsize, unsigned long shmpgoff);
 extern int is_file_shm_hugepages(struct file *file);
 #else
 static inline long do_shmat(int shmid, char __user *shmaddr,
@@ -115,13 +118,15 @@ static inline long do_shmat(int shmid, char __user *shmaddr,
 {
 	return -ENOSYS;
 }
+static inline long do_shmat_ns_pgoff(struct ipc_namespace *ns, int shmid,
+			      char __user *shmaddr, int shmflg, unsigned long *addr,
+			      unsigned long shmsize, unsigned long shmpgoff);
 static inline int is_file_shm_hugepages(struct file *file)
 {
 	return 0;
 }
 #endif
 
-struct ipc_namespace;
 extern int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd,
 		       struct shmid_ds __user *buf, int version);
 
diff --git a/ipc/shm.c b/ipc/shm.c
index a18e7b7..a679523 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -322,6 +322,7 @@ static int ipcshm_checkpoint(struct ckpt_ctx *ctx, struct vm_area_struct *vma)
 int ipcshm_restore(struct ckpt_ctx *ctx, struct mm_struct *mm,
 		   struct ckpt_hdr_vma *h)
 {
+	struct ipc_namespace *ipcns = current->nsproxy->ipc_ns;
 	struct file *file;
 	int shmid, shmflg = 0;
 	unsigned long start;
@@ -353,9 +354,9 @@ int ipcshm_restore(struct ckpt_ctx *ctx, struct mm_struct *mm,
 	 */
 	start = (unsigned long) h->vm_start;
 	size = h->vm_end - h->vm_start;
-	ret = do_shmat_pgoff(shmid, (char __user *) start, shmflg, &addr,
-			     min(size, (unsigned long) h->ino_size),
-			     h->vm_pgoff << PAGE_SHIFT);
+	ret = do_shmat_ns_pgoff(ipcns, shmid, (char __user *) start, shmflg,
+				&addr, min(size, (unsigned long) h->ino_size),
+				h->vm_pgoff << PAGE_SHIFT);
 
 	BUG_ON(ret >= 0 && addr != h->vm_start);
 	return ret;
@@ -900,8 +901,9 @@ out:
  * "raddr" thing points to kernel space, and there has to be a wrapper around
  * this.
  */
-long do_shmat_pgoff(int shmid, char __user *shmaddr, int shmflg,
-		    ulong *raddr, ulong shmsize, ulong shmpgoff)
+long do_shmat_ns_pgoff(struct ipc_namespace *ns, int shmid,
+		       char __user *shmaddr, int shmflg, ulong *raddr,
+		       ulong shmsize, ulong shmpgoff)
 {
 	struct shmid_kernel *shp;
 	unsigned long addr;
@@ -913,7 +915,6 @@ long do_shmat_pgoff(int shmid, char __user *shmaddr, int shmflg,
 	unsigned long prot;
 	int acc_mode;
 	unsigned long user_addr;
-	struct ipc_namespace *ns;
 	struct shm_file_data *sfd;
 	struct path path;
 	fmode_t f_mode;
@@ -957,7 +958,6 @@ long do_shmat_pgoff(int shmid, char __user *shmaddr, int shmflg,
 	 * We cannot rely on the fs check since SYSV IPC does have an
 	 * additional creator id...
 	 */
-	ns = current->nsproxy->ipc_ns;
 	shp = shm_lock_check(ns, shmid);
 	if (IS_ERR(shp)) {
 		err = PTR_ERR(shp);
@@ -1065,7 +1065,8 @@ out_put_dentry:
  */
 long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
 {
-	return do_shmat_pgoff(shmid, shmaddr, shmflg, raddr, 0, 0);
+	return do_shmat_ns_pgoff(current->nsproxy->ipc_ns, shmid, shmaddr,
+				 shmflg, raddr, 0, 0);
 }
 
 SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg)
-- 
1.7.1



More information about the Containers mailing list