Skip to content

Commit d42044a

Browse files
jdreaverrafaeljw
authored andcommitted
PM: hibernate: Replace deprecated kmap_atomic() with kmap_local_page()
kmap_atomic() is deprecated and should be replaced with kmap_local_page() [1][2]. kmap_local_page() is faster in kernels with HIGHMEM enabled, can take page faults, and allows preemption. According to [2], this replacement is safe as long as the code between kmap_atomic() and kunmap_atomic() does not implicitly depend on disabling page faults or preemption. In all of the call sites in this patch, the only thing happening between mapping and unmapping pages is copy_page() calls, and I don't suspect they depend on disabling page faults or preemption. Link: https://lwn.net/Articles/836144/ [1] Link: https://docs.kernel.org/mm/highmem.html#temporary-virtual-mappings [2] Signed-off-by: David Reaver <me@davidreaver.com> Link: https://patch.msgid.link/20250112152658.20132-1-me@davidreaver.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 0ad2507 commit d42044a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

kernel/power/snapshot.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,9 +2270,9 @@ int snapshot_read_next(struct snapshot_handle *handle)
22702270
*/
22712271
void *kaddr;
22722272

2273-
kaddr = kmap_atomic(page);
2273+
kaddr = kmap_local_page(page);
22742274
copy_page(buffer, kaddr);
2275-
kunmap_atomic(kaddr);
2275+
kunmap_local(kaddr);
22762276
handle->buffer = buffer;
22772277
} else {
22782278
handle->buffer = page_address(page);
@@ -2561,9 +2561,9 @@ static void copy_last_highmem_page(void)
25612561
if (last_highmem_page) {
25622562
void *dst;
25632563

2564-
dst = kmap_atomic(last_highmem_page);
2564+
dst = kmap_local_page(last_highmem_page);
25652565
copy_page(dst, buffer);
2566-
kunmap_atomic(dst);
2566+
kunmap_local(dst);
25672567
last_highmem_page = NULL;
25682568
}
25692569
}
@@ -2881,13 +2881,13 @@ static inline void swap_two_pages_data(struct page *p1, struct page *p2,
28812881
{
28822882
void *kaddr1, *kaddr2;
28832883

2884-
kaddr1 = kmap_atomic(p1);
2885-
kaddr2 = kmap_atomic(p2);
2884+
kaddr1 = kmap_local_page(p1);
2885+
kaddr2 = kmap_local_page(p2);
28862886
copy_page(buf, kaddr1);
28872887
copy_page(kaddr1, kaddr2);
28882888
copy_page(kaddr2, buf);
2889-
kunmap_atomic(kaddr2);
2890-
kunmap_atomic(kaddr1);
2889+
kunmap_local(kaddr2);
2890+
kunmap_local(kaddr1);
28912891
}
28922892

28932893
/**

0 commit comments

Comments
 (0)