Pageflags support.
Subsystems (2)
cover Pageflags support.
Add routines specific to Suspend2 for serialising pageflags in an image header and relocating them so that highmem pages can be also be restored at resume-time after lowmem is restored and the original cpu context reinstated.
PATCH 1/7 Pagedir.h
Add pagedir structs and declarations for variables and functions exported from pagedir.c.
kernel/power/pageflags.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-)
kernel/power/pageflags.c new file +28 -0
@@ -0,0 +1,28 @@ +/* +* kernel/power/pageflags.c +* +* Copyright (C) 2004-2006 Nigel Cunningham <[email protected]> +* +* This file is released under the GPLv2. +* +* Routines for serialising and relocating pageflags in which we +* store our image metadata. +* +*/ + +#include <linux/kernel.h> +#include <linux/mm.h> +#include <linux/module.h> +#include <linux/bitops.h> +#include <linux/list.h> +#include <linux/suspend.h> +#include "pageflags.h" +#include "modules.h" +#include "pagedir.h" + +/* Maps used in copying the image back are in builtin.c */ +dyn_pageflags_t pageset1_map; +dyn_pageflags_t pageset1_copy_map; +dyn_pageflags_t pageset2_map; +dyn_pageflags_t in_use_map; +
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 2/7 Return number of zones used.
In reply to Nigel CunninghamGet the number of zones used. Used when relocating the pageflags (below).
kernel/power/pageflags.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
kernel/power/pageflags.c +11 -0
@@ -26,3 +26,14 @@ dyn_pageflags_t pageset1_copy_map;dyn_pageflags_t pageset2_map;dyn_pageflags_t in_use_map; +static int num_zones (void ) +{ +int result =0 ; +struct zone *zone; + +for_each_zone (zone) + result++; + +return result; +} +
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 3/7 Pages for zone.
In reply to Nigel CunninghamFind out how many pages are used for the bitmap for a given zone.
kernel/power/pageflags.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
kernel/power/pageflags.c +6 -0
@@ -37,3 +37,9 @@ static int num_zones(void)return result; } +static int pages_for_zone (struct zone *zone) +{ +return (zone->spanned_pages + (PAGE_SIZE <<3 ) -1 ) / + (PAGE_SIZE <<3 ); +} +
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 4/7 Space needed to store one set of pageflags.
In reply to Nigel CunninghamReturn the number of bytes in the image header required to store one set of pageflags.
kernel/power/pageflags.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
kernel/power/pageflags.c +13 -0
@@ -43,3 +43,16 @@ static int pages_for_zone(struct zone *z (PAGE_SIZE <<3 ); } +int suspend_pageflags_space_needed (void ) +{ +int total =0 ; +struct zone *zone; + +for_each_zone (zone) + total +=sizeof (int ) *2 +pages_for_zone (zone) *PAGE_SIZE ; + + total +=sizeof (int ); + +return total; +} +
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 5/7 Serialise pageflags.
In reply to Nigel CunninghamRoutines for serialising pageflags in an image header.
kernel/power/pageflags.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-)
kernel/power/pageflags.c +74 -0
@@ -56,3 +56,77 @@ int suspend_pageflags_space_needed(void)return total; } +/* save_dyn_pageflags +* +* Description: Save a set of pageflags. +* Arguments: dyn_pageflags_t *: Pointer to the bitmap being saved. +*/ + +void save_dyn_pageflags (dyn_pageflags_t pagemap) +{ +int i, zone_num =0 ; +struct zone *zone; + +if (!*pagemap) +return ; + +for_each_zone (zone) { +int size =pages_for_zone (zone); + + suspend_active_writer->rw_header_chunk (WRITE ,NULL , + (char *) &zone_num,sizeof (int )); + suspend_active_writer->rw_header_chunk (WRITE ,NULL , + (char *) &size,sizeof (int )); + +for (i =0 ; i < size; i++) + suspend_active_writer->rw_header_chunk (WRITE ,NULL , + (char *) pagemap[zone_num][i],PAGE_SIZE ); + zone_num++; + } + zone_num =-1 ; + suspend_active_writer->rw_header_chunk (WRITE ,NULL , + (char *) &zone_num,sizeof (int )); +} + +/* load_dyn_pageflags +* +* Description: Load a set of pageflags. +* Arguments: dyn_pageflags_t *: Pointer to the bitmap being loaded. +* (It must be allocated before calling this routine). +*/ + +void load_dyn_pageflags (dyn_pageflags_t pagemap) +{ +int i, zone_num =0 , zone_check =0 ; +struct zone *zone; + +if (!pagemap) +return ; + +for_each_zone (zone) { +int size =0 ; + suspend_active_writer->rw_header_chunk (READ ,NULL , + (char *) &zone_check,sizeof (int )); +if (zone_check != zone_num) { +printk ("Zone check (%d) != zone_num (%d).\n" , + zone_check, zone_num); +BUG (); + } + suspend_active_writer->rw_header_chunk (READ ,NULL , + (char *) &size,sizeof (int )); + +for (i =0 ; i < size; i++) + suspend_active_writer->rw_header_chunk (READ ,NULL , + (char *) pagemap[zone_num][i], +PAGE_SIZE ); + zone_num++; + } + suspend_active_writer->rw_header_chunk (READ ,NULL , (char *) &zone_check, +sizeof (int )); +if (zone_check !=-1 ) { +printk ("Didn't read end of dyn pageflag data marker.(%x)\n" , + zone_check); +BUG (); + } +} +
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 6/7 Relocate pageflags.
In reply to Nigel CunninghamRelocate dynamically allocated pageflags to locations that won't be overwritten by the memory we're about to restore. This is used for restoring highmem pages after we've done the atomic restore of low memory.
kernel/power/pageflags.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-)
kernel/power/pageflags.c +36 -0
@@ -130,3 +130,39 @@ void load_dyn_pageflags(dyn_pageflags_t } } +/* relocate_dyn_pageflags +* +* Description: Relocate a set of pageflags to ensure they don't collide with +* pageset 1 data which will get overwritten on copyback. +* Arguments: dyn_pageflags_t *: Pointer to the bitmap being relocated. +*/ + +void relocate_dyn_pageflags (dyn_pageflags_t *pagemap) +{ +int i, zone_num =0 ; +struct zone *zone; + +if (!*pagemap) +return ; + +suspend_relocate_if_required ((void *) pagemap, +sizeof (void *) *num_zones ()); +BUG_ON (PagePageset1 (virt_to_page (*pagemap))); + +for_each_zone (zone) { +int pages =pages_for_zone (zone); + +suspend_relocate_if_required ((void *) &((*pagemap)[zone_num]), +sizeof (void *) * pages); +BUG_ON (PagePageset1 (virt_to_page ((*pagemap)[zone_num]))); + +for (i =0 ; i < pages; i++) { +suspend_relocate_if_required ( + (void *) &((*pagemap)[zone_num][i]), +PAGE_SIZE ); +BUG_ON (PagePageset1 (virt_to_page ( + (*pagemap)[zone_num][i]))); + } + zone_num++; + } +}
--
Nigel Cunningham nigel at suspend2 dot net
PATCH 7/7 Pageflags.h
In reply to Nigel CunninghamAdd header for pageflags variables and macros.
kernel/power/pageflags.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-)
kernel/power/pageflags.h new file +51 -0
@@ -0,0 +1,51 @@ +/* +* kernel/power/pageflags.h +* +* Copyright (C) 2004-2006 Nigel Cunningham <[email protected]> +* +* This file is released under the GPLv2. +* +* Suspend2 needs a few pageflags while working that aren't otherwise +* used. To save the struct page pageflags, we dynamically allocate +* a bitmap and use that. These are the only non order-0 allocations +* we do. +* +* NOTE!!! +* We assume that PAGE_SIZE - sizeof(void *) is a multiple of +* sizeof(unsigned long). Is this ever false? +*/ + +#include <linux/dyn_pageflags.h> +#include <linux/suspend.h> + +extern dyn_pageflags_t in_use_map; +extern dyn_pageflags_t pageset2_map; + +/* +* inusemap is used in two ways: +* - During suspend, to tag pages which are not used (to speed up +* count_data_pages); +* - During resume, to tag pages which are in pagedir1. This does not tag +* pagedir2 pages, so !== first use. +*/ + +#define PageInUse (page) (test_dynpageflag(&in_use_map, page)) +#define SetPageInUse (page) (set_dynpageflag(&in_use_map, page)) +#define ClearPageInUse (page) (clear_dynpageflag(&in_use_map, page)) + +#define PagePageset1 (page) (test_dynpageflag(&pageset1_map, page)) +#define SetPagePageset1 (page) (set_dynpageflag(&pageset1_map, page)) +#define ClearPagePageset1 (page) (clear_dynpageflag(&pageset1_map, page)) + +#define PagePageset1Copy (page) (test_dynpageflag(&pageset1_copy_map, page)) +#define SetPagePageset1Copy (page) (set_dynpageflag(&pageset1_copy_map, page)) +#define ClearPagePageset1Copy (page) (clear_dynpageflag(&pageset1_copy_map, page)) + +#define PagePageset2 (page) (test_dynpageflag(&pageset2_map, page)) +#define SetPagePageset2 (page) (set_dynpageflag(&pageset2_map, page)) +#define ClearPagePageset2 (page) (clear_dynpageflag(&pageset2_map, page)) + +extern void save_dyn_pageflags (dyn_pageflags_t pagemap); +extern void load_dyn_pageflags (dyn_pageflags_t pagemap); +extern void relocate_dyn_pageflags (dyn_pageflags_t *pagemap); +extern int suspend_pageflags_space_needed (void );
--
Nigel Cunningham nigel at suspend2 dot net