Skip to contentSkip to conversation

swsusp: low level interface (rev. 2)

PATCH In review Rafael J. Wysocki 2 participants 4 messages Jan 8, 2006

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover swsusp: low level interface (rev. 2)

Hi,

This is the second revision of the patches that prepare swsusp for the introduction of the userland interface.

Please consider for applying (Pavel, if you agree with the current version, please ack or sign off).

Greetings,
Rafael

Signature · 1 line
Beer is proof that God loves us and wants us to be happy - Benjamin Franklin
#1 lore raw

PATCH 1/2 swsusp: low level interface (rev. 2)

This patch introduces the low level interface that can be used for handling the snapshot of the system memory by the in-kernel swap-writing/reading code of swsusp and the userland interface code (to be introduced shortly).

It also changes the way in which swsusp records the allocated swap pages and, consequently, simplifies the in-kernel swap-writing/reading code (this is necessary for the userland interface too). To this end, it introduces two helper functions in mm/swapfile.c, so that the swsusp code does not refer directly to the swap internals.

 include/linux/swap.h    |    4 
 kernel/power/disk.c     |   12 
 kernel/power/power.h    |   25 +
 kernel/power/snapshot.c |  324 +++++++++++++++++++++
 kernel/power/swsusp.c   |  719 ++++++++++++++++--------------------------------
 mm/swapfile.c           |   53 +++
 6 files changed, 652 insertions(+), 485 deletions(-)
kernel/power/disk.c +4 -8
Index: linux-2.6.15-mm2/kernel/power/disk.c
===================================================================
@@ -27,9 +27,9 @@ extern suspend_disk_method_t pm_disk_mod
 
 extern int swsusp_shrink_memory(void);
 extern int swsusp_suspend(void);
-extern int swsusp_write(struct pbe *pblist, unsigned int nr_pages);
+extern int swsusp_write(void);
 extern int swsusp_check(void);
-extern int swsusp_read(struct pbe **pblist_ptr);
+extern int swsusp_read(void);
 extern void swsusp_close(void);
 extern int swsusp_resume(void);
 
@@ -71,10 +71,6 @@ static void power_down(suspend_disk_meth
 	while(1);
 }
 
