exit/exec && rss_stat fixes

PATCH New Oleg Nesterov 1 participant 3 messages May 31, 2012

Subsystems (4)

VFS MM core Scheduler exec and binfmt

lore

Share & tools

lore

Oleg Nesterov

author

2012-05-31 18:07 UTC #0 lore raw

cover exit/exec && rss_stat fixes

Hello,

By discussion with Konstantin, 1/2 should replace

mm-correctly-synchronize-rss-counters-at-exit-exec.patch mm-correctly-synchronize-rss-counters-at-exit-exec-fix.patch mm-correctly-synchronize-rss-counters-at-exit-exec-set-task-exit-code-before-complete_vfork_done.patch

Unfortunately this conflicts with another patch from Konstantin,

mm-call-complete_vfork_done-after-clearing-child_tid-and-flushing-rss-counters.patch

so I am resending this (re-diffed) patch as 2/2.

Oleg.

Oleg Nesterov

author

2012-05-31 18:03 UTC #1 lore raw

PATCH 1/2 correctly synchronize rss-counters at exit/exec

A simplified version of Konstantin Khlebnikov's patch.

do_exit() and exec_mmap() call sync_mm_rss() before mm_release() does put_user(clear_child_tid) which can update task->rss_stat and thus make mm->rss_stat inconsistent. This triggers the "BUG:" printk in check_mm().

- Move the final sync_mm_rss() from do_exit() to exit_mm(), and change exec_mmap() to call sync_mm_rss() after mm_release() to make check_mm() happy.

Perhaps we should simply move it into mm_release() and call it unconditionally to catch the "task->rss_stat != 0 && !task->mm" bugs.

- Since taskstats_exit() is called before exit_mm(), add another sync_mm_rss() into xacct_add_tsk() who actually uses rss_stat.

Probably we should also shift acct_update_integrals().

Reported-by Markus Trippelsdorf <[email protected]>

Tested-by Martin Mokrejs <[email protected]>

Signed-off-by Oleg Nesterov <[email protected]>

Acked-by Konstantin Khlebnikov <[email protected]>

---
 fs/exec.c       |    2 +-
 kernel/exit.c   |    5 ++---
 kernel/tsacct.c |    1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

fs/exec.c +1 -1

index 52c9e2f..e49e3c2 100644
@@ -823,10 +823,10 @@ static int exec_mmap(struct mm_struct *mm)
 	/* Notify parent that we're no longer interested in the old VM */
 	tsk = current;
 	old_mm = current->mm;
-	sync_mm_rss(old_mm);
 	mm_release(tsk, old_mm);
 
 	if (old_mm) {
+		sync_mm_rss(old_mm);
 		/*
 		 * Make sure that if there is a core dump in progress
 		 * for the old mm, we get out and die instead of going

kernel/exit.c +2 -3

index ab972a7..b3a84b5 100644
@@ -655,6 +655,8 @@ static void exit_mm(struct task_struct * tsk)
 	mm_release(tsk, mm);
 	if (!mm)
 		return;
+
+	sync_mm_rss(mm);
 	/*
 	 * Serialize with any possible pending coredump.
 	 * We must hold mmap_sem around checking core_state

@@ -965,9 +967,6 @@ void do_exit(long code)
 				preempt_count());
 
 	acct_update_integrals(tsk);
-	/* sync mm's RSS info before statistics gathering */
-	if (tsk->mm)
-		sync_mm_rss(tsk->mm);
 	group_dead = atomic_dec_and_test(&tsk->signal->live);
 	if (group_dead) {
 		hrtimer_cancel(&tsk->signal->real_timer);

kernel/tsacct.c +1 -0

index 23b4d78..a64ee90 100644
@@ -91,6 +91,7 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p)
 	stats->virtmem = p->acct_vm_mem1 * PAGE_SIZE / MB;
 	mm = get_task_mm(p);
 	if (mm) {
+		sync_mm_rss(mm);
 		/* adjust to KB unit */
 		stats->hiwater_rss   = get_mm_hiwater_rss(mm) * PAGE_SIZE / KB;
 		stats->hiwater_vm    = get_mm_hiwater_vm(mm)  * PAGE_SIZE / KB;

Signature · 1 line

1.5.5.1

Oleg Nesterov

author

2012-05-31 18:03 UTC #2 lore raw

PATCH 2/2 call complete_vfork_done() after put_user(clear_child_tid)

In reply to Oleg Nesterov

From: Konstantin Khlebnikov <[email protected]>

Child should wake up parent from vfork() only after finishing all operations with shared mm. There is no sense to use CLONE_CHILD_CLEARTID together with CLONE_VFORK, but it looks more accurate now.

Signed-off-by Konstantin Khlebnikov <[email protected]>

Signed-off-by Oleg Nesterov <[email protected]>

---
 kernel/fork.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

kernel/fork.c +3 -3

index 47b4e4f..ba0c0de 100644
@@ -787,9 +787,6 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 	/* Get rid of any cached register state */
 	deactivate_mm(tsk, mm);
 
-	if (tsk->vfork_done)
-		complete_vfork_done(tsk);
-
 	/*
 	 * If we're exiting normally, clear a user-space tid field if
 	 * requested.  We leave this alone when dying by signal, to leave

@@ -810,6 +807,9 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
 		}
 		tsk->clear_child_tid = NULL;
 	}
+
+	if (tsk->vfork_done)
+		complete_vfork_done(tsk);
 }
 
 /*

Signature · 1 line

1.5.5.1