6 files changed, 41 insertions, 26 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index f8fe57d1022e..9bbaaab14b36 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -114,6 +114,15 @@ config PM_SLEEP_SMP
         depends on PM_SLEEP
         select HOTPLUG_CPU
 
+config PM_SLEEP_SMP_NONZERO_CPU
+        def_bool y
+        depends on PM_SLEEP_SMP
+        depends on ARCH_SUSPEND_NONZERO_CPU
+        ---help---
+        If an arch can suspend (for suspend, hibernate, kexec, etc) on a
+        non-zero numbered CPU, it may define ARCH_SUSPEND_NONZERO_CPU. This
+        will allow nohz_full mask to include CPU0.
+
 config PM_AUTOSLEEP
         bool "Opportunistic sleep"
         depends on PM_SLEEP
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index abef759de7c8..c8c272df7154 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -14,7 +14,6 @@
 
 #include <linux/export.h>
 #include <linux/suspend.h>
-#include <linux/syscalls.h>
 #include <linux/reboot.h>
 #include <linux/string.h>
 #include <linux/device.h>
@@ -281,7 +280,7 @@ static int create_image(int platform_mode)
         if (error || hibernation_test(TEST_PLATFORM))
                 goto Platform_finish;
 
-        error = disable_nonboot_cpus();
+        error = suspend_disable_secondary_cpus();
         if (error || hibernation_test(TEST_CPUS))
                 goto Enable_cpus;
 
@@ -323,7 +322,7 @@ static int create_image(int platform_mode)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Platform_finish:
         platform_finish(platform_mode);
@@ -417,7 +416,7 @@ int hibernation_snapshot(int platform_mode)
 
 int __weak hibernate_resume_nonboot_cpu_disable(void)
 {
-        return disable_nonboot_cpus();
+        return suspend_disable_secondary_cpus();
 }
 
 /**
@@ -486,7 +485,7 @@ static int resume_target_kernel(bool platform_mode)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Cleanup:
         platform_restore_cleanup(platform_mode);
@@ -564,7 +563,7 @@ int hibernation_platform_enter(void)
         if (error)
                 goto Platform_finish;
 
-        error = disable_nonboot_cpus();
+        error = suspend_disable_secondary_cpus();
         if (error)
                 goto Enable_cpus;
 
@@ -586,7 +585,7 @@ int hibernation_platform_enter(void)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Platform_finish:
         hibernation_ops->finish();
@@ -709,9 +708,7 @@ int hibernate(void)
                 goto Exit;
         }
 
-        pr_info("Syncing filesystems ... \n");
-        ksys_sync();
-        pr_info("done.\n");
+        ksys_sync_helper();
 
         error = freeze_processes();
         if (error)
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 98e76cad128b..4f43e724f6eb 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -16,6 +16,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/suspend.h>
+#include <linux/syscalls.h>
 
 #include "power.h"
 
@@ -51,6 +52,19 @@ void unlock_system_sleep(void)
 }
 EXPORT_SYMBOL_GPL(unlock_system_sleep);
 
+void ksys_sync_helper(void)
+{
+        ktime_t start;
+        long elapsed_msecs;
+
+        start = ktime_get();
+        ksys_sync();
+        elapsed_msecs = ktime_to_ms(ktime_sub(ktime_get(), start));
+        pr_info("Filesystems sync: %ld.%03ld seconds\n",
+                elapsed_msecs / MSEC_PER_SEC, elapsed_msecs % MSEC_PER_SEC);
+}
+EXPORT_SYMBOL_GPL(ksys_sync_helper);
+
 /* Routines for PM-transition notifications */
 
 static BLOCKING_NOTIFIER_HEAD(pm_chain_head);
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index f08a1e4ee1d4..bc9558ab1e5b 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1342,8 +1342,9 @@ static inline void do_copy_page(long *dst, long *src)
  * safe_copy_page - Copy a page in a safe way.
  *
  * Check if the page we are going to copy is marked as present in the kernel
- * page tables (this always is the case if CONFIG_DEBUG_PAGEALLOC is not set
- * and in that case kernel_page_present() always returns 'true').
+ * page tables. This always is the case if CONFIG_DEBUG_PAGEALLOC or
+ * CONFIG_ARCH_HAS_SET_DIRECT_MAP is not set. In that case kernel_page_present()
+ * always returns 'true'.
  */
 static void safe_copy_page(void *dst, struct page *s_page)
 {
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 0bd595a0b610..ef908c134b34 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -17,7 +17,6 @@
 #include <linux/console.h>
 #include <linux/cpu.h>
 #include <linux/cpuidle.h>
-#include <linux/syscalls.h>
 #include <linux/gfp.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -428,7 +427,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
         if (suspend_test(TEST_PLATFORM))
                 goto Platform_wake;
 
-        error = disable_nonboot_cpus();
+        error = suspend_disable_secondary_cpus();
         if (error || suspend_test(TEST_CPUS))
                 goto Enable_cpus;
 
@@ -458,7 +457,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
         BUG_ON(irqs_disabled());
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Platform_wake:
         platform_resume_noirq(state);
@@ -568,13 +567,11 @@ static int enter_state(suspend_state_t state)
         if (state == PM_SUSPEND_TO_IDLE)
                 s2idle_begin();
 
-#ifndef CONFIG_SUSPEND_SKIP_SYNC
-        trace_suspend_resume(TPS("sync_filesystems"), 0, true);
-        pr_info("Syncing filesystems ... ");
-        ksys_sync();
-        pr_cont("done.\n");
-        trace_suspend_resume(TPS("sync_filesystems"), 0, false);
-#endif
+        if (!IS_ENABLED(CONFIG_SUSPEND_SKIP_SYNC)) {
+                trace_suspend_resume(TPS("sync_filesystems"), 0, true);
+                ksys_sync_helper();
+                trace_suspend_resume(TPS("sync_filesystems"), 0, false);
+        }
 
         pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]);
         pm_suspend_clear_flags();
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 2d8b60a3c86b..cb24e840a3e6 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/suspend.h>
-#include <linux/syscalls.h>
 #include <linux/reboot.h>
 #include <linux/string.h>
 #include <linux/device.h>
@@ -228,9 +227,7 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
                 if (data->frozen)
                         break;
 
-                printk("Syncing filesystems ... ");
-                ksys_sync();
-                printk("done.\n");
+                ksys_sync_helper();
 
                 error = freeze_processes();
                 if (error)