lkml.org 
[lkml]   [2009]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/25] Calculate the migratetype for allocation only once
    Date
    GFP mask is converted into a migratetype when deciding which pagelist to
    take a page from. However, it is happening multiple times per
    allocation, at least once per zone traversed. Calculate it once.

    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    ---
    mm/page_alloc.c | 43 ++++++++++++++++++++++++++-----------------
    1 files changed, 26 insertions(+), 17 deletions(-)

    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index 78e1d8e..8771de3 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -1067,13 +1067,13 @@ void split_page(struct page *page, unsigned int order)
    * or two.
    */
    static struct page *buffered_rmqueue(struct zone *preferred_zone,
    - struct zone *zone, int order, gfp_t gfp_flags)
    + struct zone *zone, int order, gfp_t gfp_flags,
    + int migratetype)
    {
    unsigned long flags;
    struct page *page;
    int cold = !!(gfp_flags & __GFP_COLD);
    int cpu;
    - int migratetype = allocflags_to_migratetype(gfp_flags);

    again:
    cpu = get_cpu();
    @@ -1399,7 +1399,7 @@ static void zlc_mark_zone_full(struct zonelist *zonelist, struct zoneref *z)
    static struct page *
    get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
    struct zonelist *zonelist, int high_zoneidx, int alloc_flags,
    - struct zone *preferred_zone)
    + struct zone *preferred_zone, int migratetype)
    {
    struct zoneref *z;
    struct page *page = NULL;
    @@ -1451,7 +1451,8 @@ zonelist_scan:
    }
    }

    - page = buffered_rmqueue(preferred_zone, zone, order, gfp_mask);
    + page = buffered_rmqueue(preferred_zone, zone, order,
    + gfp_mask, migratetype);
    if (page)
    break;
    this_zone_full:
    @@ -1515,7 +1516,8 @@ should_alloc_retry(gfp_t gfp_mask, unsigned int order,
    static inline struct page *
    __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, enum zone_type high_zoneidx,
    - nodemask_t *nodemask, struct zone *preferred_zone)
    + nodemask_t *nodemask, struct zone *preferred_zone,
    + int migratetype)
    {
    struct page *page;

    @@ -1533,7 +1535,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
    page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, nodemask,
    order, zonelist, high_zoneidx,
    ALLOC_WMARK_HIGH|ALLOC_CPUSET,
    - preferred_zone);
    + preferred_zone, migratetype);
    if (page)
    goto out;

    @@ -1554,7 +1556,7 @@ static inline struct page *
    __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, enum zone_type high_zoneidx,
    nodemask_t *nodemask, int alloc_flags, struct zone *preferred_zone,
    - unsigned long *did_some_progress)
    + int migratetype, unsigned long *did_some_progress)
    {
    struct page *page = NULL;
    struct reclaim_state reclaim_state;
    @@ -1586,7 +1588,8 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order,
    if (likely(*did_some_progress))
    page = get_page_from_freelist(gfp_mask, nodemask, order,
    zonelist, high_zoneidx,
    - alloc_flags, preferred_zone);
    + alloc_flags, preferred_zone,
    + migratetype);
    return page;
    }

    @@ -1607,14 +1610,15 @@ is_allocation_high_priority(struct task_struct *p, gfp_t gfp_mask)
    static inline struct page *
    __alloc_pages_high_priority(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, enum zone_type high_zoneidx,
    - nodemask_t *nodemask, struct zone *preferred_zone)
    + nodemask_t *nodemask, struct zone *preferred_zone,
    + int migratetype)
    {
    struct page *page;

    do {
    page = get_page_from_freelist(gfp_mask, nodemask, order,
    zonelist, high_zoneidx, ALLOC_NO_WATERMARKS,
    - preferred_zone);
    + preferred_zone, migratetype);

    if (!page && gfp_mask & __GFP_NOFAIL)
    congestion_wait(WRITE, HZ/50);
    @@ -1637,7 +1641,8 @@ void wake_all_kswapd(unsigned int order, struct zonelist *zonelist,
    static inline struct page *
    __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, enum zone_type high_zoneidx,
    - nodemask_t *nodemask, struct zone *preferred_zone)
    + nodemask_t *nodemask, struct zone *preferred_zone,
    + int migratetype)
    {
    const gfp_t wait = gfp_mask & __GFP_WAIT;
    struct page *page = NULL;
    @@ -1688,14 +1693,16 @@ restart:
    */
    page = get_page_from_freelist(gfp_mask, nodemask, order, zonelist,
    high_zoneidx, alloc_flags,
    - preferred_zone);
    + preferred_zone,
    + migratetype);
    if (page)
    goto got_pg;

    /* Allocate without watermarks if the context allows */
    if (is_allocation_high_priority(p, gfp_mask))
    page = __alloc_pages_high_priority(gfp_mask, order,
    - zonelist, high_zoneidx, nodemask, preferred_zone);
    + zonelist, high_zoneidx, nodemask, preferred_zone,
    + migratetype);
    if (page)
    goto got_pg;

    @@ -1708,7 +1715,7 @@ restart:
    zonelist, high_zoneidx,
    nodemask,
    alloc_flags, preferred_zone,
    - &did_some_progress);
    + migratetype, &did_some_progress);
    if (page)
    goto got_pg;

    @@ -1720,7 +1727,8 @@ restart:
    if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {
    page = __alloc_pages_may_oom(gfp_mask, order,
    zonelist, high_zoneidx,
    - nodemask, preferred_zone);
    + nodemask, preferred_zone,
    + migratetype);
    if (page)
    goto got_pg;

    @@ -1759,6 +1767,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    enum zone_type high_zoneidx = gfp_zone(gfp_mask);
    struct zone *preferred_zone;
    struct page *page;
    + int migratetype = allocflags_to_migratetype(gfp_mask);

    might_sleep_if(gfp_mask & __GFP_WAIT);

    @@ -1782,11 +1791,11 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    /* First allocation attempt */
    page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, nodemask, order,
    zonelist, high_zoneidx, ALLOC_WMARK_LOW|ALLOC_CPUSET,
    - preferred_zone);
    + preferred_zone, migratetype);
    if (unlikely(!page))
    page = __alloc_pages_slowpath(gfp_mask, order,
    zonelist, high_zoneidx, nodemask,
    - preferred_zone);
    + preferred_zone, migratetype);

    return page;
    }
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-03-20 11:09    [W:0.029 / U:89.940 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site