diff options
author | Mel Gorman <mgorman@suse.de> | 2015-04-14 18:48:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 19:49:05 -0400 |
commit | 2a8e70026435ad97570a1e0a0c4c941e0f700a3e (patch) | |
tree | 7dc9ef728a6819656ed6c54355322b91c2dd020e | |
parent | 204db6ed17743000691d930368a5abd6ea541c58 (diff) |
mm: numa: remove migrate_ratelimited
This code is dead since commit 9e645ab6d089 ("sched/numa: Continue PTE
scanning even if migrate rate limited") so remove it.
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/migrate.h | 5 | ||||
-rw-r--r-- | mm/migrate.c | 20 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 78baed5f2952..cac1c0904d5f 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h | |||
@@ -69,7 +69,6 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping, | |||
69 | extern bool pmd_trans_migrating(pmd_t pmd); | 69 | extern bool pmd_trans_migrating(pmd_t pmd); |
70 | extern int migrate_misplaced_page(struct page *page, | 70 | extern int migrate_misplaced_page(struct page *page, |
71 | struct vm_area_struct *vma, int node); | 71 | struct vm_area_struct *vma, int node); |
72 | extern bool migrate_ratelimited(int node); | ||
73 | #else | 72 | #else |
74 | static inline bool pmd_trans_migrating(pmd_t pmd) | 73 | static inline bool pmd_trans_migrating(pmd_t pmd) |
75 | { | 74 | { |
@@ -80,10 +79,6 @@ static inline int migrate_misplaced_page(struct page *page, | |||
80 | { | 79 | { |
81 | return -EAGAIN; /* can't migrate now */ | 80 | return -EAGAIN; /* can't migrate now */ |
82 | } | 81 | } |
83 | static inline bool migrate_ratelimited(int node) | ||
84 | { | ||
85 | return false; | ||
86 | } | ||
87 | #endif /* CONFIG_NUMA_BALANCING */ | 82 | #endif /* CONFIG_NUMA_BALANCING */ |
88 | 83 | ||
89 | #if defined(CONFIG_NUMA_BALANCING) && defined(CONFIG_TRANSPARENT_HUGEPAGE) | 84 | #if defined(CONFIG_NUMA_BALANCING) && defined(CONFIG_TRANSPARENT_HUGEPAGE) |
diff --git a/mm/migrate.c b/mm/migrate.c index ec1802d85f05..a65ff72ab739 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
@@ -1565,30 +1565,10 @@ static struct page *alloc_misplaced_dst_page(struct page *page, | |||
1565 | * page migration rate limiting control. | 1565 | * page migration rate limiting control. |
1566 | * Do not migrate more than @pages_to_migrate in a @migrate_interval_millisecs | 1566 | * Do not migrate more than @pages_to_migrate in a @migrate_interval_millisecs |
1567 | * window of time. Default here says do not migrate more than 1280M per second. | 1567 | * window of time. Default here says do not migrate more than 1280M per second. |
1568 | * If a node is rate-limited then PTE NUMA updates are also rate-limited. However | ||
1569 | * as it is faults that reset the window, pte updates will happen unconditionally | ||
1570 | * if there has not been a fault since @pteupdate_interval_millisecs after the | ||
1571 | * throttle window closed. | ||
1572 | */ | 1568 | */ |
1573 | static unsigned int migrate_interval_millisecs __read_mostly = 100; | 1569 | static unsigned int migrate_interval_millisecs __read_mostly = 100; |
1574 | static unsigned int pteupdate_interval_millisecs __read_mostly = 1000; | ||
1575 | static unsigned int ratelimit_pages __read_mostly = 128 << (20 - PAGE_SHIFT); | 1570 | static unsigned int ratelimit_pages __read_mostly = 128 << (20 - PAGE_SHIFT); |
1576 | 1571 | ||
1577 | /* Returns true if NUMA migration is currently rate limited */ | ||
1578 | bool migrate_ratelimited(int node) | ||
1579 | { | ||
1580 | pg_data_t *pgdat = NODE_DATA(node); | ||
1581 | |||
1582 | if (time_after(jiffies, pgdat->numabalancing_migrate_next_window + | ||
1583 | msecs_to_jiffies(pteupdate_interval_millisecs))) | ||
1584 | return false; | ||
1585 | |||
1586 | if (pgdat->numabalancing_migrate_nr_pages < ratelimit_pages) | ||
1587 | return false; | ||
1588 | |||
1589 | return true; | ||
1590 | } | ||
1591 | |||
1592 | /* Returns true if the node is migrate rate-limited after the update */ | 1572 | /* Returns true if the node is migrate rate-limited after the update */ |
1593 | static bool numamigrate_update_ratelimit(pg_data_t *pgdat, | 1573 | static bool numamigrate_update_ratelimit(pg_data_t *pgdat, |
1594 | unsigned long nr_pages) | 1574 | unsigned long nr_pages) |