diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 17 | ||||
| -rw-r--r-- | mm/page_alloc.c | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 597ecac5731a..cb1f046faa68 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -435,6 +435,23 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, dump_tasks(memcg, nodemask); } +/* + * Number of OOM killer invocations (including memcg OOM killer). + * Primarily used by PM freezer to check for potential races with + * OOM killed frozen task. + */ +static atomic_t oom_kills = ATOMIC_INIT(0); + +int oom_kills_count(void) +{ + return atomic_read(&oom_kills); +} + +void note_oom_kill(void) +{ + atomic_inc(&oom_kills); +} + #define K(x) ((x) << (PAGE_SHIFT-10)) static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, unsigned int points, unsigned long totalpages, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ff0b0997b953..2891a9059f8a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1982,6 +1982,14 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, } /* + * PM-freezer should be notified that there might be an OOM killer on + * its way to kill and wake somebody up. This is too early and we might + * end up not killing anything but false positives are acceptable. + * See freeze_processes. + */ + note_oom_kill(); + + /* * Go through the zonelist yet one more time, keep very high watermark * here, this is only to catch a parallel oom killing, we must fail if * we're still under heavy pressure. |