Skip to content

Commit

Permalink
Revert "swsusp special saveable pages support" commits
Browse files Browse the repository at this point in the history 
This reverts commits

  3e3318d [PATCH] swsusp: x86_64 mark special saveable/unsaveable pages
  b6370d9 [PATCH] swsusp: i386 mark special saveable/unsaveable pages
  ce4ab00 [PATCH] swsusp: add architecture special saveable pages support

because not only do they apparently cause page faults on x86, the
infrastructure doesn't compile on powerpc.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Linus Torvalds committed Jun 26, 2006
1 parent 5503967 commit 3448097
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 318 deletions.
106 changes: 0 additions & 106 deletions arch/i386/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
#include <linux/crash_dump.h>
#include <linux/dmi.h>
#include <linux/pfn.h>
#include <linux/suspend.h>

#include <video/edid.h>

Expand Down Expand Up @@ -1427,111 +1426,6 @@ static void set_mca_bus(int x)
static void set_mca_bus(int x) { }
#endif

#ifdef CONFIG_SOFTWARE_SUSPEND
static void __init mark_nosave_page_range(unsigned long start, unsigned long end)
{
struct page *page;
while (start <= end) {
page = pfn_to_page(start);
SetPageNosave(page);
start++;
}
}

static void __init e820_nosave_reserved_pages(void)
{
int i;
unsigned long r_start = 0, r_end = 0;

/* Assume e820 map is sorted */
for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i];
unsigned long start, end;

start = PFN_DOWN(ei->addr);
end = PFN_UP(ei->addr + ei->size);
if (start >= end)
continue;
if (ei->type == E820_RESERVED)
continue;
r_end = start;
/*
* Highmem 'Reserved' pages are marked as reserved, swsusp
* will not save/restore them, so we ignore these pages here.
*/
if (r_end > max_low_pfn)
r_end = max_low_pfn;
if (r_end > r_start)
mark_nosave_page_range(r_start, r_end-1);
if (r_end >= max_low_pfn)
break;
r_start = end;
}
}

static void __init e820_save_acpi_pages(void)
{
int i;

/* Assume e820 map is sorted */
for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i];
unsigned long start, end;

start = ei->addr;
end = ei->addr + ei->size;
if (start >= end)
continue;
if (ei->type != E820_ACPI && ei->type != E820_NVS)
continue;
/*
* If the region is below max_low_pfn, it will be
* saved/restored by swsusp follow 'RAM' type.
*/
if (start < (max_low_pfn << PAGE_SHIFT))
start = max_low_pfn << PAGE_SHIFT;
/*
* Highmem pages (ACPI NVS/Data) are reserved, but swsusp
* highmem save/restore will not save/restore them. We marked
* them as arch saveable pages here
*/
if (end > start)
swsusp_add_arch_pages(start, end);
}
}

extern char __start_rodata, __end_rodata;
/*
* BIOS reserved region/hole - no save/restore
* ACPI NVS - save/restore
* ACPI Data - this is a little tricky, the mem could be used by OS after OS
* reads tables from the region, but anyway save/restore the memory hasn't any
* side effect and Linux runtime module load/unload might use it.
* kernel rodata - no save/restore (kernel rodata isn't changed)
*/
static int __init mark_nosave_pages(void)
{
unsigned long pfn_start, pfn_end;

/* FIXME: provide a version for efi BIOS */
if (efi_enabled)
return 0;
/* BIOS reserved regions & holes */
e820_nosave_reserved_pages();

/* kernel rodata */
pfn_start = PFN_UP(virt_to_phys(&__start_rodata));
pfn_end = PFN_DOWN(virt_to_phys(&__end_rodata));
mark_nosave_page_range(pfn_start, pfn_end-1);

/* record ACPI Data/NVS as saveable */
e820_save_acpi_pages();

return 0;
}
core_initcall(mark_nosave_pages);
#endif

