Commit 2a8e7002 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds

mm: numa: remove migrate_ratelimited

This code is dead since commit 9e645ab6 ("sched/numa: Continue PTE
scanning even if migrate rate limited") so remove it.
Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 204db6ed
...@@ -69,7 +69,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, ...@@ -69,7 +69,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
extern bool pmd_trans_migrating(pmd_t pmd); extern bool pmd_trans_migrating(pmd_t pmd);
extern int migrate_misplaced_page(struct page *page, extern int migrate_misplaced_page(struct page *page,
struct vm_area_struct *vma, int node); struct vm_area_struct *vma, int node);
extern bool migrate_ratelimited(int node);
#else #else
static inline bool pmd_trans_migrating(pmd_t pmd) static inline bool pmd_trans_migrating(pmd_t pmd)
{ {
...@@ -80,10 +79,6 @@ static inline int migrate_misplaced_page(struct page *page, ...@@ -80,10 +79,6 @@ static inline int migrate_misplaced_page(struct page *page,
{ {
return -EAGAIN; /* can't migrate now */ return -EAGAIN; /* can't migrate now */
} }
static inline bool migrate_ratelimited(int node)
{
return false;
}
#endif /* CONFIG_NUMA_BALANCING */ #endif /* CONFIG_NUMA_BALANCING */
#if defined(CONFIG_NUMA_BALANCING) && defined(CONFIG_TRANSPARENT_HUGEPAGE) #if defined(CONFIG_NUMA_BALANCING) && defined(CONFIG_TRANSPARENT_HUGEPAGE)
......
...@@ -1565,30 +1565,10 @@ static struct page *alloc_misplaced_dst_page(struct page *page, ...@@ -1565,30 +1565,10 @@ static struct page *alloc_misplaced_dst_page(struct page *page,
* page migration rate limiting control. * page migration rate limiting control.
* Do not migrate more than @pages_to_migrate in a @migrate_interval_millisecs * Do not migrate more than @pages_to_migrate in a @migrate_interval_millisecs
* window of time. Default here says do not migrate more than 1280M per second. * window of time. Default here says do not migrate more than 1280M per second.
* If a node is rate-limited then PTE NUMA updates are also rate-limited. However
* as it is faults that reset the window, pte updates will happen unconditionally
* if there has not been a fault since @pteupdate_interval_millisecs after the
* throttle window closed.
*/ */
static unsigned int migrate_interval_millisecs __read_mostly = 100; static unsigned int migrate_interval_millisecs __read_mostly = 100;
static unsigned int pteupdate_interval_millisecs __read_mostly = 1000;
static unsigned int ratelimit_pages __read_mostly = 128 << (20 - PAGE_SHIFT); static unsigned int ratelimit_pages __read_mostly = 128 << (20 - PAGE_SHIFT);
/* Returns true if NUMA migration is currently rate limited */
bool migrate_ratelimited(int node)
{
pg_data_t *pgdat = NODE_DATA(node);
if (time_after(jiffies, pgdat->numabalancing_migrate_next_window +
msecs_to_jiffies(pteupdate_interval_millisecs)))
return false;
if (pgdat->numabalancing_migrate_nr_pages < ratelimit_pages)
return false;
return true;
}
/* Returns true if the node is migrate rate-limited after the update */ /* Returns true if the node is migrate rate-limited after the update */
static bool numamigrate_update_ratelimit(pg_data_t *pgdat, static bool numamigrate_update_ratelimit(pg_data_t *pgdat,
unsigned long nr_pages) unsigned long nr_pages)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment