kernel/watchdog: use nmi registers snapshot in hardlockup handler

[mirror_ubuntu-bionic-kernel.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 0409a4ad6ea1363611d49269ecbb5ef88afe5c87..223464227299557d2f3139f26fa08abcd04cc532 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -634,22 +634,6 @@ isolate_freepages_range(struct compact_control *cc,
        return pfn;
 }
 
-/* Update the number of anon and file isolated pages in the zone */
-static void acct_isolated(struct zone *zone, struct compact_control *cc)
-{
-       struct page *page;
-       unsigned int count[2] = { 0, };
-
-       if (list_empty(&cc->migratepages))
-               return;
-
-       list_for_each_entry(page, &cc->migratepages, lru)
-               count[!!page_is_file_cache(page)]++;
-
-       mod_node_page_state(zone->zone_pgdat, NR_ISOLATED_ANON, count[0]);
-       mod_node_page_state(zone->zone_pgdat, NR_ISOLATED_FILE, count[1]);
-}
-
 /* Similar to reclaim, but different enough that they don't share logic */
 static bool too_many_isolated(struct zone *zone)
 {
@@ -866,6 +850,8 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
 
                /* Successfully isolated */
                del_page_from_lru_list(page, lruvec, page_lru(page));
+               inc_node_page_state(page,
+                               NR_ISOLATED_ANON + page_is_file_cache(page));
 
 isolate_success:
                list_add(&page->lru, &cc->migratepages);
@@ -902,7 +888,6 @@ isolate_fail:
                                spin_unlock_irqrestore(zone_lru_lock(zone), flags);
                                locked = false;
                        }
-                       acct_isolated(zone, cc);
                        putback_movable_pages(&cc->migratepages);
                        cc->nr_migratepages = 0;
                        cc->last_migrated_pfn = 0;
@@ -988,7 +973,6 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
                if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
                        break;
        }
-       acct_isolated(cc->zone, cc);
 
        return pfn;
 }
@@ -1258,10 +1242,8 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                low_pfn = isolate_migratepages_block(cc, low_pfn,
                                                block_end_pfn, isolate_mode);
 
-               if (!low_pfn || cc->contended) {
-                       acct_isolated(zone, cc);
+               if (!low_pfn || cc->contended)
                        return ISOLATE_ABORT;
-               }
 
                /*
                 * Either we isolated something and proceed with migration. Or
@@ -1271,7 +1253,6 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                break;
        }
 
-       acct_isolated(zone, cc);
        /* Record where migration scanner will be restarted. */
        cc->migrate_pfn = low_pfn;
 
@@ -2043,33 +2024,38 @@ void kcompactd_stop(int nid)
  * away, we get changed to run anywhere: as the first one comes back,
  * restore their cpu bindings.
  */
-static int cpu_callback(struct notifier_block *nfb, unsigned long action,
-                       void *hcpu)
+static int kcompactd_cpu_online(unsigned int cpu)
 {
        int nid;
 
-       if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
-               for_each_node_state(nid, N_MEMORY) {
-                       pg_data_t *pgdat = NODE_DATA(nid);
-                       const struct cpumask *mask;
+       for_each_node_state(nid, N_MEMORY) {
+               pg_data_t *pgdat = NODE_DATA(nid);
+               const struct cpumask *mask;
 
-                       mask = cpumask_of_node(pgdat->node_id);
+               mask = cpumask_of_node(pgdat->node_id);
 
-                       if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids)
-                               /* One of our CPUs online: restore mask */
-                               set_cpus_allowed_ptr(pgdat->kcompactd, mask);
-               }
+               if (cpumask_any_and(cpu_online_mask, mask) < nr_cpu_ids)
+                       /* One of our CPUs online: restore mask */
+                       set_cpus_allowed_ptr(pgdat->kcompactd, mask);
        }
-       return NOTIFY_OK;
+       return 0;
 }
 
 static int __init kcompactd_init(void)
 {
        int nid;
+       int ret;
+
+       ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                       "mm/compaction:online",
+                                       kcompactd_cpu_online, NULL);
+       if (ret < 0) {
+               pr_err("kcompactd: failed to register hotplug callbacks.\n");
+               return ret;
+       }
 
        for_each_node_state(nid, N_MEMORY)
                kcompactd_run(nid);
-       hotcpu_notifier(cpu_callback, 0);
        return 0;
 }
 subsys_initcall(kcompactd_init)