diff options
author | Oleg Nesterov <oleg@redhat.com> | 2009-01-06 17:40:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:09 -0500 |
commit | 901608d9045146aec6f14a7777ea4b1501c379f0 (patch) | |
tree | 0155189f48479b920855dedccba6829363376d4d /mm/mmap.c | |
parent | 67d58ac47d25f7e2a105248a4aea6113131ab874 (diff) |
mm: introduce get_mm_hiwater_xxx(), fix taskstats->hiwater_xxx accounting
xacct_add_tsk() relies on do_exit()->update_hiwater_xxx() and uses
mm->hiwater_xxx directly, this leads to 2 problems:
- taskstats_user_cmd() can call fill_pid()->xacct_add_tsk() at any
moment before the task exits, so we should check the current values of
rss/vm anyway.
- do_exit()->update_hiwater_xxx() calls are racy. An exiting thread can
be preempted right before mm->hiwater_xxx = new_val, and another thread
can use A_LOT of memory and exit in between. When the first thread
resumes it can be the last thread in the thread group, in that case we
report the wrong hiwater_xxx values which do not take A_LOT into
account.
Introduce get_mm_hiwater_rss() and get_mm_hiwater_vm() helpers and change
xacct_add_tsk() to use them. The first helper will also be used by
rusage->ru_maxrss accounting.
Kill do_exit()->update_hiwater_xxx() calls. Unless we are going to
decrease rss/vm there is no point to update mm->hiwater_xxx, and nobody
can look at this mm_struct when exit_mmap() actually unmaps the memory.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Hugh Dickins <hugh@veritas.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/mmap.c')
-rw-r--r-- | mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2102,7 +2102,7 @@ void exit_mmap(struct mm_struct *mm) | |||
2102 | lru_add_drain(); | 2102 | lru_add_drain(); |
2103 | flush_cache_mm(mm); | 2103 | flush_cache_mm(mm); |
2104 | tlb = tlb_gather_mmu(mm, 1); | 2104 | tlb = tlb_gather_mmu(mm, 1); |
2105 | /* Don't update_hiwater_rss(mm) here, do_exit already did */ | 2105 | /* update_hiwater_rss(mm) here? but nobody should be looking */ |
2106 | /* Use -1 here to ensure all VMAs in the mm are unmapped */ | 2106 | /* Use -1 here to ensure all VMAs in the mm are unmapped */ |
2107 | end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL); | 2107 | end = unmap_vmas(&tlb, vma, 0, -1, &nr_accounted, NULL); |
2108 | vm_unacct_memory(nr_accounted); | 2108 | vm_unacct_memory(nr_accounted); |