* [PATCH] mm: zap ZONE_OOM_LOCKED
@ 2016-05-27 14:08 Vladimir Davydov
2016-05-27 14:13 ` Michal Hocko
2016-05-27 17:20 ` Johannes Weiner
0 siblings, 2 replies; 3+ messages in thread
From: Vladimir Davydov @ 2016-05-27 14:08 UTC (permalink / raw)
To: Andrew Morton; +Cc: Michal Hocko, Tetsuo Handa, linux-mm, linux-kernel
Not used since oom_lock was instroduced.
Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
---
include/linux/mmzone.h | 1 -
mm/oom_kill.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 02069c23486d..3388ccbab7d6 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -524,7 +524,6 @@ struct zone {
enum zone_flags {
ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */
- ZONE_OOM_LOCKED, /* zone is in OOM killer zonelist */
ZONE_CONGESTED, /* zone has many dirty pages backed by
* a congested BDI
*/
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 1685890d424e..b95c4c101b35 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -997,8 +997,8 @@ bool out_of_memory(struct oom_control *oc)
/*
* The pagefault handler calls here because it is out of memory, so kill a
- * memory-hogging task. If any populated zone has ZONE_OOM_LOCKED set, a
- * parallel oom killing is already in progress so do nothing.
+ * memory-hogging task. If oom_lock is held by somebody else, a parallel oom
+ * killing is already in progress so do nothing.
*/
void pagefault_out_of_memory(void)
{
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: zap ZONE_OOM_LOCKED
2016-05-27 14:08 [PATCH] mm: zap ZONE_OOM_LOCKED Vladimir Davydov
@ 2016-05-27 14:13 ` Michal Hocko
2016-05-27 17:20 ` Johannes Weiner
1 sibling, 0 replies; 3+ messages in thread
From: Michal Hocko @ 2016-05-27 14:13 UTC (permalink / raw)
To: Vladimir Davydov; +Cc: Andrew Morton, Tetsuo Handa, linux-mm, linux-kernel
On Fri 27-05-16 17:08:13, Vladimir Davydov wrote:
> Not used since oom_lock was instroduced.
>
> Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> include/linux/mmzone.h | 1 -
> mm/oom_kill.c | 4 ++--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> index 02069c23486d..3388ccbab7d6 100644
> --- a/include/linux/mmzone.h
> +++ b/include/linux/mmzone.h
> @@ -524,7 +524,6 @@ struct zone {
>
> enum zone_flags {
> ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */
> - ZONE_OOM_LOCKED, /* zone is in OOM killer zonelist */
> ZONE_CONGESTED, /* zone has many dirty pages backed by
> * a congested BDI
> */
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index 1685890d424e..b95c4c101b35 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -997,8 +997,8 @@ bool out_of_memory(struct oom_control *oc)
>
> /*
> * The pagefault handler calls here because it is out of memory, so kill a
> - * memory-hogging task. If any populated zone has ZONE_OOM_LOCKED set, a
> - * parallel oom killing is already in progress so do nothing.
> + * memory-hogging task. If oom_lock is held by somebody else, a parallel oom
> + * killing is already in progress so do nothing.
> */
> void pagefault_out_of_memory(void)
> {
> --
> 2.1.4
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: zap ZONE_OOM_LOCKED
2016-05-27 14:08 [PATCH] mm: zap ZONE_OOM_LOCKED Vladimir Davydov
2016-05-27 14:13 ` Michal Hocko
@ 2016-05-27 17:20 ` Johannes Weiner
1 sibling, 0 replies; 3+ messages in thread
From: Johannes Weiner @ 2016-05-27 17:20 UTC (permalink / raw)
To: Vladimir Davydov
Cc: Andrew Morton, Michal Hocko, Tetsuo Handa, linux-mm, linux-kernel
On Fri, May 27, 2016 at 05:08:13PM +0300, Vladimir Davydov wrote:
> Not used since oom_lock was instroduced.
>
> Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-27 17:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-27 14:08 [PATCH] mm: zap ZONE_OOM_LOCKED Vladimir Davydov
2016-05-27 14:13 ` Michal Hocko
2016-05-27 17:20 ` Johannes Weiner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).