Revision d1908362ae0b97374eb8328fbb471576332f9fb1 authored by Minchan Kim on 22 September 2010, 20:05:01 UTC, committed by Linus Torvalds on 23 September 2010, 00:22:39 UTC
M. Vefa Bicakci reported 2.6.35 kernel hang up when hibernation on his 32bit 3GB mem machine. (https://bugzilla.kernel.org/show_bug.cgi?id=16771). Also he bisected the regression to commit bb21c7ce18eff8e6e7877ca1d06c6db719376e3c Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Date: Fri Jun 4 14:15:05 2010 -0700 vmscan: fix do_try_to_free_pages() return value when priority==0 reclaim failure At first impression, this seemed very strange because the above commit only chenged function return value and hibernate_preallocate_memory() ignore return value of shrink_all_memory(). But it's related. Now, page allocation from hibernation code may enter infinite loop if the system has highmem. The reasons are that vmscan don't care enough OOM case when oom_killer_disabled. The problem sequence is following as. 1. hibernation 2. oom_disable 3. alloc_pages 4. do_try_to_free_pages if (scanning_global_lru(sc) && !all_unreclaimable) return 1; If kswapd is not freozen, it would set zone->all_unreclaimable to 1 and then shrink_zones maybe return true(ie, all_unreclaimable is true). So at last, alloc_pages could go to _nopage_. If it is, it should have no problem. This patch adds all_unreclaimable check to protect in direct reclaim path, too. It can care of hibernation OOM case and help bailout all_unreclaimable case slightly. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Minchan Kim <minchan.kim@gmail.com> Reported-by: M. Vefa Bicakci <bicave@superonline.com> Reported-by: <caiqian@redhat.com> Reviewed-by: Johannes Weiner <hannes@cmpxchg.org> Tested-by: <caiqian@redhat.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Rik van Riel <riel@redhat.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent eba93fc
File | Mode | Size |
---|---|---|
.gitignore | -rw-r--r-- | 8 bytes |
Kconfig | -rw-r--r-- | 4.1 KB |
Makefile | -rw-r--r-- | 851 bytes |
chan.c | -rw-r--r-- | 1.8 KB |
core.c | -rw-r--r-- | 23.0 KB |
core.h | -rw-r--r-- | 12.9 KB |
db.txt | -rw-r--r-- | 759 bytes |
debugfs.c | -rw-r--r-- | 3.1 KB |
debugfs.h | -rw-r--r-- | 300 bytes |
ethtool.c | -rw-r--r-- | 1.1 KB |
ethtool.h | -rw-r--r-- | 148 bytes |
genregdb.awk | -rw-r--r-- | 2.9 KB |
ibss.c | -rw-r--r-- | 11.4 KB |
lib80211.c | -rw-r--r-- | 6.9 KB |
lib80211_crypt_ccmp.c | -rw-r--r-- | 11.9 KB |
lib80211_crypt_tkip.c | -rw-r--r-- | 21.0 KB |
lib80211_crypt_wep.c | -rw-r--r-- | 7.3 KB |
mlme.c | -rw-r--r-- | 24.6 KB |
nl80211.c | -rw-r--r-- | 142.5 KB |
nl80211.h | -rw-r--r-- | 3.7 KB |
radiotap.c | -rw-r--r-- | 11.1 KB |
reg.c | -rw-r--r-- | 53.0 KB |
reg.h | -rw-r--r-- | 3.4 KB |
regdb.h | -rw-r--r-- | 148 bytes |
scan.c | -rw-r--r-- | 27.7 KB |
sme.c | -rw-r--r-- | 25.8 KB |
sysfs.c | -rw-r--r-- | 2.9 KB |
sysfs.h | -rw-r--r-- | 197 bytes |
util.c | -rw-r--r-- | 21.4 KB |
wext-compat.c | -rw-r--r-- | 38.5 KB |
wext-compat.h | -rw-r--r-- | 1.9 KB |
wext-core.c | -rw-r--r-- | 28.9 KB |
wext-priv.c | -rw-r--r-- | 6.9 KB |
wext-proc.c | -rw-r--r-- | 4.0 KB |
wext-sme.c | -rw-r--r-- | 9.1 KB |
wext-spy.c | -rw-r--r-- | 6.5 KB |
Computing file changes ...