lkml.org 
[lkml]   [2010]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] [cleanup] mm: introduce free_pages_prepare
    Date
    This patch is used from [3/4]

    ===================================
    Free_hot_cold_page() and __free_pages_ok() have very similar
    freeing preparation. This patch make consolicate it.

    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    ---
    mm/page_alloc.c | 40 +++++++++++++++++++++-------------------
    1 files changed, 21 insertions(+), 19 deletions(-)

    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index 88513c0..ba9aea7 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -599,20 +599,23 @@ static void free_one_page(struct zone *zone, struct page *page, int order,
    spin_unlock(&zone->lock);
    }

    -static void __free_pages_ok(struct page *page, unsigned int order)
    +static int free_pages_prepare(struct page *page, unsigned int order)
    {
    - unsigned long flags;
    int i;
    int bad = 0;
    - int wasMlocked = __TestClearPageMlocked(page);

    trace_mm_page_free_direct(page, order);
    kmemcheck_free_shadow(page, order);

    - for (i = 0 ; i < (1 << order) ; ++i)
    - bad += free_pages_check(page + i);
    + for (i = 0 ; i < (1 << order) ; ++i) {
    + struct page *pg = page + i;
    +
    + if (PageAnon(pg))
    + pg->mapping = NULL;
    + bad += free_pages_check(pg);
    + }
    if (bad)
    - return;
    + return -EINVAL;

    if (!PageHighMem(page)) {
    debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
    @@ -622,6 +625,17 @@ static void __free_pages_ok(struct page *page, unsigned int order)
    arch_free_page(page, order);
    kernel_map_pages(page, 1 << order, 0);

    + return 0;
    +}
    +
    +static void __free_pages_ok(struct page *page, unsigned int order)
    +{
    + unsigned long flags;
    + int wasMlocked = __TestClearPageMlocked(page);
    +
    + if (free_pages_prepare(page, order))
    + return;
    +
    local_irq_save(flags);
    if (unlikely(wasMlocked))
    free_page_mlock(page);
    @@ -1107,21 +1121,9 @@ void free_hot_cold_page(struct page *page, int cold)
    int migratetype;
    int wasMlocked = __TestClearPageMlocked(page);

    - trace_mm_page_free_direct(page, 0);
    - kmemcheck_free_shadow(page, 0);
    -
    - if (PageAnon(page))
    - page->mapping = NULL;
    - if (free_pages_check(page))
    + if (free_pages_prepare(page, 0))
    return;

    - if (!PageHighMem(page)) {
    - debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
    - debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
    - }
    - arch_free_page(page, 0);
    - kernel_map_pages(page, 1, 0);
    -
    migratetype = get_pageblock_migratetype(page);
    set_page_private(page, migratetype);
    local_irq_save(flags);
    --
    1.6.5.2




    \
     
     \ /
      Last update: 2010-04-15 12:27    [W:0.045 / U:1.820 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site