/*
* Determine if we were loaded by an EFI loader. If so, then we have also been
* passed the efi memmap, systab, etc., so we should use these data structures
Expand Down
95 changes: 0 additions & 95 deletions arch/x86_64/kernel/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include <linux/dmi.h>
#include <linux/dma-mapping.h>
#include <linux/ctype.h>
#include <linux/suspend.h>

#include <asm/mtrr.h>
#include <asm/uaccess.h>
Expand Down Expand Up @@ -596,100 +595,6 @@ static void discover_ebda(void)
ebda_size = 64*1024;
}

#ifdef CONFIG_SOFTWARE_SUSPEND
static void __init mark_nosave_page_range(unsigned long start, unsigned long end)
{
struct page *page;
while (start <= end) {
page = pfn_to_page(start);
SetPageNosave(page);
start++;
}
}

static void __init e820_nosave_reserved_pages(void)
{
int i;
unsigned long r_start = 0, r_end = 0;

/* Assume e820 map is sorted */
for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i];
unsigned long start, end;

start = round_down(ei->addr, PAGE_SIZE);
end = round_up(ei->addr + ei->size, PAGE_SIZE);
if (start >= end)
continue;
if (ei->type == E820_RESERVED)
continue;
r_end = start>>PAGE_SHIFT;
/* swsusp ignores invalid pfn, ignore these pages here */
if (r_end > end_pfn)
r_end = end_pfn;
if (r_end > r_start)
mark_nosave_page_range(r_start, r_end-1);
if (r_end >= end_pfn)
break;
r_start = end>>PAGE_SHIFT;
}
}

static void __init e820_save_acpi_pages(void)
{
int i;

/* Assume e820 map is sorted */
for (i = 0; i < e820.nr_map; i++) {
struct e820entry *ei = &e820.map[i];
unsigned long start, end;

start = ei->addr, PAGE_SIZE;
end = ei->addr + ei->size;
if (start >= end)
continue;
if (ei->type != E820_ACPI && ei->type != E820_NVS)
continue;
/*
* If the region is below end_pfn, it will be
* saved/restored by swsusp follow 'RAM' type.
*/
if (start < (end_pfn << PAGE_SHIFT))
start = end_pfn << PAGE_SHIFT;
if (end > start)
swsusp_add_arch_pages(start, end);
}
}

extern char __start_rodata, __end_rodata;
/*
* BIOS reserved region/hole - no save/restore
* ACPI NVS - save/restore
* ACPI Data - this is a little tricky, the mem could be used by OS after OS
* reads tables from the region, but anyway save/restore the memory hasn't any
* side effect and Linux runtime module load/unload might use it.
* kernel rodata - no save/restore (kernel rodata isn't changed)
*/
static int __init mark_nosave_pages(void)
{
unsigned long pfn_start, pfn_end;

/* BIOS reserved regions & holes */
e820_nosave_reserved_pages();

/* kernel rodata */
pfn_start = round_up(__pa_symbol(&__start_rodata), PAGE_SIZE) >> PAGE_SHIFT;
pfn_end = round_down(__pa_symbol(&__end_rodata), PAGE_SIZE) >> PAGE_SHIFT;
mark_nosave_page_range(pfn_start, pfn_end-1);

/* record ACPI Data/NVS as saveable */
e820_save_acpi_pages();

return 0;
}
core_initcall(mark_nosave_pages);
#endif

