lkml.org 
[lkml]   [2006]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch 2/3] mm: locks_freed fix
    Date
    Move the lock debug checks below the page reserved checks.
    Also, having debug_check_no_locks_freed in kernel_map_pages is wrong.

    Signed-off-by: Nick Piggin <npiggin@suse.de>

    Index: linux-2.6/include/linux/mm.h
    ===================================================================
    --- linux-2.6.orig/include/linux/mm.h 2006-10-06 11:59:47.000000000 +1000
    +++ linux-2.6/include/linux/mm.h 2006-10-06 12:00:02.000000000 +1000
    @@ -1038,12 +1038,7 @@ static inline void vm_stat_account(struc

    #ifndef CONFIG_DEBUG_PAGEALLOC
    static inline void
    -kernel_map_pages(struct page *page, int numpages, int enable)
    -{
    - if (!PageHighMem(page) && !enable)
    - debug_check_no_locks_freed(page_address(page),
    - numpages * PAGE_SIZE);
    -}
    +kernel_map_pages(struct page *page, int numpages, int enable) {}
    #endif

    extern struct vm_area_struct *get_gate_vma(struct task_struct *tsk);
    Index: linux-2.6/mm/page_alloc.c
    ===================================================================
    --- linux-2.6.orig/mm/page_alloc.c 2006-10-06 11:59:47.000000000 +1000
    +++ linux-2.6/mm/page_alloc.c 2006-10-06 12:01:52.000000000 +1000
    @@ -443,15 +443,13 @@ static void __free_pages_ok(struct page
    int i;
    int reserved = 0;

    - if (!PageHighMem(page))
    - debug_check_no_locks_freed(page_address(page),
    - PAGE_SIZE<<order);
    -
    for (i = 0 ; i < (1 << order) ; ++i)
    reserved += free_pages_check(page + i);
    if (reserved)
    return;

    + if (!PageHighMem(page))
    + debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
    arch_free_page(page, order);
    kernel_map_pages(page, 1 << order, 0);

    @@ -723,6 +721,8 @@ static void fastcall free_hot_cold_page(
    if (free_pages_check(page))
    return;

    + if (!PageHighMem(page))
    + debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
    arch_free_page(page, 0);
    kernel_map_pages(page, 1, 0);

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-10-07 15:09    [W:0.027 / U:60.328 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site