1 files changed, 18 insertions, 44 deletions

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 0de28576807..06efa54f93d 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -711,10 +711,9 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
         list_for_each_entry(region, &nosave_regions, list) {
                 unsigned long pfn;
 
-                pr_debug("PM: Marking nosave pages: [mem %#010llx-%#010llx]\n",
-                         (unsigned long long) region->start_pfn << PAGE_SHIFT,
-                         ((unsigned long long) region->end_pfn << PAGE_SHIFT)
-                                - 1);
+                pr_debug("PM: Marking nosave pages: %016lx - %016lx\n",
+                                region->start_pfn << PAGE_SHIFT,
+                                region->end_pfn << PAGE_SHIFT);
 
                 for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
                         if (pfn_valid(pfn)) {
@@ -813,8 +812,7 @@ unsigned int snapshot_additional_pages(struct zone *zone)
         unsigned int res;
 
         res = DIV_ROUND_UP(zone->spanned_pages, BM_BITS_PER_BLOCK);
-        res += DIV_ROUND_UP(res * sizeof(struct bm_block),
-                            LINKED_PAGE_DATA_SIZE);
+        res += DIV_ROUND_UP(res * sizeof(struct bm_block), PAGE_SIZE);
         return 2 * res;
 }
 
@@ -860,9 +858,6 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
             PageReserved(page))
                 return NULL;
 
-        if (page_is_guard(page))
-                return NULL;
-
         return page;
 }
 
@@ -925,9 +920,6 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
             && (!kernel_page_present(page) || pfn_is_nosave(pfn)))
                 return NULL;
 
-        if (page_is_guard(page))
-                return NULL;
-
         return page;
 }
 
@@ -1001,20 +993,20 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
         s_page = pfn_to_page(src_pfn);
         d_page = pfn_to_page(dst_pfn);
         if (PageHighMem(s_page)) {
-                src = kmap_atomic(s_page);
-                dst = kmap_atomic(d_page);
+                src = kmap_atomic(s_page, KM_USER0);
+                dst = kmap_atomic(d_page, KM_USER1);
                 do_copy_page(dst, src);
-                kunmap_atomic(dst);
-                kunmap_atomic(src);
+                kunmap_atomic(dst, KM_USER1);
+                kunmap_atomic(src, KM_USER0);
         } else {
                 if (PageHighMem(d_page)) {
                         /* Page pointed to by src may contain some kernel
                          * data modified by kmap_atomic()
                          */
                         safe_copy_page(buffer, s_page);
-                        dst = kmap_atomic(d_page);
+                        dst = kmap_atomic(d_page, KM_USER0);
                         copy_page(dst, buffer);
-                        kunmap_atomic(dst);
+                        kunmap_atomic(dst, KM_USER0);
                 } else {
                         safe_copy_page(page_address(d_page), s_page);
                 }
@@ -1347,9 +1339,6 @@ int hibernate_preallocate_memory(void)
         count += highmem;
         count -= totalreserve_pages;
 
-        /* Add number of pages required for page keys (s390 only). */
-        size += page_key_additional_pages(saveable);
-
         /* Compute the maximum number of saveable pages to leave in memory. */
         max_size = (count - (size + PAGES_FOR_IO)) / 2
                         - 2 * DIV_ROUND_UP(reserved_size, PAGE_SIZE);
@@ -1673,8 +1662,6 @@ pack_pfns(unsigned long *buf, struct memory_bitmap *bm)
                 buf[j] = memory_bm_next_pfn(bm);
                 if (unlikely(buf[j] == BM_END_OF_MAP))
                         break;
-                /* Save page key for data page (s390 only). */
-                page_key_read(buf + j);
         }
 }
 
@@ -1729,9 +1716,9 @@ int snapshot_read_next(struct snapshot_handle *handle)
                          */
                         void *kaddr;
 
-                        kaddr = kmap_atomic(page);
+                        kaddr = kmap_atomic(page, KM_USER0);
                         copy_page(buffer, kaddr);
-                        kunmap_atomic(kaddr);
+                        kunmap_atomic(kaddr, KM_USER0);
                         handle->buffer = buffer;
                 } else {
                         handle->buffer = page_address(page);
@@ -1834,9 +1821,6 @@ static int unpack_orig_pfns(unsigned long *buf, struct memory_bitmap *bm)
                 if (unlikely(buf[j] == BM_END_OF_MAP))
                         break;
 
-                /* Extract and buffer page key for data page (s390 only). */
-                page_key_memorize(buf + j);
-
                 if (memory_bm_pfn_present(bm, buf[j]))
                         memory_bm_set_bit(bm, buf[j]);
                 else
@@ -2015,9 +1999,9 @@ static void copy_last_highmem_page(void)
         if (last_highmem_page) {
                 void *dst;
 
-                dst = kmap_atomic(last_highmem_page);
+                dst = kmap_atomic(last_highmem_page, KM_USER0);
                 copy_page(dst, buffer);
-                kunmap_atomic(dst);
+                kunmap_atomic(dst, KM_USER0);
                 last_highmem_page = NULL;
         }
 }
@@ -2239,11 +2223,6 @@ int snapshot_write_next(struct snapshot_handle *handle)
                 if (error)
                         return error;
 
-                /* Allocate buffer for page keys. */
-                error = page_key_alloc(nr_copy_pages);
-                if (error)
-                        return error;
-
         } else if (handle->cur <= nr_meta_pages + 1) {
                 error = unpack_orig_pfns(buffer, &copy_bm);
                 if (error)
@@ -2264,8 +2243,6 @@ int snapshot_write_next(struct snapshot_handle *handle)
                 }
         } else {
                 copy_last_highmem_page();
-                /* Restore page key for data page (s390 only). */
-                page_key_write(handle->buffer);
                 handle->buffer = get_buffer(&orig_bm, &ca);
                 if (IS_ERR(handle->buffer))
                         return PTR_ERR(handle->buffer);
@@ -2287,9 +2264,6 @@ int snapshot_write_next(struct snapshot_handle *handle)
 void snapshot_write_finalize(struct snapshot_handle *handle)
 {
         copy_last_highmem_page();
-        /* Restore page key for data page (s390 only). */
-        page_key_write(handle->buffer);
-        page_key_free();
         /* Free only if we have loaded the image entirely */
         if (handle->cur > 1 && handle->cur > nr_meta_pages + nr_copy_pages) {
                 memory_bm_free(&orig_bm, PG_UNSAFE_CLEAR);
@@ -2310,13 +2284,13 @@ swap_two_pages_data(struct page *p1, struct page *p2, void *buf)
 {
         void *kaddr1, *kaddr2;
 
-        kaddr1 = kmap_atomic(p1);
-        kaddr2 = kmap_atomic(p2);
+        kaddr1 = kmap_atomic(p1, KM_USER0);
+        kaddr2 = kmap_atomic(p2, KM_USER1);
         copy_page(buf, kaddr1);
         copy_page(kaddr1, kaddr2);
         copy_page(kaddr2, buf);
-        kunmap_atomic(kaddr2);
-        kunmap_atomic(kaddr1);
+        kunmap_atomic(kaddr2, KM_USER1);
+        kunmap_atomic(kaddr1, KM_USER0);
 }
 
 /**