void __init setup_arch(char **cmdline_p)
{
unsigned long kernel_end;
Expand Down
1 change: 0 additions & 1 deletion include/linux/suspend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ struct saved_context;
void __save_processor_state(struct saved_context *ctxt);
void __restore_processor_state(struct saved_context *ctxt);
unsigned long get_safe_page(gfp_t gfp_mask);
int swsusp_add_arch_pages(unsigned long start, unsigned long end);

/*
* XXX: We try to keep some more pages free so that I/O operations succeed
Expand Down
4 changes: 0 additions & 4 deletions kernel/power/power.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ extern struct bitmap_page *alloc_bitmap(unsigned int nr_bits);
extern unsigned long alloc_swap_page(int swap, struct bitmap_page *bitmap);
extern void free_all_swap_pages(int swap, struct bitmap_page *bitmap);

extern unsigned int count_special_pages(void);
extern int save_special_mem(void);
extern int restore_special_mem(void);

extern int swsusp_check(void);
extern int swsusp_shrink_memory(void);
extern void swsusp_free(void);
Expand Down
112 changes: 4 additions & 108 deletions kernel/power/snapshot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,90 +39,8 @@ static unsigned int nr_copy_pages;
static unsigned int nr_meta_pages;
static unsigned long *buffer;

struct arch_saveable_page {
unsigned long start;
unsigned long end;
char *data;
struct arch_saveable_page *next;
};
static struct arch_saveable_page *arch_pages;

int swsusp_add_arch_pages(unsigned long start, unsigned long end)
{
struct arch_saveable_page *tmp;

while (start < end) {
tmp = kzalloc(sizeof(struct arch_saveable_page), GFP_KERNEL);
if (!tmp)
return -ENOMEM;
tmp->start = start;
tmp->end = ((start >> PAGE_SHIFT) + 1) << PAGE_SHIFT;
if (tmp->end > end)
tmp->end = end;
tmp->next = arch_pages;
start = tmp->end;
arch_pages = tmp;
}
return 0;
}

static unsigned int count_arch_pages(void)
{
unsigned int count = 0;
struct arch_saveable_page *tmp = arch_pages;
while (tmp) {
count++;
tmp = tmp->next;
}
return count;
}

static int save_arch_mem(void)
{
char *kaddr;
struct arch_saveable_page *tmp = arch_pages;
int offset;

pr_debug("swsusp: Saving arch specific memory");
while (tmp) {
tmp->data = (char *)__get_free_page(GFP_ATOMIC);
if (!tmp->data)
return -ENOMEM;
offset = tmp->start - (tmp->start & PAGE_MASK);
/* arch pages might haven't a 'struct page' */
kaddr = kmap_atomic_pfn(tmp->start >> PAGE_SHIFT, KM_USER0);
memcpy(tmp->data + offset, kaddr + offset,
tmp->end - tmp->start);
kunmap_atomic(kaddr, KM_USER0);

tmp = tmp->next;
}
return 0;
}

static int restore_arch_mem(void)
{
char *kaddr;
struct arch_saveable_page *tmp = arch_pages;
int offset;

while (tmp) {
if (!tmp->data)
continue;
offset = tmp->start - (tmp->start & PAGE_MASK);
kaddr = kmap_atomic_pfn(tmp->start >> PAGE_SHIFT, KM_USER0);
memcpy(kaddr + offset, tmp->data + offset,
tmp->end - tmp->start);
kunmap_atomic(kaddr, KM_USER0);
free_page((long)tmp->data);
tmp->data = NULL;
tmp = tmp->next;
}
return 0;
}

#ifdef CONFIG_HIGHMEM
static unsigned int count_highmem_pages(void)
unsigned int count_highmem_pages(void)
{
struct zone *zone;
unsigned long zone_pfn;
Expand Down Expand Up @@ -199,7 +117,7 @@ static int save_highmem_zone(struct zone *zone)
return 0;
}

static int save_highmem(void)
int save_highmem(void)
{
struct zone *zone;
int res = 0;
Expand All @@ -216,7 +134,7 @@ static int save_highmem(void)
return 0;
}

static int restore_highmem(void)
int restore_highmem(void)
{
printk("swsusp: Restoring Highmem\n");
while (highmem_copy) {
Expand All @@ -238,29 +156,6 @@ static inline int save_highmem(void) {return 0;}
static inline int restore_highmem(void) {return 0;}
#endif

unsigned int count_special_pages(void)
{
return count_arch_pages() + count_highmem_pages();
}

int save_special_mem(void)
{
int ret;
ret = save_arch_mem();
if (!ret)
ret = save_highmem();
return ret;
}

int restore_special_mem(void)
{
int ret;
ret = restore_arch_mem();
if (!ret)
ret = restore_highmem();
return ret;
}

static int pfn_is_nosave(unsigned long pfn)
{
unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT;
Expand All @@ -286,6 +181,7 @@ static int saveable(struct zone *zone, unsigned long *zone_pfn)
return 0;

page = pfn_to_page(pfn);
BUG_ON(PageReserved(page) && PageNosave(page));
if (PageNosave(page))
return 0;
if (PageReserved(page) && pfn_is_nosave(pfn))
Expand Down
Loading

0 comments on commit 3448097

Please sign in to comment.