lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V4 12/15] mm: rename allocflags_to_migratetype for clarity
    Date
    From: David Rientjes <rientjes@google.com>

    The page allocator has gfp flags (like __GFP_WAIT) and alloc flags (like
    ALLOC_CPUSET) that have separate semantics.

    The function allocflags_to_migratetype() actually takes gfp flags, not alloc
    flags, and returns a migratetype. Rename it to gfpflags_to_migratetype().

    Signed-off-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
    Reviewed-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
    Reviewed-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    Acked-by: Minchan Kim <minchan@kernel.org>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
    Cc: Michal Nazarewicz <mina86@mina86.com>
    Cc: Christoph Lameter <cl@linux.com>
    Cc: Rik van Riel <riel@redhat.com>
    ---
    include/linux/gfp.h | 2 +-
    mm/compaction.c | 4 ++--
    mm/page_alloc.c | 6 +++---
    3 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/linux/gfp.h b/include/linux/gfp.h
    index 5e7219d..41b30fd 100644
    --- a/include/linux/gfp.h
    +++ b/include/linux/gfp.h
    @@ -156,7 +156,7 @@ struct vm_area_struct;
    #define GFP_DMA32 __GFP_DMA32

    /* Convert GFP flags to their corresponding migrate type */
    -static inline int allocflags_to_migratetype(gfp_t gfp_flags)
    +static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
    {
    WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK);

    diff --git a/mm/compaction.c b/mm/compaction.c
    index 3cfc3a9..523c7bd 100644
    --- a/mm/compaction.c
    +++ b/mm/compaction.c
    @@ -1238,7 +1238,7 @@ static unsigned long compact_zone_order(struct zone *zone, int order,
    .nr_freepages = 0,
    .nr_migratepages = 0,
    .order = order,
    - .migratetype = allocflags_to_migratetype(gfp_mask),
    + .migratetype = gfpflags_to_migratetype(gfp_mask),
    .zone = zone,
    .mode = mode,
    };
    @@ -1290,7 +1290,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist,
    return rc;

    #ifdef CONFIG_CMA
    - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    alloc_flags |= ALLOC_CMA;
    #endif
    /* Compact each zone in the list */
    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index fb2988d..6f1c6e6 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -2496,7 +2496,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
    alloc_flags |= ALLOC_NO_WATERMARKS;
    }
    #ifdef CONFIG_CMA
    - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    alloc_flags |= ALLOC_CMA;
    #endif
    return alloc_flags;
    @@ -2760,7 +2760,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    struct zone *preferred_zone;
    struct zoneref *preferred_zoneref;
    struct page *page = NULL;
    - int migratetype = allocflags_to_migratetype(gfp_mask);
    + int migratetype = gfpflags_to_migratetype(gfp_mask);
    unsigned int cpuset_mems_cookie;
    int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR;
    int classzone_idx;
    @@ -2794,7 +2794,7 @@ retry_cpuset:
    classzone_idx = zonelist_zone_idx(preferred_zoneref);

    #ifdef CONFIG_CMA
    - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
    alloc_flags |= ALLOC_CMA;
    #endif
    retry:
    --
    1.8.4.5


    \
     
     \ /
      Last update: 2014-07-18 13:21    [W:5.460 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site