KOSAKI Motohiro 0753ba01e1 mm: revert "oom: move oom_adj value" ... The commit 2ff05b2b (oom: move oom_adj value) moveed the oom_adj value to the mm_struct. It was a very good first step for sanitize OOM. However Paul Menage reported the commit makes regression to his job scheduler. Current OOM logic can kill OOM_DISABLED process. Why? His program has the code of similar to the following. ... set_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */ ... if (vfork() == 0) { set_oom_adj(0); /* Invoked child can be killed */ execve("foo-bar-cmd"); } .... vfork() parent and child are shared the same mm_struct. then above set_oom_adj(0) doesn't only change oom_adj for vfork() child, it's also change oom_adj for vfork() parent. Then, vfork() parent (job scheduler) lost OOM immune and it was killed. Actually, fork-setting-exec idiom is very frequently used in userland program. We must not break this assumption. Then, this patch revert commit 2ff05b2b and related commit. Reverted commit list --------------------- - commit 2ff05b2b4e (oom: move oom_adj value from task_struct to mm_struct) - commit 4d8b9135c3 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE) - commit 8123681022 (oom: only oom kill exiting tasks with attached memory) - commit 933b787b57 (mm: copy over oom_adj value at fork time) Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Paul Menage <menage@google.com> Cc: David Rientjes <rientjes@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Rik van Riel <riel@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-08-18 16:31:13 -07:00
..
ABI	block: Update topology documentation	2009-08-01 10:24:35 +02:00
accounting	Documentation/accounting/getdelays.c intialize the variable before using it	2009-06-16 19:47:51 -07:00
acpi
aoe
arm	ARM: 5624/1: Document cache aliasing region	2009-07-30 10:44:14 +01:00
auxdisplay
blackfin
block	Trivial typo fixes in Documentation/block/data-integrity.txt.	2009-07-01 10:56:25 +02:00
blockdev	mflash: initial support	2009-04-07 08:12:38 +02:00
cdrom	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
cgroups	cpusets: document adding/removing cpus to cpuset elaborately	2009-06-30 18:56:01 -07:00
connector	connector: maintainer/mail update.	2009-07-21 12:43:51 -07:00
console
cpu-freq	[CPUFREQ] minor correction to cpu-freq documentation	2009-06-15 11:49:42 -04:00
cpuidle
cris
crypto
development-process	docs: Encourage better changelogs in the development process document	2009-06-04 10:32:49 -06:00
device-mapper	dm raid1: add userspace log	2009-06-22 10:12:35 +01:00
DocBook	docbook: fix printk of ip address	2009-07-30 13:10:50 -07:00
driver-model	driver model: fix show/store prototypes in doc.	2009-07-12 13:02:10 -07:00
dvb	V4L/DVB (12206): get_dvb_firmware: Correct errors in MPC718 firmware extraction logic	2009-07-05 19:21:49 -03:00
early-userspace
fault-injection	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
fb	Documentation/fb/vesafb.txt: fix typo	2009-06-16 19:47:58 -07:00
filesystems	mm: revert "oom: move oom_adj value"	2009-08-18 16:31:13 -07:00
firmware_class	driver core: fix documentation of request_firmware_nowait	2009-06-15 21:30:24 -07:00
frv
hwmon	hwmon: (f71882fg) Add support for the F71858F	2009-06-15 18:39:52 +02:00
i2c	i2c: Add a sysfs interface to instantiate devices	2009-06-19 16:58:20 +02:00
i2o
ia64	trivial: Fix misspelling of firmware	2009-03-30 15:21:59 +02:00
ide	ide: preserve Host Protected Area by default (v2)	2009-06-07 13:52:52 +02:00
infiniband	IPoIB: Document newish features	2009-04-08 13:52:01 -07:00
input	Merge commit 'v2.6.30' into next	2009-06-11 01:58:01 -07:00
ioctl	documentation: register ioctl entry of nilfs2	2009-08-10 08:30:11 -07:00
isdn	isdn: clean up documentation index	2009-06-20 01:10:38 -07:00
ja_JP	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
kbuild	kconfig: resort the documentation of the environment variables	2009-06-09 22:37:47 +02:00
kdump	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
ko_KR
laptops	thinkpad-acpi: remove dock and bay subdrivers	2009-08-01 23:46:58 -04:00
lguest	lguest and virtio: cleanup struct definitions to Linux style.	2009-07-30 16:03:46 +09:30
m68k
make
mips
misc-devices	drivers/misc/isl29003.c: driver for the ISL29003 ambient light sensor	2009-04-01 08:59:18 -07:00
mn10300	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
mtd	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
namespaces
netlabel
networking	Update Andreas Koensgen's email address	2009-07-17 10:07:12 -07:00
parisc
PCI	PCI AER: software error injection	2009-06-16 14:30:14 -07:00
pcmcia
power	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
powerpc	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-06-28 11:02:32 -07:00
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
prctl
RCU	netfilter: nf_conntrack: nf_conntrack_alloc() fixes	2009-07-16 14:03:40 +02:00
s390	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
scheduler	sched: Documentation/sched-rt-group: Fix style issues & bump version	2009-06-21 13:12:46 +02:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-06-17 09:50:44 -07:00
serial
sh
sound	ALSA: pcm - Add logging of hwptr updates and interrupt updates	2009-07-23 11:09:03 +02:00
sparc
spi	spi: new spi->mode bits	2009-06-30 18:56:00 -07:00
sysctl	vmscan: properly account for the number of page cache pages zone_reclaim() can reclaim	2009-06-16 19:47:45 -07:00
telephony
thermal
timers	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
trace	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
uml
usb	trivial: usb: fix missing space typo in doc	2009-06-12 18:01:51 +02:00
video4linux	V4L/DVB (12402): em28xx: fix: some em2710 chips use a different vendor ID	2009-08-13 20:39:08 -03:00
vm	Documentation/vm/Makefile: don't try to build slqbinfo	2009-06-17 09:45:46 -07:00
w1
watchdog	[WATCHDOG] hpwdt: Add NMI priority option	2009-06-23 07:13:45 +00:00
wimax
x86	Doc: move Documentation/exception.txt into x86 subdir	2009-07-10 19:10:32 -07:00
zh_CN
00-INDEX	trivial: fix where cgroup documentation is not correctly referred to	2009-03-30 15:22:02 +02:00
applying-patches.txt
atomic_ops.txt	Documentation/atomic_ops.txt: fix sample code	2009-06-16 19:47:52 -07:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
bt8xxgpio.txt
BUG-HUNTING
c2port.txt
cachetlb.txt
Changes	Documentation/Changes: perl is needed to build the kernel	2009-06-18 13:03:46 -07:00
CodingStyle	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt	trivial: Documentation/dell_rbu.txt: fix typos	2009-06-12 18:01:50 +02:00
devices.txt	lanana: assign a device name and numbering for MAX3100	2009-04-07 08:44:05 -07:00
DMA-API.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt	dma-mapping: update the old macro DMA_nBIT_MASK related documentations	2009-04-07 08:31:12 -07:00
dmaengine.txt
dontdiff	dontdiff: Fix asm exclude	2009-03-26 15:45:43 -07:00
dynamic-debug-howto.txt	Dynamic debug: allow simple quoting of words	2009-03-24 16:38:27 -07:00
edac.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	[CPUFREQ] Mark policy_rwsem as going static in cpufreq.c wont be exported	2009-07-06 21:38:28 -04:00
futex-requeue-pi.txt	futex: add requeue-pi documentation	2009-05-09 07:12:50 +02:00
gcov.txt	gcov: fix documentation	2009-06-30 18:55:59 -07:00
gpio.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
Intel-IOMMU.txt
io-mapping.txt
IO-mapping.txt
io_ordering.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	kernel-doc: restrict syntax for private: and public:	2009-05-02 15:36:10 -07:00
kernel-docs.txt
kernel-parameters.txt	Documentation/kernel-parameters.txt: document libata's ignore_hpa option	2009-08-12 06:21:08 -04:00
keys-request-key.txt
keys.txt
kmemcheck.txt	kmemcheck: add the kmemcheck documentation	2009-06-13 14:27:20 +02:00
kmemleak.txt	kmemleak: Do not trigger a scan when reading the debug/kmemleak file	2009-06-26 17:38:27 +01:00
kobject.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
kprobes.txt	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt	leds: LED driver for National Semiconductor LP3944 Funlight Chip	2009-06-23 20:21:38 +01:00
local_ops.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
lockdep-design.txt	lockdep: Fix typos in documentation	2009-08-07 12:03:46 +02:00
lockstat.txt
logo.gif	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
logo.txt	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
magic-number.txt
Makefile
ManagementStyle
markers.txt
mca.txt
md.txt	Documentation/md.txt update	2009-03-31 15:18:37 +11:00
memory-barriers.txt	sched: Document memory barriers implied by sleep/wake-up primitives	2009-04-29 14:15:55 +02:00
memory-hotplug.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt	trivial: rbtree.txt: fix rb_entry() parameters in sample code	2009-06-12 18:01:47 +02:00
rfkill.txt	rfkill: export persistent attribute in sysfs	2009-06-19 11:50:18 -04:00
robust-futex-ABI.txt	futex: documentation: fix inconsistent description of futex list_op_pending	2009-06-18 13:03:56 -07:00
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt	Document the slow work thread pool	2009-04-03 16:42:35 +01:00
SM501.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
Smack.txt	smack: implement logging V3	2009-04-14 09:00:23 +10:00
sparse.txt	Documentation: explain the difference between __bitwise and __bitwise__	2009-04-11 08:18:11 +02:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
SubmittingDrivers
SubmittingPatches	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
svga.txt
sysfs-rules.txt	Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense	2009-05-08 19:22:20 -07:00
sysrq.txt	sysrq, kdump: make sysrq-c consistent	2009-07-29 19:10:36 -07:00
tomoyo.txt	tomoyo: add Documentation/tomoyo.txt	2009-04-14 09:14:58 +10:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt