diff options
| author | David Rientjes <rientjes@google.com> | 2012-12-11 19:02:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 20:22:27 -0500 |
| commit | e1e12d2f3104be886073ac6c5c4678f30b1b9e51 (patch) | |
| tree | b08cba1dba28e18cf7c2ffd8d076ce744e368b5f /include/linux | |
| parent | a9c58b907dbc6821533dfc295b63caf111ff1f16 (diff) | |
mm, oom: fix race when specifying a thread as the oom origin
test_set_oom_score_adj() and compare_swap_oom_score_adj() are used to
specify that current should be killed first if an oom condition occurs in
between the two calls.
The usage is
short oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
...
compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);
to store the thread's oom_score_adj, temporarily change it to the maximum
score possible, and then restore the old value if it is still the same.
This happens to still be racy, however, if the user writes
OOM_SCORE_ADJ_MAX to /proc/pid/oom_score_adj in between the two calls.
The compare_swap_oom_score_adj() will then incorrectly reset the old value
prior to the write of OOM_SCORE_ADJ_MAX.
To fix this, introduce a new oom_flags_t member in struct signal_struct
that will be used for per-thread oom killer flags. KSM and swapoff can
now use a bit in this member to specify that threads should be killed
first in oom conditions without playing around with oom_score_adj.
This also allows the correct oom_score_adj to always be shown when reading
/proc/pid/oom_score.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/oom.h | 19 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | include/linux/types.h | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index 922dab164eb0..da60007075b5 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h | |||
| @@ -29,8 +29,23 @@ enum oom_scan_t { | |||
| 29 | OOM_SCAN_SELECT, /* always select this thread first */ | 29 | OOM_SCAN_SELECT, /* always select this thread first */ |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | extern void compare_swap_oom_score_adj(short old_val, short new_val); | 32 | /* Thread is the potential origin of an oom condition; kill first on oom */ |
| 33 | extern short test_set_oom_score_adj(short new_val); | 33 | #define OOM_FLAG_ORIGIN ((__force oom_flags_t)0x1) |
| 34 | |||
| 35 | static inline void set_current_oom_origin(void) | ||
| 36 | { | ||
| 37 | current->signal->oom_flags |= OOM_FLAG_ORIGIN; | ||
| 38 | } | ||
| 39 | |||
| 40 | static inline void clear_current_oom_origin(void) | ||
| 41 | { | ||
| 42 | current->signal->oom_flags &= ~OOM_FLAG_ORIGIN; | ||
| 43 | } | ||
| 44 | |||
| 45 | static inline bool oom_task_origin(const struct task_struct *p) | ||
| 46 | { | ||
| 47 | return !!(p->signal->oom_flags & OOM_FLAG_ORIGIN); | ||
| 48 | } | ||
| 34 | 49 | ||
| 35 | extern unsigned long oom_badness(struct task_struct *p, | 50 | extern unsigned long oom_badness(struct task_struct *p, |
| 36 | struct mem_cgroup *memcg, const nodemask_t *nodemask, | 51 | struct mem_cgroup *memcg, const nodemask_t *nodemask, |
diff --git a/include/linux/sched.h b/include/linux/sched.h index ed30456152da..3e387df065fc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -631,6 +631,7 @@ struct signal_struct { | |||
| 631 | struct rw_semaphore group_rwsem; | 631 | struct rw_semaphore group_rwsem; |
| 632 | #endif | 632 | #endif |
| 633 | 633 | ||
| 634 | oom_flags_t oom_flags; | ||
| 634 | short oom_score_adj; /* OOM kill score adjustment */ | 635 | short oom_score_adj; /* OOM kill score adjustment */ |
| 635 | short oom_score_adj_min; /* OOM kill score adjustment min value. | 636 | short oom_score_adj_min; /* OOM kill score adjustment min value. |
| 636 | * Only settable by CAP_SYS_RESOURCE. */ | 637 | * Only settable by CAP_SYS_RESOURCE. */ |
diff --git a/include/linux/types.h b/include/linux/types.h index 1cc0e4b9a048..4d118ba11349 100644 --- a/include/linux/types.h +++ b/include/linux/types.h | |||
| @@ -156,6 +156,7 @@ typedef u32 dma_addr_t; | |||
| 156 | #endif | 156 | #endif |
| 157 | typedef unsigned __bitwise__ gfp_t; | 157 | typedef unsigned __bitwise__ gfp_t; |
| 158 | typedef unsigned __bitwise__ fmode_t; | 158 | typedef unsigned __bitwise__ fmode_t; |
| 159 | typedef unsigned __bitwise__ oom_flags_t; | ||
| 159 | 160 | ||
| 160 | #ifdef CONFIG_PHYS_ADDR_T_64BIT | 161 | #ifdef CONFIG_PHYS_ADDR_T_64BIT |
| 161 | typedef u64 phys_addr_t; | 162 | typedef u64 phys_addr_t; |