From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933885AbbENOUG (ORCPT ); Thu, 14 May 2015 10:20:06 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:35050 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933015AbbENOT6 (ORCPT ); Thu, 14 May 2015 10:19:58 -0400 From: Anisse Astier Cc: Anisse Astier , Andrew Morton , Mel Gorman , "Kirill A. Shutemov" , David Rientjes , Alan Cox , Linus Torvalds , Peter Zijlstra , PaX Team , Brad Spengler , Kees Cook , Andi Kleen , "Rafael J. Wysocki" , Pavel Machek , Len Brown , linux-mm@kvack.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] PM / Hibernate: prepare for SANITIZE_FREED_PAGES Date: Thu, 14 May 2015 16:19:46 +0200 Message-Id: <1431613188-4511-2-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1431613188-4511-1-git-send-email-anisse@astier.eu> References: <1431613188-4511-1-git-send-email-anisse@astier.eu> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SANITIZE_FREED_PAGES feature relies on having all pages going through the free_pages_prepare path in order to be cleared before being used. In the hibernate use case, free pages will automagically appear in the system without being cleared, left there by the loading kernel. This patch will make sure free pages are cleared on resume; when we'll enable SANITIZE_FREED_PAGES. We free the pages just after resume because we can't do it later: going through any device resume code might allocate some memory and invalidate the free pages bitmap. Signed-off-by: Anisse Astier --- kernel/power/hibernate.c | 4 +++- kernel/power/power.h | 2 ++ kernel/power/snapshot.c | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 2329daa..0a73126 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -305,9 +305,11 @@ static int create_image(int platform_mode) error); /* Restore control flow magically appears here */ restore_processor_state(); - if (!in_suspend) + if (!in_suspend) { events_check_enabled = false; + clear_free_pages(); + } platform_leave(platform_mode); Power_up: diff --git a/kernel/power/power.h b/kernel/power/power.h index ce9b832..6d2d7bf 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -92,6 +92,8 @@ extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void); +extern void clear_free_pages(void); + /** * Auxiliary structure used for reading the snapshot image data and * metadata from and writing them to the list of page backup entries diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 5235dd4..2335130 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1032,6 +1032,28 @@ void free_basic_memory_bitmaps(void) pr_debug("PM: Basic memory bitmaps freed\n"); } +void clear_free_pages(void) +{ +#ifdef CONFIG_SANITIZE_FREED_PAGES + 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)); + + pfn = memory_bm_next_pfn(bm); + } + memory_bm_position_reset(bm); + printk(KERN_INFO "PM: free pages cleared after restore\n"); +#endif /* SANITIZE_FREED_PAGES */ +} + /** * snapshot_additional_pages - estimate the number of additional pages * be needed for setting up the suspend image data structures for given -- 1.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anisse Astier Subject: [PATCH v4 1/3] PM / Hibernate: prepare for SANITIZE_FREED_PAGES Date: Thu, 14 May 2015 16:19:46 +0200 Message-ID: <1431613188-4511-2-git-send-email-anisse@astier.eu> References: <1431613188-4511-1-git-send-email-anisse@astier.eu> Return-path: In-Reply-To: <1431613188-4511-1-git-send-email-anisse@astier.eu> Sender: owner-linux-mm@kvack.org Cc: Anisse Astier , Andrew Morton , Mel Gorman , "Kirill A. Shutemov" , David Rientjes , Alan Cox , Linus Torvalds , Peter Zijlstra , PaX Team , Brad Spengler , Kees Cook , Andi Kleen , "Rafael J. Wysocki" , Pavel Machek , Len Brown , linux-mm@kvack.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-pm@vger.kernel.org SANITIZE_FREED_PAGES feature relies on having all pages going through the free_pages_prepare path in order to be cleared before being used. In the hibernate use case, free pages will automagically appear in the system without being cleared, left there by the loading kernel. This patch will make sure free pages are cleared on resume; when we'll enable SANITIZE_FREED_PAGES. We free the pages just after resume because we can't do it later: going through any device resume code might allocate some memory and invalidate the free pages bitmap. Signed-off-by: Anisse Astier --- kernel/power/hibernate.c | 4 +++- kernel/power/power.h | 2 ++ kernel/power/snapshot.c | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 2329daa..0a73126 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -305,9 +305,11 @@ static int create_image(int platform_mode) error); /* Restore control flow magically appears here */ restore_processor_state(); - if (!in_suspend) + if (!in_suspend) { events_check_enabled = false; + clear_free_pages(); + } platform_leave(platform_mode); Power_up: diff --git a/kernel/power/power.h b/kernel/power/power.h index ce9b832..6d2d7bf 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -92,6 +92,8 @@ extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void); +extern void clear_free_pages(void); + /** * Auxiliary structure used for reading the snapshot image data and * metadata from and writing them to the list of page backup entries diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 5235dd4..2335130 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1032,6 +1032,28 @@ void free_basic_memory_bitmaps(void) pr_debug("PM: Basic memory bitmaps freed\n"); } +void clear_free_pages(void) +{ +#ifdef CONFIG_SANITIZE_FREED_PAGES + 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)); + + pfn = memory_bm_next_pfn(bm); + } + memory_bm_position_reset(bm); + printk(KERN_INFO "PM: free pages cleared after restore\n"); +#endif /* SANITIZE_FREED_PAGES */ +} + /** * snapshot_additional_pages - estimate the number of additional pages * be needed for setting up the suspend image data structures for given -- 1.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org