lkml.org 
[lkml]   [2010]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH -mmotm 4/4] memcg: dirty pages instrumentation
    On Thu, Mar 04, 2010 at 11:40:15AM +0100, Andrea Righi wrote:

    [..]
    > diff --git a/mm/page-writeback.c b/mm/page-writeback.c
    > index 5a0f8f3..c5d14ea 100644
    > --- a/mm/page-writeback.c
    > +++ b/mm/page-writeback.c
    > @@ -137,13 +137,16 @@ static struct prop_descriptor vm_dirties;
    > */
    > static int calc_period_shift(void)
    > {
    > + struct dirty_param dirty_param;
    > unsigned long dirty_total;
    >
    > - if (vm_dirty_bytes)
    > - dirty_total = vm_dirty_bytes / PAGE_SIZE;
    > + get_dirty_param(&dirty_param);
    > +
    > + if (dirty_param.dirty_bytes)
    > + dirty_total = dirty_param.dirty_bytes / PAGE_SIZE;
    > else
    > - dirty_total = (vm_dirty_ratio * determine_dirtyable_memory()) /
    > - 100;
    > + dirty_total = (dirty_param.dirty_ratio *
    > + determine_dirtyable_memory()) / 100;
    > return 2 + ilog2(dirty_total - 1);
    > }
    >
    > @@ -408,41 +411,46 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
    > */
    > unsigned long determine_dirtyable_memory(void)
    > {
    > - unsigned long x;
    > -
    > - x = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
    > + unsigned long memory;
    > + s64 memcg_memory;
    >
    > + memory = global_page_state(NR_FREE_PAGES) + global_reclaimable_pages();
    > if (!vm_highmem_is_dirtyable)
    > - x -= highmem_dirtyable_memory(x);
    > -
    > - return x + 1; /* Ensure that we never return 0 */
    > + memory -= highmem_dirtyable_memory(memory);
    > + if (mem_cgroup_has_dirty_limit())
    > + return memory + 1;

    Should above be?
    if (!mem_cgroup_has_dirty_limit())
    return memory + 1;

    Vivek

    > + memcg_memory = mem_cgroup_page_stat(MEMCG_NR_DIRTYABLE_PAGES);
    > + return min((unsigned long)memcg_memory, memory + 1);
    > }


    \
     
     \ /
      Last update: 2010-03-04 17:23    [W:0.025 / U:89.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site