Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac5c24ec authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / Hibernate: Make default image size depend on total RAM size 



The default hibernation image size is currently hard coded and euqal
to 500 MB, which is not a reasonable default on many contemporary
systems.  Make it equal 2/5 of the total RAM size (this is slightly
below the maximum, i.e. 1/2 of the total RAM size, and seems to be
generally suitable).

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Tested-by: default avatarM. Vefa Bicakci <bicave@superonline.com>
parent 266f1a25

Documentation/power/interface.txt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ smallest image possible. In particular, if "0" is written to this file, the 
suspend image will be as small as possible.



Reading from this file will display the current image size limit, which

is set to 500 MB by default.

is set to 2/5 of available RAM by default.



/sys/power/pm_trace controls the code which saves the last PM event point in

the RTC across reboots, so that you can debug a machine that just hangs

kernel/power/main.c

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ static int __init pm_init(void) 
	int error = pm_start_workqueue();

	if (error)

		return error;

	hibernate_image_size_init();

	power_kobj = kobject_create_and_add("power", NULL);

	if (!power_kobj)

		return -ENOMEM;

kernel/power/power.h

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ struct swsusp_info { 
} __attribute__((aligned(PAGE_SIZE)));



#ifdef CONFIG_HIBERNATION

/* kernel/power/snapshot.c */

extern void __init hibernate_image_size_init(void);



#ifdef CONFIG_ARCH_HIBERNATION_HEADER

/* Maximum size of architecture specific data in a hibernation header */

#define MAX_ARCH_HEADER_SIZE	(sizeof(struct new_utsname) + 4)
@@ -49,7 +52,11 @@ static inline char *check_image_kernel(struct swsusp_info *info) 
extern int hibernation_snapshot(int platform_mode);

extern int hibernation_restore(int platform_mode);

extern int hibernation_platform_enter(void);

#endif



#else /* !CONFIG_HIBERNATION */



static inline void hibernate_image_size_init(void) {}

#endif /* !CONFIG_HIBERNATION */



extern int pfn_is_nosave(unsigned long);

kernel/power/snapshot.c

+6 −1
Original line number Diff line number Diff line
@@ -46,7 +46,12 @@ static void swsusp_unset_page_forbidden(struct page *); 
 * size will not exceed N bytes, but if that is impossible, it will

 * try to create the smallest image possible.

 */

unsigned long image_size = 500 * 1024 * 1024;

unsigned long image_size;



void __init hibernate_image_size_init(void)

{

	image_size = ((totalram_pages * 2) / 5) * PAGE_SIZE;

}



/* List of PBEs needed for restoring the pages that were allocated before

 * the suspend and included in the suspend image, but have also been