]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
PM / Hibernate: Avoid hitting OOM during preallocation of memory
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 11 Sep 2010 18:58:27 +0000 (20:58 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 13 Jul 2011 03:29:26 +0000 (05:29 +0200)
commit7af74e7852333102fb02dd17d37aabf4d5f1220b
tree4bfb84b0ca1a522b9fa85c33004a905947ea3c00
parentea573723636c6e7ede7cc876046a7027a02bcf2c
PM / Hibernate: Avoid hitting OOM during preallocation of memory

commit 6715045ddc7472a22be5e49d4047d2d89b391f45 upstream.

There is a problem in hibernate_preallocate_memory() that it calls
preallocate_image_memory() with an argument that may be greater than
the total number of available non-highmem memory pages.  If that's
the case, the OOM condition is guaranteed to trigger, which in turn
can cause significant slowdown to occur during hibernation.

To avoid that, make preallocate_image_memory() adjust its argument
before calling preallocate_image_pages(), so that the total number of
saveable non-highem pages left is not less than the minimum size of
a hibernation image.  Change hibernate_preallocate_memory() to try to
allocate from highmem if the number of pages allocated by
preallocate_image_memory() is too low.

Modify free_unnecessary_pages() to take all possible memory
allocation patterns into account.

Reported-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Tested-by: M. Vefa Bicakci <bicave@superonline.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kernel/power/snapshot.c