* [PATCH -mm 8/9] unshare system call: allow unsharing of vm
@ 2005-12-13 22:54 JANAK DESAI
0 siblings, 0 replies; 3+ messages in thread
From: JANAK DESAI @ 2005-12-13 22:54 UTC (permalink / raw)
To: viro, chrisw, dwmw2, jamie, serue, mingo, linuxram, jmorris, sds, janak
Cc: akpm, linux-kernel
[PATCH -mm 8/9] unshare system call: allow unsharing of vm
If vm structure is being shared, allocate a new one and
copy information from the current, shared, structure.
Changes since the first submission of this patch on 12/12/05:
- Removed an unnecessary local variable (12/13/05)
Signed-off-by: Janak Desai <janak@us.ibm.com>
---
fork.c | 87 +++++++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff -Naurp 2.6.15-rc5-mm2+patch/kernel/fork.c 2.6.15-rc5-mm2+patch8/kernel/fork.c
--- 2.6.15-rc5-mm2+patch/kernel/fork.c 2005-12-13 18:38:26.000000000 +0000
+++ 2.6.15-rc5-mm2+patch8/kernel/fork.c 2005-12-13 19:40:56.000000000 +0000
@@ -445,6 +445,55 @@ void mm_release(struct task_struct *tsk,
}
}
+/*
+ * Allocate a new mm structure and copy contents from the
+ * mm structure of the passed in task structure.
+ */
+static struct mm_struct *dup_mm(struct task_struct *tsk)
+{
+ struct mm_struct *mm, *oldmm = current->mm;
+ int err;
+
+ if (!oldmm)
+ return NULL;
+
+ mm = allocate_mm();
+ if (!mm)
+ goto fail_nomem;
+
+ memcpy(mm, oldmm, sizeof(*mm));
+
+ if (!mm_init(mm))
+ goto fail_nomem;
+
+ if (init_new_context(tsk, mm))
+ goto fail_nocontext;
+
+ err = dup_mmap(mm, oldmm);
+ if (err)
+ goto free_pt;
+
+ mm->hiwater_rss = get_mm_rss(mm);
+ mm->hiwater_vm = mm->total_vm;
+
+ return mm;
+
+free_pt:
+ mmput(mm);
+
+fail_nomem:
+ return NULL;
+
+fail_nocontext:
+ /*
+ * If init_new_context() failed, we cannot use mmput() to free the mm
+ * because it calls destroy_context()
+ */
+ mm_free_pgd(mm);
+ free_mm(mm);
+ return NULL;
+}
+
static int copy_mm(unsigned long clone_flags, struct task_struct * tsk)
{
struct mm_struct * mm, *oldmm;
@@ -472,43 +521,17 @@ static int copy_mm(unsigned long clone_f
}
retval = -ENOMEM;
- mm = allocate_mm();
+ mm = dup_mm(tsk);
if (!mm)
goto fail_nomem;
- /* Copy the current MM stuff.. */
- memcpy(mm, oldmm, sizeof(*mm));
- if (!mm_init(mm))
- goto fail_nomem;
-
- if (init_new_context(tsk,mm))
- goto fail_nocontext;
-
- retval = dup_mmap(mm, oldmm);
- if (retval)
- goto free_pt;
-
- mm->hiwater_rss = get_mm_rss(mm);
- mm->hiwater_vm = mm->total_vm;
-
good_mm:
tsk->mm = mm;
tsk->active_mm = mm;
return 0;
-free_pt:
- mmput(mm);
fail_nomem:
return retval;
-
-fail_nocontext:
- /*
- * If init_new_context() failed, we cannot use mmput() to free the mm
- * because it calls destroy_context()
- */
- mm_free_pgd(mm);
- free_mm(mm);
- return retval;
}
static inline struct fs_struct *__copy_fs_struct(struct fs_struct *old)
@@ -1422,18 +1445,20 @@ static int unshare_sighand(unsigned long
}
/*
- * Unsharing of vm for tasks created with CLONE_VM is not supported yet
+ * Unshare vm if it is being shared
*/
static int unshare_vm(unsigned long unshare_flags, struct mm_struct **new_mmp)
{
struct mm_struct *mm = current->mm;
if ((unshare_flags & CLONE_VM) &&
- (mm && atomic_read(&mm->mm_users) > 1))
- return -EINVAL;
+ (mm && atomic_read(&mm->mm_users) > 1)) {
+ *new_mmp = dup_mm(current);
+ if (!*new_mmp)
+ return -ENOMEM;
+ }
return 0;
-
}
/*
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH -mm 8/9] unshare system call: allow unsharing of vm
@ 2005-12-13 13:43 JANAK DESAI
0 siblings, 0 replies; 3+ messages in thread
From: JANAK DESAI @ 2005-12-13 13:43 UTC (permalink / raw)
To: viro, chrisw, dwmw2, jamie, serue, mingo, linuxram, jmorris, sds, janak
Cc: akpm, linux-kernel
[PATCH -mm 8/9] unshare system call: allow unsharing of vm
fork.c | 90 +++++++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 32 deletions(-)
diff -Naurp 2.6.15-rc5-mm2+patch/kernel/fork.c 2.6.15-rc5-mm2+patch8/kernel/fork.c
--- 2.6.15-rc5-mm2+patch/kernel/fork.c 2005-12-12 19:31:48.000000000 +0000
+++ 2.6.15-rc5-mm2+patch8/kernel/fork.c 2005-12-12 22:20:29.000000000 +0000
@@ -445,6 +445,55 @@ void mm_release(struct task_struct *tsk,
}
}
+/*
+ * Allocate a new mm structure and copy contents from the
+ * mm structure of the passed in task structure.
+ */
+static struct mm_struct *dup_mm(struct task_struct *tsk)
+{
+ struct mm_struct *mm, *oldmm = current->mm;
+ int err;
+
+ if (!oldmm)
+ return NULL;
+
+ mm = allocate_mm();
+ if (!mm)
+ goto fail_nomem;
+
+ memcpy(mm, oldmm, sizeof(*mm));
+
+ if (!mm_init(mm))
+ goto fail_nomem;
+
+ if (init_new_context(tsk, mm))
+ goto fail_nocontext;
+
+ err = dup_mmap(mm, oldmm);
+ if (err)
+ goto free_pt;
+
+ mm->hiwater_rss = get_mm_rss(mm);
+ mm->hiwater_vm = mm->total_vm;
+
+ return mm;
+
+free_pt:
+ mmput(mm);
+
+fail_nomem:
+ return NULL;
+
+fail_nocontext:
+ /*
+ * If init_new_context() failed, we cannot use mmput() to free the mm
+ * because it calls destroy_context()
+ */
+ mm_free_pgd(mm);
+ free_mm(mm);
+ return NULL;
+}
+
static int copy_mm(unsigned long clone_flags, struct task_struct * tsk)
{
struct mm_struct * mm, *oldmm;
@@ -472,43 +521,17 @@ static int copy_mm(unsigned long clone_f
}
retval = -ENOMEM;
- mm = allocate_mm();
+ mm = dup_mm(tsk);
if (!mm)
goto fail_nomem;
- /* Copy the current MM stuff.. */
- memcpy(mm, oldmm, sizeof(*mm));
- if (!mm_init(mm))
- goto fail_nomem;
-
- if (init_new_context(tsk,mm))
- goto fail_nocontext;
-
- retval = dup_mmap(mm, oldmm);
- if (retval)
- goto free_pt;
-
- mm->hiwater_rss = get_mm_rss(mm);
- mm->hiwater_vm = mm->total_vm;
-
good_mm:
tsk->mm = mm;
tsk->active_mm = mm;
return 0;
-free_pt:
- mmput(mm);
fail_nomem:
return retval;
-
-fail_nocontext:
- /*
- * If init_new_context() failed, we cannot use mmput() to free the mm
- * because it calls destroy_context()
- */
- mm_free_pgd(mm);
- free_mm(mm);
- return retval;
}
static inline struct fs_struct *__copy_fs_struct(struct fs_struct *old)
@@ -1422,18 +1445,21 @@ static int unshare_sighand(unsigned long
}
/*
- * Unsharing of vm for tasks created with CLONE_VM is not supported yet
+ * Unshare vm if it is being shared
*/
static int unshare_vm(unsigned long unshare_flags, struct mm_struct **new_mmp)
{
- struct mm_struct *mm = current->mm;
+ struct mm_struct *mm = current->mm, *new_mm;
if ((unshare_flags & CLONE_VM) &&
- (mm && atomic_read(&mm->mm_users) > 1))
- return -EINVAL;
+ (mm && atomic_read(&mm->mm_users) > 1)) {
+ new_mm = dup_mm(current);
+ if (!new_mm)
+ return -ENOMEM;
+ *new_mmp = new_mm;
+ }
return 0;
-
}
/*
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH -mm 8/9] unshare system call : allow unsharing of vm
@ 2005-12-13 3:00 JANAK DESAI
0 siblings, 0 replies; 3+ messages in thread
From: JANAK DESAI @ 2005-12-13 3:00 UTC (permalink / raw)
To: viro, chrisw, dwmw2, jamie, serue, mingo, linuxram, jmorris, sds, janak
Cc: akpm, linux-kernel
[PATCH -mm 8/9] unshare system call: allow unsharing of vm
fork.c | 90
+++++++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 32 deletions(-)
diff -Naurp 2.6.15-rc5-mm2+patch/kernel/fork.c
2.6.15-rc5-mm2+patch8/kernel/fork.c
--- 2.6.15-rc5-mm2+patch/kernel/fork.c 2005-12-12 19:31:48.000000000
+0000
+++ 2.6.15-rc5-mm2+patch8/kernel/fork.c 2005-12-12 22:20:29.000000000
+0000
@@ -445,6 +445,55 @@ void mm_release(struct task_struct *tsk,
}
}
+/*
+ * Allocate a new mm structure and copy contents from the
+ * mm structure of the passed in task structure.
+ */
+static struct mm_struct *dup_mm(struct task_struct *tsk)
+{
+ struct mm_struct *mm, *oldmm = current->mm;
+ int err;
+
+ if (!oldmm)
+ return NULL;
+
+ mm = allocate_mm();
+ if (!mm)
+ goto fail_nomem;
+
+ memcpy(mm, oldmm, sizeof(*mm));
+
+ if (!mm_init(mm))
+ goto fail_nomem;
+
+ if (init_new_context(tsk, mm))
+ goto fail_nocontext;
+
+ err = dup_mmap(mm, oldmm);
+ if (err)
+ goto free_pt;
+
+ mm->hiwater_rss = get_mm_rss(mm);
+ mm->hiwater_vm = mm->total_vm;
+
+ return mm;
+
+free_pt:
+ mmput(mm);
+
+fail_nomem:
+ return NULL;
+
+fail_nocontext:
+ /*
+ * If init_new_context() failed, we cannot use mmput() to free the mm
+ * because it calls destroy_context()
+ */
+ mm_free_pgd(mm);
+ free_mm(mm);
+ return NULL;
+}
+
static int copy_mm(unsigned long clone_flags, struct task_struct * tsk)
{
struct mm_struct * mm, *oldmm;
@@ -472,43 +521,17 @@ static int copy_mm(unsigned long clone_f
}
retval = -ENOMEM;
- mm = allocate_mm();
+ mm = dup_mm(tsk);
if (!mm)
goto fail_nomem;
- /* Copy the current MM stuff.. */
- memcpy(mm, oldmm, sizeof(*mm));
- if (!mm_init(mm))
- goto fail_nomem;
-
- if (init_new_context(tsk,mm))
- goto fail_nocontext;
-
- retval = dup_mmap(mm, oldmm);
- if (retval)
- goto free_pt;
-
- mm->hiwater_rss = get_mm_rss(mm);
- mm->hiwater_vm = mm->total_vm;
-
good_mm:
tsk->mm = mm;
tsk->active_mm = mm;
return 0;
-free_pt:
- mmput(mm);
fail_nomem:
return retval;
-
-fail_nocontext:
- /*
- * If init_new_context() failed, we cannot use mmput() to free the mm
- * because it calls destroy_context()
- */
- mm_free_pgd(mm);
- free_mm(mm);
- return retval;
}
static inline struct fs_struct *__copy_fs_struct(struct fs_struct *old)
@@ -1422,18 +1445,21 @@ static int unshare_sighand(unsigned long
}
/*
- * Unsharing of vm for tasks created with CLONE_VM is not supported yet
+ * Unshare vm if it is being shared
*/
static int unshare_vm(unsigned long unshare_flags, struct mm_struct
**new_mmp)
{
- struct mm_struct *mm = current->mm;
+ struct mm_struct *mm = current->mm, *new_mm;
if ((unshare_flags & CLONE_VM) &&
- (mm && atomic_read(&mm->mm_users) > 1))
- return -EINVAL;
+ (mm && atomic_read(&mm->mm_users) > 1)) {
+ new_mm = dup_mm(current);
+ if (!new_mm)
+ return -ENOMEM;
+ *new_mmp = new_mm;
+ }
return 0;
-
}
/*
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-12-13 22:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-12-13 22:54 [PATCH -mm 8/9] unshare system call: allow unsharing of vm JANAK DESAI
-- strict thread matches above, loose matches on Subject: below --
2005-12-13 13:43 JANAK DESAI
2005-12-13 3:00 [PATCH -mm 8/9] unshare system call : " JANAK DESAI
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.