-
-static int in_suspend __nosavedata = 0;
-
-
 static inline void platform_finish(void)
 {
 	if (pm_disk_mode == PM_DISK_PLATFORM) {
@@ -146,7 +142,7 @@ int pm_suspend_disk(void)
 	if (in_suspend) {
 		device_resume();
 		pr_debug("PM: writing image.\n");
-		error = swsusp_write(pagedir_nosave, nr_copy_pages);
+		error = swsusp_write();
 		if (!error)
 			power_down(pm_disk_mode);
 		else {
@@ -217,7 +213,7 @@ static int software_resume(void)
 
 	pr_debug("PM: Reading swsusp image.\n");
 
-	if ((error = swsusp_read(&pagedir_nosave))) {
+	if ((error = swsusp_read())) {
 		swsusp_free();
 		goto Thaw;
 	}
kernel/power/power.h +18 -7
Index: linux-2.6.15-mm2/kernel/power/power.h
===================================================================
@@ -54,15 +54,26 @@ extern struct pbe *pagedir_nosave;
 /* Preferred image size in MB (default 500) */
 extern unsigned int image_size;
 
+extern int in_suspend;
+
 extern asmlinkage int swsusp_arch_suspend(void);
 extern asmlinkage int swsusp_arch_resume(void);
 
 extern unsigned int count_data_pages(void);
-extern void free_pagedir(struct pbe *pblist);
-extern void release_eaten_pages(void);
-extern struct pbe *alloc_pagedir(unsigned nr_pages, gfp_t gfp_mask, int safe_needed);
 extern void swsusp_free(void);
-extern int alloc_data_pages(struct pbe *pblist, gfp_t gfp_mask, int safe_needed);
-extern unsigned int snapshot_nr_pages(void);
-extern struct pbe *snapshot_pblist(void);
-extern void snapshot_pblist_set(struct pbe *pblist);
+
+struct snapshot_handle {
+	loff_t		offset;
+	unsigned int	page;
+	unsigned int	page_offset;
+	unsigned int	prev;
+	struct pbe	*pbe;
+	void		*buffer;
+	unsigned int	buf_offset;
+};
+
+#define data_of(handle)	((handle).buffer + (handle).buf_offset)
+
+extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
+extern int snapshot_write_next(struct snapshot_handle *handle, size_t count);
+int snapshot_image_loaded(struct snapshot_handle *handle);
kernel/power/swsusp.c +254 -465

932 lines not on this page · raw message

kernel/power/snapshot.c +320 -4

373 lines not on this page · raw message

include/linux/swap.h +3 -1
Index: linux-2.6.15-mm2/include/linux/swap.h
===================================================================
@@ -216,11 +216,13 @@ extern unsigned int nr_swapfiles;
 extern struct swap_info_struct swap_info[];
 extern void si_swapinfo(struct sysinfo *);
 extern swp_entry_t get_swap_page(void);
-extern swp_entry_t get_swap_page_of_type(int type);
+extern swp_entry_t get_swap_page_of_type(int);
 extern int swap_duplicate(swp_entry_t);
 extern int valid_swaphandles(swp_entry_t, unsigned long *);
 extern void swap_free(swp_entry_t);
 extern void free_swap_and_cache(swp_entry_t);
+extern int swap_type_of(dev_t);
+extern unsigned int count_swap_pages(int, int);
 extern sector_t map_swap_page(struct swap_info_struct *, pgoff_t);
 extern struct swap_info_struct *get_swap_info_struct(unsigned);
 extern int can_share_swap_page(struct page *);
mm/swapfile.c +53 -0

59 lines not on this page · raw message

#2 lore raw

PATCH 2/2 swsusp: separate swap-writing/reading code (rev. 2)

In reply to Rafael J. Wysocki

This patch moves the swap-writing/reading code of swsusp to a separate file.

 kernel/power/Makefile |    2 
 kernel/power/power.h  |   31 ++
 kernel/power/swap.c   |  550 ++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/power/swsusp.c |  570 --------------------------------------------------
 4 files changed, 587 insertions(+), 566 deletions(-)
kernel/power/Makefile +1 -1
Index: linux-2.6.15-mm2/kernel/power/Makefile
===================================================================
@@ -5,7 +5,7 @@ endif
 
 obj-y				:= main.o process.o console.o
 obj-$(CONFIG_PM_LEGACY)		+= pm.o
-obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o disk.o snapshot.o
+obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o disk.o snapshot.o swap.o
 
 obj-$(CONFIG_SUSPEND_SMP)	+= smp.o
 
kernel/power/power.h +30 -1
Index: linux-2.6.15-mm2/kernel/power/power.h
===================================================================
@@ -53,8 +53,8 @@ extern struct pbe *pagedir_nosave;
 
 /* Preferred image size in MB (default 500) */
 extern unsigned int image_size;
-
 extern int in_suspend;
+extern dev_t swsusp_resume_device;
 
 extern asmlinkage int swsusp_arch_suspend(void);
 extern asmlinkage int swsusp_arch_resume(void);
@@ -77,3 +77,32 @@ struct snapshot_handle {
 extern int snapshot_read_next(struct snapshot_handle *handle, size_t count);
 extern int snapshot_write_next(struct snapshot_handle *handle, size_t count);
 int snapshot_image_loaded(struct snapshot_handle *handle);
+
+/**
+ *	The bitmap is used for tracing allocated swap pages
+ *
+ *	The entire bitmap consists of a number of bitmap_page
+ *	structures linked with the help of the .next member.
+ *	Thus each page can be allocated individually, so we only
+ *	need to make 0-order memory allocations to create
+ *	the bitmap.
+ */
+
+#define BITMAP_PAGE_SIZE	(PAGE_SIZE - sizeof(void *))
+#define BITMAP_PAGE_CHUNKS	(BITMAP_PAGE_SIZE / sizeof(long))
+#define BITS_PER_CHUNK		(sizeof(long) * 8)
+#define BITMAP_PAGE_BITS	(BITMAP_PAGE_CHUNKS * BITS_PER_CHUNK)
+
+struct bitmap_page {
+	unsigned long		chunks[BITMAP_PAGE_CHUNKS];
+	struct bitmap_page	*next;
+};
+
+extern void free_bitmap(struct bitmap_page *bitmap);
+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 int swsusp_shrink_memory(void);
+extern int swsusp_suspend(void);
+extern int swsusp_resume(void);
kernel/power/swap.c new file +550 -0

550 lines not on this page · raw message

kernel/power/swsusp.c +6 -564

633 lines not on this page · raw message

#3 lore raw
In reply to Rafael J. Wysocki
Quoted 7 lines · Rafael J. Wysocki

Hi,

This is the second revision of the patches that prepare swsusp for the introduction of the userland interface.

Please consider for applying (Pavel, if you agree with the current version, please ack or sign off).

ACKed and thanks.
Pavel

Signature · 1 line
Thanks, Sharp!