Skip to content

Commit

Permalink
mm: vmscan: rename lumpy_mode to reclaim_mode
Browse files Browse the repository at this point in the history 
With compaction being used instead of lumpy reclaim, the name lumpy_mode
and associated variables is a bit misleading.  Rename lumpy_mode to
reclaim_mode which is a better fit.  There is no functional change.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
@gormanm @torvalds
gormanm authored and torvalds committed Jan 14, 2011
1 parent 9927af7 commit f3a310b
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
6 changes: 3 additions & 3 deletions include/trace/events/vmscan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

#define trace_reclaim_flags(page, sync) ( \
(page_is_file_cache(page) ? RECLAIM_WB_FILE : RECLAIM_WB_ANON) | \
(sync & LUMPY_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
(sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
)

#define trace_shrink_flags(file, sync) ( \
(sync & LUMPY_MODE_SYNC ? RECLAIM_WB_MIXED : \
(sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_MIXED : \
(file ? RECLAIM_WB_FILE : RECLAIM_WB_ANON)) | \
(sync & LUMPY_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
(sync & RECLAIM_MODE_SYNC ? RECLAIM_WB_SYNC : RECLAIM_WB_ASYNC) \
)

TRACE_EVENT(mm_vmscan_kswapd_sleep,
Expand Down
70 changes: 35 additions & 35 deletions mm/vmscan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@
#include <trace/events/vmscan.h>

/*
* lumpy_mode determines how the inactive list is shrunk
* LUMPY_MODE_SINGLE: Reclaim only order-0 pages
* LUMPY_MODE_ASYNC: Do not block
* LUMPY_MODE_SYNC: Allow blocking e.g. call wait_on_page_writeback
* LUMPY_MODE_CONTIGRECLAIM: For high-order allocations, take a reference
* reclaim_mode determines how the inactive list is shrunk
* RECLAIM_MODE_SINGLE: Reclaim only order-0 pages
* RECLAIM_MODE_ASYNC: Do not block
* RECLAIM_MODE_SYNC: Allow blocking e.g. call wait_on_page_writeback
* RECLAIM_MODE_LUMPYRECLAIM: For high-order allocations, take a reference
* page from the LRU and reclaim all pages within a
* naturally aligned range
* LUMPY_MODE_COMPACTION: For high-order allocations, reclaim a number of
* RECLAIM_MODE_COMPACTION: For high-order allocations, reclaim a number of
* order-0 pages and then compact the zone
*/
typedef unsigned __bitwise__ lumpy_mode;
#define LUMPY_MODE_SINGLE ((__force lumpy_mode)0x01u)
#define LUMPY_MODE_ASYNC ((__force lumpy_mode)0x02u)
#define LUMPY_MODE_SYNC ((__force lumpy_mode)0x04u)
#define LUMPY_MODE_CONTIGRECLAIM ((__force lumpy_mode)0x08u)
#define LUMPY_MODE_COMPACTION ((__force lumpy_mode)0x10u)
typedef unsigned __bitwise__ reclaim_mode_t;
#define RECLAIM_MODE_SINGLE ((__force reclaim_mode_t)0x01u)
#define RECLAIM_MODE_ASYNC ((__force reclaim_mode_t)0x02u)
#define RECLAIM_MODE_SYNC ((__force reclaim_mode_t)0x04u)
#define RECLAIM_MODE_LUMPYRECLAIM ((__force reclaim_mode_t)0x08u)
#define RECLAIM_MODE_COMPACTION ((__force reclaim_mode_t)0x10u)

struct scan_control {
/* Incremented by the number of inactive pages that were scanned */
Expand Down Expand Up @@ -101,7 +101,7 @@ struct scan_control {
* Intend to reclaim enough continuous memory rather than reclaim
* enough amount of memory. i.e, mode for high order allocation.
*/
lumpy_mode lumpy_reclaim_mode;
reclaim_mode_t reclaim_mode;

/* Which cgroup do we reclaim from */
struct mem_cgroup *mem_cgroup;
Expand Down Expand Up @@ -284,37 +284,37 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
return ret;
}

static void set_lumpy_reclaim_mode(int priority, struct scan_control *sc,
static void set_reclaim_mode(int priority, struct scan_control *sc,
bool sync)
{
lumpy_mode syncmode = sync ? LUMPY_MODE_SYNC : LUMPY_MODE_ASYNC;
reclaim_mode_t syncmode = sync ? RECLAIM_MODE_SYNC : RECLAIM_MODE_ASYNC;

/*
* Initially assume we are entering either lumpy reclaim or
* reclaim/compaction.Depending on the order, we will either set the
* sync mode or just reclaim order-0 pages later.
*/
if (COMPACTION_BUILD)
sc->lumpy_reclaim_mode = LUMPY_MODE_COMPACTION;
sc->reclaim_mode = RECLAIM_MODE_COMPACTION;
else
sc->lumpy_reclaim_mode = LUMPY_MODE_CONTIGRECLAIM;
sc->reclaim_mode = RECLAIM_MODE_LUMPYRECLAIM;

/*
* Avoid using lumpy reclaim or reclaim/compaction if possible by
* restricting when its set to either costly allocations or when
* under memory pressure
*/
if (sc->order > PAGE_ALLOC_COSTLY_ORDER)
sc->lumpy_reclaim_mode |= syncmode;
sc->reclaim_mode |= syncmode;
else if (sc->order && priority < DEF_PRIORITY - 2)
sc->lumpy_reclaim_mode |= syncmode;
sc->reclaim_mode |= syncmode;
else
sc->lumpy_reclaim_mode = LUMPY_MODE_SINGLE | LUMPY_MODE_ASYNC;
sc->reclaim_mode = RECLAIM_MODE_SINGLE | RECLAIM_MODE_ASYNC;
}

static void disable_lumpy_reclaim_mode(struct scan_control *sc)
static void reset_reclaim_mode(struct scan_control *sc)
{
sc->lumpy_reclaim_mode = LUMPY_MODE_SINGLE | LUMPY_MODE_ASYNC;
sc->reclaim_mode = RECLAIM_MODE_SINGLE | RECLAIM_MODE_ASYNC;
}

static inline int is_page_cache_freeable(struct page *page)
Expand Down Expand Up @@ -445,15 +445,15 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
* first attempt to free a range of pages fails.
*/
if (PageWriteback(page) &&
(sc->lumpy_reclaim_mode & LUMPY_MODE_SYNC))
(sc->reclaim_mode & RECLAIM_MODE_SYNC))
wait_on_page_writeback(page);

if (!PageWriteback(page)) {
/* synchronous write or broken a_ops? */
ClearPageReclaim(page);
}
trace_mm_vmscan_writepage(page,
trace_reclaim_flags(page, sc->lumpy_reclaim_mode));
trace_reclaim_flags(page, sc->reclaim_mode));
inc_zone_page_state(page, NR_VMSCAN_WRITE);
return PAGE_SUCCESS;
}
Expand Down Expand Up @@ -638,7 +638,7 @@ static enum page_references page_check_references(struct page *page,
referenced_page = TestClearPageReferenced(page);

/* Lumpy reclaim - ignore references */
if (sc->lumpy_reclaim_mode & LUMPY_MODE_CONTIGRECLAIM)
if (sc->reclaim_mode & RECLAIM_MODE_LUMPYRECLAIM)
return PAGEREF_RECLAIM;

/*
Expand Down Expand Up @@ -755,7 +755,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
* for any page for which writeback has already
* started.
*/
if ((sc->lumpy_reclaim_mode & LUMPY_MODE_SYNC) &&
if ((sc->reclaim_mode & RECLAIM_MODE_SYNC) &&
may_enter_fs)
wait_on_page_writeback(page);
else {
Expand Down Expand Up @@ -911,7 +911,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
try_to_free_swap(page);
unlock_page(page);
putback_lru_page(page);
disable_lumpy_reclaim_mode(sc);
reset_reclaim_mode(sc);
continue;

activate_locked:
Expand All @@ -924,7 +924,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
keep_locked:
unlock_page(page);
keep:
disable_lumpy_reclaim_mode(sc);
reset_reclaim_mode(sc);
keep_lumpy:
list_add(&page->lru, &ret_pages);
VM_BUG_ON(PageLRU(page) || PageUnevictable(page));
Expand Down Expand Up @@ -1340,7 +1340,7 @@ static inline bool should_reclaim_stall(unsigned long nr_taken,
return false;

/* Only stall on lumpy reclaim */
if (sc->lumpy_reclaim_mode & LUMPY_MODE_SINGLE)
if (sc->reclaim_mode & RECLAIM_MODE_SINGLE)
return false;

/* If we have relaimed everything on the isolated list, no stall */
Expand Down Expand Up @@ -1384,14 +1384,14 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
return SWAP_CLUSTER_MAX;
}

set_lumpy_reclaim_mode(priority, sc, false);
set_reclaim_mode(priority, sc, false);
lru_add_drain();
spin_lock_irq(&zone->lru_lock);

if (scanning_global_lru(sc)) {
nr_taken = isolate_pages_global(nr_to_scan,
&page_list, &nr_scanned, sc->order,
sc->lumpy_reclaim_mode & LUMPY_MODE_CONTIGRECLAIM ?
sc->reclaim_mode & RECLAIM_MODE_LUMPYRECLAIM ?
ISOLATE_BOTH : ISOLATE_INACTIVE,
zone, 0, file);
zone->pages_scanned += nr_scanned;
Expand All @@ -1404,7 +1404,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
} else {
nr_taken = mem_cgroup_isolate_pages(nr_to_scan,
&page_list, &nr_scanned, sc->order,
sc->lumpy_reclaim_mode & LUMPY_MODE_CONTIGRECLAIM ?
sc->reclaim_mode & RECLAIM_MODE_LUMPYRECLAIM ?
ISOLATE_BOTH : ISOLATE_INACTIVE,
zone, sc->mem_cgroup,
0, file);
Expand All @@ -1427,7 +1427,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,

/* Check if we should syncronously wait for writeback */
if (should_reclaim_stall(nr_taken, nr_reclaimed, priority, sc)) {
set_lumpy_reclaim_mode(priority, sc, true);
set_reclaim_mode(priority, sc, true);
nr_reclaimed += shrink_page_list(&page_list, zone, sc);
}

Expand All @@ -1442,7 +1442,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
zone_idx(zone),
nr_scanned, nr_reclaimed,
priority,
trace_shrink_flags(file, sc->lumpy_reclaim_mode));
trace_shrink_flags(file, sc->reclaim_mode));
return nr_reclaimed;
}

Expand Down Expand Up @@ -1836,7 +1836,7 @@ static inline bool should_continue_reclaim(struct zone *zone,
unsigned long inactive_lru_pages;

/* If not in reclaim/compaction mode, stop */
if (!(sc->lumpy_reclaim_mode & LUMPY_MODE_COMPACTION))
if (!(sc->reclaim_mode & RECLAIM_MODE_COMPACTION))
return false;

/*
Expand Down

0 comments on commit f3a310b

Please sign in to comment.