1 files changed, 12 insertions, 4 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index d6a2e89b086a..4f1d894835b5 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1867,16 +1867,24 @@ static unsigned int ratelimit_pages __read_mostly = 128 << (20 - PAGE_SHIFT);
 static bool numamigrate_update_ratelimit(pg_data_t *pgdat,
                                         unsigned long nr_pages)
 {
+        unsigned long next_window, interval;
+
+        next_window = READ_ONCE(pgdat->numabalancing_migrate_next_window);
+        interval = msecs_to_jiffies(migrate_interval_millisecs);
+
         /*
          * Rate-limit the amount of data that is being migrated to a node.
          * Optimal placement is no good if the memory bus is saturated and
          * all the time is being spent migrating!
          */
-        if (time_after(jiffies, pgdat->numabalancing_migrate_next_window)) {
-                spin_lock(&pgdat->numabalancing_migrate_lock);
+        if (time_after(jiffies, next_window) &&
+                        spin_trylock(&pgdat->numabalancing_migrate_lock)) {
                 pgdat->numabalancing_migrate_nr_pages = 0;
-                pgdat->numabalancing_migrate_next_window = jiffies +
-                        msecs_to_jiffies(migrate_interval_millisecs);
+                do {
+                        next_window += interval;
+                } while (unlikely(time_after(jiffies, next_window)));
+
+                WRITE_ONCE(pgdat->numabalancing_migrate_next_window, next_window);
                 spin_unlock(&pgdat->numabalancing_migrate_lock);
         }
         if (pgdat->numabalancing_migrate_nr_pages > ratelimit_pages) {