pm-hibernate-make-direct-map-manipulations-more-explicit.patch removed from -mm tree
The patch titled
Subject: PM: hibernate: make direct map manipulations more explicit
has been removed from the -mm tree. Its filename was
pm-hibernate-make-direct-map-manipulations-more-explicit.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: PM: hibernate: make direct map manipulations more explicit
When DEBUG_PAGEALLOC or ARCH_HAS_SET_DIRECT_MAP is enabled a page may be not present in the direct map and has to be explicitly mapped before it could be copied.
Introduce hibernate_map_page() and hibernation_unmap_page() that will explicitly use set_direct_map_{default,invalid}_noflush() for ARCH_HAS_SET_DIRECT_MAP case and debug_pagealloc_{map,unmap}_pages() for DEBUG_PAGEALLOC case.
The remapping of the pages in safe_copy_page() presumes that it only changes protection bits in an existing PTE and so it is safe to ignore return value of set_direct_map_{default,invalid}_noflush().
Still, add a pr_warn() so that future changes in set_memory APIs will not silently break hibernation.
---
include/linux/mm.h | 12 ------------ kernel/power/snapshot.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 14 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~pm-hibernate-make-direct-map-manipulations-more-explicit +0 -12
@@ -2934,16 +2934,6 @@ static inline bool debug_pagealloc_enabl#if defined(CONFIG_DEBUG_PAGEALLOC ) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP )extern void __kernel_map_pages (struct page *page,int numpages,int enable); -/* -* When called in DEBUG_PAGEALLOC context, the call should most likely be -* guarded by debug_pagealloc_enabled() or debug_pagealloc_enabled_static() -*/ -static inline void -kernel_map_pages (struct page *page,int numpages,int enable) -{ -__kernel_map_pages (page, numpages, enable); -} -static inline void debug_pagealloc_map_pages (struct page *page,int numpages) {if (debug_pagealloc_enabled_static ())
@@ -2960,8 +2950,6 @@ static inline void debug_pagealloc_unmapextern bool kernel_page_present (struct page *page);#endif /* CONFIG_HIBERNATION */ #else /* CONFIG_DEBUG_PAGEALLOC || CONFIG_ARCH_HAS_SET_DIRECT_MAP */ -static inline void -kernel_map_pages (struct page *page,int numpages,int enable) {}static inline void debug_pagealloc_map_pages (struct page *page,int numpages) {}static inline void debug_pagealloc_unmap_pages (struct page *page,int numpages) {}#ifdef CONFIG_HIBERNATION
kernel/power/snapshot.c renamed from kernel/power/snapshot.c~pm-hibernate-make-direct-map-manipulations-more-explicit +36 -2
@@ -76,6 +76,40 @@ static inline void hibernate_restore_prostatic inline void hibernate_restore_unprotect_page (void *page_address) {}#endif /* CONFIG_STRICT_KERNEL_RWX && CONFIG_ARCH_HAS_SET_MEMORY */ + +/* +* The calls to set_direct_map_*() should not fail because remapping a page +* here means that we only update protection bits in an existing PTE. +* It is still worth to have a warning here if something changes and this +* will no longer be the case. +*/ +static inline void hibernate_map_page (struct page *page) +{ +if (IS_ENABLED (CONFIG_ARCH_HAS_SET_DIRECT_MAP )) { +int ret =set_direct_map_default_noflush (page); + +if (ret) +pr_warn_once ("Failed to remap page\n" ); + }else { +debug_pagealloc_map_pages (page,1 ); + } +} + +static inline void hibernate_unmap_page (struct page *page) +{ +if (IS_ENABLED (CONFIG_ARCH_HAS_SET_DIRECT_MAP )) { +unsigned long addr = (unsigned long )page_address (page); +int ret =set_direct_map_invalid_noflush (page); + +if (ret) +pr_warn_once ("Failed to remap page\n" ); + +flush_tlb_kernel_range (addr, addr +PAGE_SIZE ); + }else { +debug_pagealloc_unmap_pages (page,1 ); + } +} +static int swsusp_page_is_free (struct page *);static void swsusp_set_page_forbidden (struct page *);static void swsusp_unset_page_forbidden (struct page *);
@@ -1355,9 +1389,9 @@ static void safe_copy_page(void *dst, stif (kernel_page_present (s_page)) {do_copy_page (dst,page_address (s_page)); }else { -kernel_map_pages (s_page,1 ,1 ); +hibernate_map_page (s_page);do_copy_page (dst,page_address (s_page)); -kernel_map_pages (s_page,1 ,0 ); +hibernate_unmap_page (s_page); } }
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-enforce-overlap-of-memorymemblock-and-memoryreserved.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout.patch mm-add-definition-of-pmd_page_order.patch mmap-make-mlock_future_check-global.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch secretmem-use-pmd-size-pages-to-amortize-direct-map-fragmentation.patch secretmem-add-memcg-accounting.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch