lkml.org 
[lkml]   [2006]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch 2/6] mm: PageLRU no testset
    Date
    PG_lru is protected by zone->lru_lock. It does not need TestSet/TestClear
    operations.

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

    Index: linux-2.6/mm/vmscan.c
    ===================================================================
    --- linux-2.6.orig/mm/vmscan.c
    +++ linux-2.6/mm/vmscan.c
    @@ -780,9 +780,10 @@ int isolate_lru_page(struct page *page)
    if (PageLRU(page)) {
    struct zone *zone = page_zone(page);
    spin_lock_irq(&zone->lru_lock);
    - if (TestClearPageLRU(page)) {
    + if (PageLRU(page)) {
    ret = 1;
    get_page(page);
    + ClearPageLRU(page);
    if (PageActive(page))
    del_page_from_active_list(zone, page);
    else
    @@ -823,6 +824,8 @@ static int isolate_lru_pages(int nr_to_s
    page = lru_to_page(src);
    prefetchw_prev_lru_page(page, src, flags);

    + BUG_ON(!PageLRU(page));
    +
    list_del(&page->lru);
    if (unlikely(get_page_testone(page))) {
    /*
    @@ -838,8 +841,7 @@ static int isolate_lru_pages(int nr_to_s
    * the page is not being freed elsewhere -- the page release
    * code relies on it.
    */
    - if (!TestClearPageLRU(page))
    - BUG();
    + ClearPageLRU(page);
    list_add(&page->lru, dst);
    nr_taken++;
    }
    @@ -894,8 +896,8 @@ static void shrink_cache(struct zone *zo
    */
    while (!list_empty(&page_list)) {
    page = lru_to_page(&page_list);
    - if (TestSetPageLRU(page))
    - BUG();
    + BUG_ON(PageLRU(page));
    + SetPageLRU(page);
    list_del(&page->lru);
    if (PageActive(page))
    add_page_to_active_list(zone, page);
    @@ -1007,8 +1009,8 @@ refill_inactive_zone(struct zone *zone,
    while (!list_empty(&l_inactive)) {
    page = lru_to_page(&l_inactive);
    prefetchw_prev_lru_page(page, &l_inactive, flags);
    - if (TestSetPageLRU(page))
    - BUG();
    + BUG_ON(PageLRU(page));
    + SetPageLRU(page);
    if (!TestClearPageActive(page))
    BUG();
    list_move(&page->lru, &zone->inactive_list);
    @@ -1036,8 +1038,8 @@ refill_inactive_zone(struct zone *zone,
    while (!list_empty(&l_active)) {
    page = lru_to_page(&l_active);
    prefetchw_prev_lru_page(page, &l_active, flags);
    - if (TestSetPageLRU(page))
    - BUG();
    + BUG_ON(PageLRU(page));
    + SetPageLRU(page);
    BUG_ON(!PageActive(page));
    list_move(&page->lru, &zone->active_list);
    pgmoved++;
    Index: linux-2.6/mm/swap.c
    ===================================================================
    --- linux-2.6.orig/mm/swap.c
    +++ linux-2.6/mm/swap.c
    @@ -211,8 +211,8 @@ void fastcall __page_cache_release(struc

    struct zone *zone = page_zone(page);
    spin_lock_irqsave(&zone->lru_lock, flags);
    - if (!TestClearPageLRU(page))
    - BUG();
    + BUG_ON(!PageLRU(page));
    + ClearPageLRU(page);
    del_page_from_lru(zone, page);
    spin_unlock_irqrestore(&zone->lru_lock, flags);
    }
    @@ -255,8 +255,8 @@ void release_pages(struct page **pages,
    zone = pagezone;
    spin_lock_irq(&zone->lru_lock);
    }
    - if (!TestClearPageLRU(page))
    - BUG();
    + BUG_ON(!PageLRU(page));
    + ClearPageLRU(page);
    del_page_from_lru(zone, page);
    }

    @@ -335,8 +335,8 @@ void __pagevec_lru_add(struct pagevec *p
    zone = pagezone;
    spin_lock_irq(&zone->lru_lock);
    }
    - if (TestSetPageLRU(page))
    - BUG();
    + BUG_ON(PageLRU(page));
    + SetPageLRU(page);
    add_page_to_inactive_list(zone, page);
    }
    if (zone)
    @@ -362,8 +362,8 @@ void __pagevec_lru_add_active(struct pag
    zone = pagezone;
    spin_lock_irq(&zone->lru_lock);
    }
    - if (TestSetPageLRU(page))
    - BUG();
    + BUG_ON(PageLRU(page));
    + SetPageLRU(page);
    if (TestSetPageActive(page))
    BUG();
    add_page_to_active_list(zone, page);
    Index: linux-2.6/include/linux/page-flags.h
    ===================================================================
    --- linux-2.6.orig/include/linux/page-flags.h
    +++ linux-2.6/include/linux/page-flags.h
    @@ -244,10 +244,9 @@ extern void __mod_page_state_offset(unsi
    #define __ClearPageDirty(page) __clear_bit(PG_dirty, &(page)->flags)
    #define TestClearPageDirty(page) test_and_clear_bit(PG_dirty, &(page)->flags)

    -#define SetPageLRU(page) set_bit(PG_lru, &(page)->flags)
    #define PageLRU(page) test_bit(PG_lru, &(page)->flags)
    -#define TestSetPageLRU(page) test_and_set_bit(PG_lru, &(page)->flags)
    -#define TestClearPageLRU(page) test_and_clear_bit(PG_lru, &(page)->flags)
    +#define SetPageLRU(page) set_bit(PG_lru, &(page)->flags)
    +#define ClearPageLRU(page) clear_bit(PG_lru, &(page)->flags)

    #define PageActive(page) test_bit(PG_active, &(page)->flags)
    #define SetPageActive(page) set_bit(PG_active, &(page)->flags)
    -
    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-01-19 20:28    [W:0.027 / U:120.168 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site