aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2005-10-29 21:16:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 00:40:38 -0400
commit4294621f41a85497019fae64341aa5351a1921b7 (patch)
treefdeb7eb44384a99d0679ffa6de5019bab0ea2166 /include/linux/sched.h
parent404351e67a9facb475abf1492245374a28d13e90 (diff)
[PATCH] mm: rss = file_rss + anon_rss
I was lazy when we added anon_rss, and chose to change as few places as possible. So currently each anonymous page has to be counted twice, in rss and in anon_rss. Which won't be so good if those are atomic counts in some configurations. Change that around: keep file_rss and anon_rss separately, and add them together (with get_mm_rss macro) when the total is needed - reading two atomics is much cheaper than updating two atomics. And update anon_rss upfront, typically in memory.c, not tucked away in page_add_anon_rmap. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 27519df0f987..afcaac66cbd5 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -254,6 +254,8 @@ extern void arch_unmap_area_topdown(struct mm_struct *, unsigned long);
254#define add_mm_counter(mm, member, value) (mm)->_##member += (value) 254#define add_mm_counter(mm, member, value) (mm)->_##member += (value)
255#define inc_mm_counter(mm, member) (mm)->_##member++ 255#define inc_mm_counter(mm, member) (mm)->_##member++
256#define dec_mm_counter(mm, member) (mm)->_##member-- 256#define dec_mm_counter(mm, member) (mm)->_##member--
257#define get_mm_rss(mm) ((mm)->_file_rss + (mm)->_anon_rss)
258
257typedef unsigned long mm_counter_t; 259typedef unsigned long mm_counter_t;
258 260
259struct mm_struct { 261struct mm_struct {
@@ -286,7 +288,7 @@ struct mm_struct {
286 unsigned long exec_vm, stack_vm, reserved_vm, def_flags, nr_ptes; 288 unsigned long exec_vm, stack_vm, reserved_vm, def_flags, nr_ptes;
287 289
288 /* Special counters protected by the page_table_lock */ 290 /* Special counters protected by the page_table_lock */
289 mm_counter_t _rss; 291 mm_counter_t _file_rss;
290 mm_counter_t _anon_rss; 292 mm_counter_t _anon_rss;
291 293
292 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */ 294 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */