mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm, workingset: make working set detection node-aware 

Working set and refault detection is still zone-based, fix it.

Link: http://lkml.kernel.org/r/1467970510-21195-16-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mel Gorman 2016-07-28 15:46:08 -07:00 committed by Linus Torvalds
parent ef8f232799
commit 1e6b10857f
4 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/mmzone.h
View File

@ -145,9 +145,6 @@ enum zone_stat_item {
NUMA_LOCAL, /* allocation from local node */ NUMA_LOCAL, /* allocation from local node */
NUMA_OTHER, /* allocation from other node */ NUMA_OTHER, /* allocation from other node */
#endif #endif
WORKINGSET_REFAULT,
WORKINGSET_ACTIVATE,
WORKINGSET_NODERECLAIM,
NR_ANON_THPS, NR_ANON_THPS,
NR_SHMEM_THPS, NR_SHMEM_THPS,
NR_SHMEM_PMDMAPPED, NR_SHMEM_PMDMAPPED,
@ -164,6 +161,9 @@ enum node_stat_item {
NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */ NR_ISOLATED_ANON, /* Temporary isolated pages from anon lru */
NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */ NR_ISOLATED_FILE, /* Temporary isolated pages from file lru */
NR_PAGES_SCANNED, /* pages scanned since last reclaim */ NR_PAGES_SCANNED, /* pages scanned since last reclaim */
WORKINGSET_REFAULT,
WORKINGSET_ACTIVATE,
WORKINGSET_NODERECLAIM,
NR_VM_NODE_STAT_ITEMS NR_VM_NODE_STAT_ITEMS
}; };

1
include/linux/vmstat.h
View File

@ -227,7 +227,6 @@ void mod_node_page_state(struct pglist_data *, enum node_stat_item, long);
void inc_node_page_state(struct page *, enum node_stat_item); void inc_node_page_state(struct page *, enum node_stat_item);
void dec_node_page_state(struct page *, enum node_stat_item); void dec_node_page_state(struct page *, enum node_stat_item);
extern void inc_zone_state(struct zone *, enum zone_stat_item);
extern void inc_node_state(struct pglist_data *, enum node_stat_item); extern void inc_node_state(struct pglist_data *, enum node_stat_item);
extern void __inc_zone_state(struct zone *, enum zone_stat_item); extern void __inc_zone_state(struct zone *, enum zone_stat_item);
extern void __inc_node_state(struct pglist_data *, enum node_stat_item); extern void __inc_node_state(struct pglist_data *, enum node_stat_item);

20
mm/vmstat.c
View File

@ -446,11 +446,6 @@ void mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
} }
EXPORT_SYMBOL(mod_zone_page_state); EXPORT_SYMBOL(mod_zone_page_state);
void inc_zone_state(struct zone *zone, enum zone_stat_item item)
{
mod_zone_state(zone, item, 1, 1);
}
void inc_zone_page_state(struct page *page, enum zone_stat_item item) void inc_zone_page_state(struct page *page, enum zone_stat_item item)
{ {
mod_zone_state(page_zone(page), item, 1, 1); mod_zone_state(page_zone(page), item, 1, 1);
@ -539,15 +534,6 @@ void mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
} }
EXPORT_SYMBOL(mod_zone_page_state); EXPORT_SYMBOL(mod_zone_page_state);
void inc_zone_state(struct zone *zone, enum zone_stat_item item)
{
unsigned long flags;
local_irq_save(flags);
__inc_zone_state(zone, item);
local_irq_restore(flags);
}
void inc_zone_page_state(struct page *page, enum zone_stat_item item) void inc_zone_page_state(struct page *page, enum zone_stat_item item)
{ {
unsigned long flags; unsigned long flags;
@ -967,9 +953,6 @@ const char * const vmstat_text[] = {
"numa_local", "numa_local",
"numa_other", "numa_other",
#endif #endif
"workingset_refault",
"workingset_activate",
"workingset_nodereclaim",
"nr_anon_transparent_hugepages", "nr_anon_transparent_hugepages",
"nr_shmem_hugepages", "nr_shmem_hugepages",
"nr_shmem_pmdmapped", "nr_shmem_pmdmapped",
@ -984,6 +967,9 @@ const char * const vmstat_text[] = {
"nr_isolated_anon", "nr_isolated_anon",
"nr_isolated_file", "nr_isolated_file",
"nr_pages_scanned", "nr_pages_scanned",
"workingset_refault",
"workingset_activate",
"workingset_nodereclaim",
/* enum writeback_stat_item counters */ /* enum writeback_stat_item counters */
"nr_dirty_threshold", "nr_dirty_threshold",

43
mm/workingset.c
View File

@ -16,7 +16,7 @@
/* /*
* Double CLOCK lists * Double CLOCK lists
* *
* Per zone, two clock lists are maintained for file pages: the * Per node, two clock lists are maintained for file pages: the
* inactive and the active list. Freshly faulted pages start out at * inactive and the active list. Freshly faulted pages start out at
* the head of the inactive list and page reclaim scans pages from the * the head of the inactive list and page reclaim scans pages from the
* tail. Pages that are accessed multiple times on the inactive list * tail. Pages that are accessed multiple times on the inactive list
@ -141,11 +141,11 @@
* *
* Implementation * Implementation
* *
* For each zone's file LRU lists, a counter for inactive evictions * For each node's file LRU lists, a counter for inactive evictions
* and activations is maintained (zone->inactive_age). * and activations is maintained (node->inactive_age).
* *
* On eviction, a snapshot of this counter (along with some bits to * On eviction, a snapshot of this counter (along with some bits to
* identify the zone) is stored in the now empty page cache radix tree * identify the node) is stored in the now empty page cache radix tree
* slot of the evicted page. This is called a shadow entry. * slot of the evicted page. This is called a shadow entry.
* *
* On cache misses for which there are shadow entries, an eligible * On cache misses for which there are shadow entries, an eligible
@ -153,7 +153,7 @@
*/ */
#define EVICTION_SHIFT (RADIX_TREE_EXCEPTIONAL_ENTRY + \ #define EVICTION_SHIFT (RADIX_TREE_EXCEPTIONAL_ENTRY + \
ZONES_SHIFT + NODES_SHIFT + \ NODES_SHIFT + \
MEM_CGROUP_ID_SHIFT) MEM_CGROUP_ID_SHIFT)
#define EVICTION_MASK (~0UL >> EVICTION_SHIFT) #define EVICTION_MASK (~0UL >> EVICTION_SHIFT)
@ -167,33 +167,30 @@
*/ */
static unsigned int bucket_order __read_mostly; static unsigned int bucket_order __read_mostly;
static void *pack_shadow(int memcgid, struct zone *zone, unsigned long eviction) static void *pack_shadow(int memcgid, pg_data_t *pgdat, unsigned long eviction)
{ {
eviction >>= bucket_order; eviction >>= bucket_order;
eviction = (eviction << MEM_CGROUP_ID_SHIFT) | memcgid; eviction = (eviction << MEM_CGROUP_ID_SHIFT) | memcgid;
eviction = (eviction << NODES_SHIFT) | zone_to_nid(zone); eviction = (eviction << NODES_SHIFT) | pgdat->node_id;
eviction = (eviction << ZONES_SHIFT) | zone_idx(zone);
eviction = (eviction << RADIX_TREE_EXCEPTIONAL_SHIFT); eviction = (eviction << RADIX_TREE_EXCEPTIONAL_SHIFT);
return (void *)(eviction | RADIX_TREE_EXCEPTIONAL_ENTRY); return (void *)(eviction | RADIX_TREE_EXCEPTIONAL_ENTRY);
} }
static void unpack_shadow(void *shadow, int *memcgidp, struct zone **zonep, static void unpack_shadow(void *shadow, int *memcgidp, pg_data_t **pgdat,
unsigned long *evictionp) unsigned long *evictionp)
{ {
unsigned long entry = (unsigned long)shadow; unsigned long entry = (unsigned long)shadow;
int memcgid, nid, zid; int memcgid, nid;
entry >>= RADIX_TREE_EXCEPTIONAL_SHIFT; entry >>= RADIX_TREE_EXCEPTIONAL_SHIFT;
zid = entry & ((1UL << ZONES_SHIFT) - 1);
entry >>= ZONES_SHIFT;
nid = entry & ((1UL << NODES_SHIFT) - 1); nid = entry & ((1UL << NODES_SHIFT) - 1);
entry >>= NODES_SHIFT; entry >>= NODES_SHIFT;
memcgid = entry & ((1UL << MEM_CGROUP_ID_SHIFT) - 1); memcgid = entry & ((1UL << MEM_CGROUP_ID_SHIFT) - 1);
entry >>= MEM_CGROUP_ID_SHIFT; entry >>= MEM_CGROUP_ID_SHIFT;
*memcgidp = memcgid; *memcgidp = memcgid;
*zonep = NODE_DATA(nid)->node_zones + zid; *pgdat = NODE_DATA(nid);
*evictionp = entry << bucket_order; *evictionp = entry << bucket_order;
} }
@ -208,7 +205,7 @@ static void unpack_shadow(void *shadow, int *memcgidp, struct zone **zonep,
void *workingset_eviction(struct address_space *mapping, struct page *page) void *workingset_eviction(struct address_space *mapping, struct page *page)
{ {
struct mem_cgroup *memcg = page_memcg(page); struct mem_cgroup *memcg = page_memcg(page);
struct zone *zone = page_zone(page); struct pglist_data *pgdat = page_pgdat(page);
int memcgid = mem_cgroup_id(memcg); int memcgid = mem_cgroup_id(memcg);
unsigned long eviction; unsigned long eviction;
struct lruvec *lruvec; struct lruvec *lruvec;
@ -218,9 +215,9 @@ void *workingset_eviction(struct address_space *mapping, struct page *page)
VM_BUG_ON_PAGE(page_count(page), page); VM_BUG_ON_PAGE(page_count(page), page);
VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageLocked(page), page);
lruvec = mem_cgroup_lruvec(zone->zone_pgdat, memcg); lruvec = mem_cgroup_lruvec(pgdat, memcg);
eviction = atomic_long_inc_return(&lruvec->inactive_age); eviction = atomic_long_inc_return(&lruvec->inactive_age);
return pack_shadow(memcgid, zone, eviction); return pack_shadow(memcgid, pgdat, eviction);
} }
/** /**
@ -228,7 +225,7 @@ void *workingset_eviction(struct address_space *mapping, struct page *page)
* @shadow: shadow entry of the evicted page * @shadow: shadow entry of the evicted page
* *
* Calculates and evaluates the refault distance of the previously * Calculates and evaluates the refault distance of the previously
* evicted page in the context of the zone it was allocated in. * evicted page in the context of the node it was allocated in.
* *
* Returns %true if the page should be activated, %false otherwise. * Returns %true if the page should be activated, %false otherwise.
*/ */
@ -240,10 +237,10 @@ bool workingset_refault(void *shadow)
unsigned long eviction; unsigned long eviction;
struct lruvec *lruvec; struct lruvec *lruvec;
unsigned long refault; unsigned long refault;
struct zone *zone; struct pglist_data *pgdat;
int memcgid; int memcgid;
unpack_shadow(shadow, &memcgid, &zone, &eviction); unpack_shadow(shadow, &memcgid, &pgdat, &eviction);
rcu_read_lock(); rcu_read_lock();
/* /*
@ -267,7 +264,7 @@ bool workingset_refault(void *shadow)
rcu_read_unlock(); rcu_read_unlock();
return false; return false;
} }
lruvec = mem_cgroup_lruvec(zone->zone_pgdat, memcg); lruvec = mem_cgroup_lruvec(pgdat, memcg);
refault = atomic_long_read(&lruvec->inactive_age); refault = atomic_long_read(&lruvec->inactive_age);
active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE); active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE);
rcu_read_unlock(); rcu_read_unlock();
@ -290,10 +287,10 @@ bool workingset_refault(void *shadow)
*/ */
refault_distance = (refault - eviction) & EVICTION_MASK; refault_distance = (refault - eviction) & EVICTION_MASK;
inc_zone_state(zone, WORKINGSET_REFAULT); inc_node_state(pgdat, WORKINGSET_REFAULT);
if (refault_distance <= active_file) { if (refault_distance <= active_file) {
inc_zone_state(zone, WORKINGSET_ACTIVATE); inc_node_state(pgdat, WORKINGSET_ACTIVATE);
return true; return true;
} }
return false; return false;
@ -436,7 +433,7 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
} }
} }
BUG_ON(node->count); BUG_ON(node->count);
inc_zone_state(page_zone(virt_to_page(node)), WORKINGSET_NODERECLAIM); inc_node_state(page_pgdat(virt_to_page(node)), WORKINGSET_NODERECLAIM);
if (!__radix_tree_delete_node(&mapping->page_tree, node)) if (!__radix_tree_delete_node(&mapping->page_tree, node))
BUG(); BUG();