Merge tag 'for-5.6/block-2020-01-27' of git://git.kernel.dk/linux-block

[linux.git] / kernel / power / snapshot.c

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 26b9168321e765f85d3d90190644c04e7f2b6ce7..ddade80ad27670c33f84bbbedd1328edf42a3ace 100644 (file)
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -8,7 +8,7 @@
  * Copyright (C) 2006 Rafael J. Wysocki <rjw@sisk.pl>
  */
 
-#define pr_fmt(fmt) "PM: " fmt
+#define pr_fmt(fmt) "PM: hibernation: " fmt
 
 #include <linux/version.h>
 #include <linux/module.h>
@@ -1147,24 +1147,24 @@ void free_basic_memory_bitmaps(void)
 
 void clear_free_pages(void)
 {
-#ifdef CONFIG_PAGE_POISONING_ZERO
        struct memory_bitmap *bm = free_pages_map;
        unsigned long pfn;
 
        if (WARN_ON(!(free_pages_map)))
                return;
 
-       memory_bm_position_reset(bm);
-       pfn = memory_bm_next_pfn(bm);
-       while (pfn != BM_END_OF_MAP) {
-               if (pfn_valid(pfn))
-                       clear_highpage(pfn_to_page(pfn));
-
+       if (IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) || want_init_on_free()) {
+               memory_bm_position_reset(bm);
                pfn = memory_bm_next_pfn(bm);
+               while (pfn != BM_END_OF_MAP) {
+                       if (pfn_valid(pfn))
+                               clear_highpage(pfn_to_page(pfn));
+
+                       pfn = memory_bm_next_pfn(bm);
+               }
+               memory_bm_position_reset(bm);
+               pr_info("free pages cleared after restore\n");
        }
-       memory_bm_position_reset(bm);
-       pr_info("free pages cleared after restore\n");
-#endif /* PAGE_POISONING_ZERO */
 }
 
 /**
@@ -1566,9 +1566,7 @@ static unsigned long preallocate_image_highmem(unsigned long nr_pages)
  */
 static unsigned long __fraction(u64 x, u64 multiplier, u64 base)
 {
-       x *= multiplier;
-       do_div(x, base);
-       return (unsigned long)x;
+       return div64_u64(x * multiplier, base);
 }
 
 static unsigned long preallocate_highmem_fraction(unsigned long nr_pages,
@@ -1705,16 +1703,20 @@ int hibernate_preallocate_memory(void)
        ktime_t start, stop;
        int error;
 
-       pr_info("Preallocating image memory... ");
+       pr_info("Preallocating image memory\n");
        start = ktime_get();
 
        error = memory_bm_create(&orig_bm, GFP_IMAGE, PG_ANY);
-       if (error)
+       if (error) {
+               pr_err("Cannot allocate original bitmap\n");
                goto err_out;
+       }
 
        error = memory_bm_create(&copy_bm, GFP_IMAGE, PG_ANY);
-       if (error)
+       if (error) {
+               pr_err("Cannot allocate copy bitmap\n");
                goto err_out;
+       }
 
        alloc_normal = 0;
        alloc_highmem = 0;
@@ -1804,8 +1806,11 @@ int hibernate_preallocate_memory(void)
                alloc -= pages;
                pages += pages_highmem;
                pages_highmem = preallocate_image_highmem(alloc);
-               if (pages_highmem < alloc)
+               if (pages_highmem < alloc) {
+                       pr_err("Image allocation is %lu pages short\n",
+                               alloc - pages_highmem);
                        goto err_out;
+               }
                pages += pages_highmem;
                /*
                 * size is the desired number of saveable pages to leave in
@@ -1836,13 +1841,12 @@ int hibernate_preallocate_memory(void)
 
  out:
        stop = ktime_get();
-       pr_cont("done (allocated %lu pages)\n", pages);
+       pr_info("Allocated %lu pages for snapshot\n", pages);
        swsusp_show_speed(start, stop, pages, "Allocated");
 
        return 0;
 
  err_out:
-       pr_cont("\n");
        swsusp_free();
        return -ENOMEM;
 }
@@ -1976,7 +1980,7 @@ asmlinkage __visible int swsusp_save(void)
 {
        unsigned int nr_pages, nr_highmem;
 
-       pr_info("Creating hibernation image:\n");
+       pr_info("Creating image:\n");
 
        drain_local_pages(NULL);
        nr_pages = count_data_pages();
@@ -2010,7 +2014,7 @@ asmlinkage __visible int swsusp_save(void)
        nr_copy_pages = nr_pages;
        nr_meta_pages = DIV_ROUND_UP(nr_pages * sizeof(long), PAGE_SIZE);
 
-       pr_info("Hibernation image created (%d pages copied)\n", nr_pages);
+       pr_info("Image created (%d pages copied)\n", nr_pages);
 
        return 0;
 }