lkml.org 
[lkml]   [2009]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/22] Inline __rmqueue_smallest()
    Date
    Inline __rmqueue_smallest by altering flow very slightly so that there is
    only one call site. Because there is only one call-site, this function
    can then be inlined without causing text bloat. On an x86-based config,
    this patch reduces text by 16 bytes.

    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    ---
    mm/page_alloc.c | 20 ++++++++++++++++----
    1 files changed, 16 insertions(+), 4 deletions(-)

    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index 4f9cdaa..8bfced9 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -665,7 +665,8 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
    * Go through the free lists for the given migratetype and remove
    * the smallest available page from the freelists
    */
    -static struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,
    +static inline
    +struct page *__rmqueue_smallest(struct zone *zone, unsigned int order,
    int migratetype)
    {
    unsigned int current_order;
    @@ -835,8 +836,7 @@ static struct page *__rmqueue_fallback(struct zone *zone, int order,
    }
    }

    - /* Use MIGRATE_RESERVE rather than fail an allocation */
    - return __rmqueue_smallest(zone, order, MIGRATE_RESERVE);
    + return NULL;
    }

    /*
    @@ -848,11 +848,23 @@ static struct page *__rmqueue(struct zone *zone, unsigned int order,
    {
    struct page *page;

    +retry_reserve:
    page = __rmqueue_smallest(zone, order, migratetype);

    - if (unlikely(!page))
    + if (unlikely(!page) && migratetype != MIGRATE_RESERVE) {
    page = __rmqueue_fallback(zone, order, migratetype);

    + /*
    + * Use MIGRATE_RESERVE rather than fail an allocation. goto
    + * is used because __rmqueue_smallest is an inline function
    + * and we want just one call site
    + */
    + if (!page) {
    + migratetype = MIGRATE_RESERVE;
    + goto retry_reserve;
    + }
    + }
    +
    return page;
    }

    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-04-22 15:59    [W:0.022 / U:4.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site