PM / Hibernate: Default image size computation and comment fix
Subsystems (2)
cover PM / Hibernate: Default image size computation and comment fix
Hi,
The following two patches fix a comment in the hibernate memory preallocation code and make the default image size depend on the total RAM size. I regard them as 2.6.37 material.
Please let me know if there are any objections.
Thanks,
Rafael
PATCH 1/2 PM / Hibernate: Improve comments in hibernate_preallocate_memory()
From: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Improve comments in hibernate_preallocate_memory()
One comment in hibernate_preallocate_memory() is wrong, so fix it and add one more comment to clarify the meaning of the fixed one.
--- kernel/power/snapshot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/power/snapshot.c +4 -2
@@ -1318,12 +1318,14 @@ int hibernate_preallocate_memory(void)/* Compute the maximum number of saveable pages to leave in memory. */ max_size = (count - (size +PAGES_FOR_IO )) /2 -2 *SPARE_PAGES ; +/* Compute the desired number of image pages specified by image_size. */ size =DIV_ROUND_UP (image_size,PAGE_SIZE );if (size > max_size) size = max_size;/* -* If the maximum is not less than the current number of saveable pages -* in memory, allocate page frames for the image and we're done. +* If the desired number of image pages is at least as large as the +* current number of saveable pages in memory, allocate page frames for +* the image and we're done. */ if (size >= saveable) { pages =preallocate_image_highmem (save_highmem);
PATCH 1/2 PM / Hibernate: Improve comments in hibernate_preallocate_memory()
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Improve comments in hibernate_preallocate_memory()
One comment in hibernate_preallocate_memory() is wrong, so fix it and add one more comment to clarify the meaning of the fixed one.
--- kernel/power/snapshot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/power/snapshot.c +4 -2
@@ -1318,12 +1318,14 @@ int hibernate_preallocate_memory(void)/* Compute the maximum number of saveable pages to leave in memory. */ max_size = (count - (size +PAGES_FOR_IO )) /2 -2 *SPARE_PAGES ; +/* Compute the desired number of image pages specified by image_size. */ size =DIV_ROUND_UP (image_size,PAGE_SIZE );if (size > max_size) size = max_size;/* -* If the maximum is not less than the current number of saveable pages -* in memory, allocate page frames for the image and we're done. +* If the desired number of image pages is at least as large as the +* current number of saveable pages in memory, allocate page frames for +* the image and we're done. */ if (size >= saveable) { pages =preallocate_image_highmem (save_highmem);
Re: [PATCH 1/2] PM / Hibernate: Improve comments in hibernate_preallocate_memory()
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Improve comments inhibernate_preallocate_memory()One comment in
hibernate_preallocate_memory()is wrong, so fix it and add one more comment to clarify the meaning of the fixed one.Signed-off-by Rafael J. Wysocki <[email protected]>
ACK.
Quoted 31 lines
--- kernel/power/snapshot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)Index:
linux-2.6/kernel/power/snapshot.c
===================================================================kernel/power/snapshot.c +4
-3@@ -1318,12 +1318,14 @@ int hibernate_preallocate_memory(void)/* Compute the maximum number of saveable pages to leave in memory. */ max_size = (count - (size +PAGES_FOR_IO )) /2 -2 *SPARE_PAGES ; +/* Compute the desired number of image pages specified by image_size. */ size =DIV_ROUND_UP (image_size,PAGE_SIZE );if (size > max_size) size = max_size;/* -* If the maximum is not less than the current number of saveable pages -* in memory, allocate page frames for the image and we're done. +* If the desired number of image pages is at least as large as the +* current number of saveable pages in memory, allocate page frames for +* the image and we're done. */ if (size >= saveable) { pages =preallocate_image_highmem (save_highmem); --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 1/2] PM / Hibernate: Improve comments in hibernate_preallocate_memory()
In reply to Rafael J. WysockiQuoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Improve comments inhibernate_preallocate_memory()One comment in
hibernate_preallocate_memory()is wrong, so fix it and add one more comment to clarify the meaning of the fixed one.Signed-off-by Rafael J. Wysocki <[email protected]>
ACK.
Quoted 31 lines
--- kernel/power/snapshot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)Index:
linux-2.6/kernel/power/snapshot.c
===================================================================kernel/power/snapshot.c +4
-3@@ -1318,12 +1318,14 @@ int hibernate_preallocate_memory(void)/* Compute the maximum number of saveable pages to leave in memory. */ max_size = (count - (size +PAGES_FOR_IO )) /2 -2 *SPARE_PAGES ; +/* Compute the desired number of image pages specified by image_size. */ size =DIV_ROUND_UP (image_size,PAGE_SIZE );if (size > max_size) size = max_size;/* -* If the maximum is not less than the current number of saveable pages -* in memory, allocate page frames for the image and we're done. +* If the desired number of image pages is at least as large as the +* current number of saveable pages in memory, allocate page frames for +* the image and we're done. */ if (size >= saveable) { pages =preallocate_image_highmem (save_highmem); --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 2/2 PM / Hibernate: Make default image size depend on total RAM size
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Subject: 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).
--- Documentation/power/interface.txt | 2 +- kernel/power/main.c | 1 + kernel/power/power.h | 9 ++++++++- kernel/power/snapshot.c | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-)
kernel/power/snapshot.c +6 -1
@@ -46,7 +46,12 @@ static void swsusp_unset_page_forbidden(* 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
kernel/power/power.h +8 -1
@@ -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(sextern 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/main.c +1 -0
@@ -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 ;
Documentation/power/interface.txt +1 -1
@@ -57,7 +57,7 @@ smallest image possible. In particular, 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
Re: [PATCH 2/2] PM / Hibernate: Make default image size depend on total RAM size
Hi!
Quoted 8 lines
From: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Make default image size depend on total RAM sizeThe 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).
I do not think I agree here.
Making limit say 1GB may be good idea, but by making it 2/5 of RAM you essentialy make it useless -- 40% RAM is very similar to 50% RAM.
I have box with lot of memory and old distro -- it mostly uses RAM for cache. Now you have made my suspend/resume 6 times slower... And when I add more memory to the machine, it will slow down even further.
Pavel
Quoted 83 lines
--- Documentation/power/interface.txt | 2 +- kernel/power/main.c | 1 + kernel/power/power.h | 9 ++++++++- kernel/power/snapshot.c | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-)Index:
linux-2.6/kernel/power/snapshot.c
===================================================================kernel/power/snapshot.c +6
-1@@ -46,7 +46,12 @@ static void swsusp_unset_page_forbidden(* 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 Index:
linux-2.6/kernel/power/power.h
===================================================================kernel/power/power.h +8
-1@@ -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(sextern 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 );Index:
linux-2.6/kernel/power/main.c
===================================================================kernel/power/main.c +1
-0@@ -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 ;Index:
linux-2.6/Documentation/power/interface.txt
===================================================================Documentation/power/interface.txt +1
-2@@ -57,7 +57,7 @@ smallest image possible. In particular, 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 --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH 2/2] PM / Hibernate: Make default image size depend on total RAM size
In reply to Rafael J. WysockiHi!
Quoted 8 lines
From: Rafael J. Wysocki <[email protected]>
Subject: PM / Hibernate: Make default image size depend on total RAM sizeThe 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).
I do not think I agree here.
Making limit say 1GB may be good idea, but by making it 2/5 of RAM you essentialy make it useless -- 40% RAM is very similar to 50% RAM.
I have box with lot of memory and old distro -- it mostly uses RAM for cache. Now you have made my suspend/resume 6 times slower... And when I add more memory to the machine, it will slow down even further.
Pavel
Quoted 83 lines
--- Documentation/power/interface.txt | 2 +- kernel/power/main.c | 1 + kernel/power/power.h | 9 ++++++++- kernel/power/snapshot.c | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-)Index:
linux-2.6/kernel/power/snapshot.c
===================================================================kernel/power/snapshot.c +6
-1@@ -46,7 +46,12 @@ static void swsusp_unset_page_forbidden(* 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 Index:
linux-2.6/kernel/power/power.h
===================================================================kernel/power/power.h +8
-1@@ -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(sextern 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 );Index:
linux-2.6/kernel/power/main.c
===================================================================kernel/power/main.c +1
-0@@ -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 ;Index:
linux-2.6/Documentation/power/interface.txt
===================================================================Documentation/power/interface.txt +1
-2@@ -57,7 +57,7 @@ smallest image possible. In particular, 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 --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 7 lines · Rafael J. Wysocki
Hi,
The following two patches fix a comment in the hibernate memory preallocation code and make the default image size depend on the total RAM size. I regard them as 2.6.37 material.
Please let me know if there are any objections.
OK, no response means no objections to me. :-)
I'm putting the two patches in this series into suspend-2.6/linux-next.
Thanks,
Rafael
Quoted 7 lines · Rafael J. Wysocki
Hi,
The following two patches fix a comment in the hibernate memory preallocation code and make the default image size depend on the total RAM size. I regard them as 2.6.37 material.
Please let me know if there are any objections.
OK, no response means no objections to me. :-)
I'm putting the two patches in this series into suspend-2.6/linux-next.
Thanks,
Rafael