lkml.org 
[lkml]   [2011]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch 3/8] mm: memcg: clean up fault accounting
    Date
    From: Johannes Weiner <jweiner@redhat.com>

    The fault accounting functions have a single, memcg-internal user, so
    they don't need to be global. In fact, their one-line bodies can be
    directly folded into the caller. And since faults happen one at a
    time, use this_cpu_inc() directly instead of this_cpu_add(foo, 1).

    Signed-off-by: Johannes Weiner <jweiner@redhat.com>
    ---
    mm/memcontrol.c | 14 ++------------
    1 files changed, 2 insertions(+), 12 deletions(-)
    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 473b99f..d825af9 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -589,16 +589,6 @@ static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg,
    this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_SWAPOUT], val);
    }

    -void mem_cgroup_pgfault(struct mem_cgroup *memcg, int val)
    -{
    - this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGFAULT], val);
    -}
    -
    -void mem_cgroup_pgmajfault(struct mem_cgroup *memcg, int val)
    -{
    - this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGMAJFAULT], val);
    -}
    -
    static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
    enum mem_cgroup_events_index idx)
    {
    @@ -913,10 +903,10 @@ void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx)

    switch (idx) {
    case PGMAJFAULT:
    - mem_cgroup_pgmajfault(memcg, 1);
    + this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGFAULT]);
    break;
    case PGFAULT:
    - mem_cgroup_pgfault(memcg, 1);
    + this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGMAJFAULT]);
    break;
    default:
    BUG();
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-11-23 16:45    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site