Commit b3541d91 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Andrew Morton
Browse files

mm: delete unused MMF_OOM_VICTIM flag 

With the last usage of MMF_OOM_VICTIM in exit_mmap gone, this flag is now
unused and can be removed.

[akpm@linux-foundation.org: remove comment about now-removed mm_is_oom_victim()]
Link: https://lkml.kernel.org/r/20220531223100.510392-2-surenb@google.com


Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: "Kirill A . Shutemov" <kirill@shutemov.name>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Christian Brauner (Microsoft) <brauner@kernel.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bf3980c8

include/linux/oom.h

+0 −9
Original line number Diff line number Diff line
@@ -77,15 +77,6 @@ static inline bool tsk_is_oom_victim(struct task_struct * tsk) 
	return tsk->signal->oom_mm;

}



/*

 * Use this helper if tsk->mm != mm and the victim mm needs a special

 * handling. This is guaranteed to stay true after once set.

 */

static inline bool mm_is_oom_victim(struct mm_struct *mm)

{

	return test_bit(MMF_OOM_VICTIM, &mm->flags);

}



/*

 * Checks whether a page fault on the given mm is still reliable.

 * This is no longer true if the oom reaper started to reap the

include/linux/sched/coredump.h

+3 −4
Original line number Diff line number Diff line
@@ -71,9 +71,8 @@ static inline int get_dumpable(struct mm_struct *mm) 
#define MMF_UNSTABLE		22	/* mm is unstable for copy_from_user */

#define MMF_HUGE_ZERO_PAGE	23      /* mm has ever used the global huge zero page */

#define MMF_DISABLE_THP		24	/* disable THP for all VMAs */

#define MMF_OOM_VICTIM		25	/* mm is the oom victim */

#define MMF_OOM_REAP_QUEUED	26	/* mm was queued for oom_reaper */

#define MMF_MULTIPROCESS	27	/* mm is shared between processes */

#define MMF_OOM_REAP_QUEUED	25	/* mm was queued for oom_reaper */

#define MMF_MULTIPROCESS	26	/* mm is shared between processes */

/*

 * MMF_HAS_PINNED: Whether this mm has pinned any pages.  This can be either

 * replaced in the future by mm.pinned_vm when it becomes stable, or grow into
@@ -81,7 +80,7 @@ static inline int get_dumpable(struct mm_struct *mm) 
 * pinned pages were unpinned later on, we'll still keep this bit set for the

 * lifecycle of this mm, just for simplicity.

 */

#define MMF_HAS_PINNED		28	/* FOLL_PIN has run, never cleared */

#define MMF_HAS_PINNED		27	/* FOLL_PIN has run, never cleared */

#define MMF_DISABLE_THP_MASK	(1 << MMF_DISABLE_THP)



#define MMF_INIT_MASK		(MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\

mm/mmap.c

+1 −2
Original line number Diff line number Diff line
@@ -3105,8 +3105,7 @@ void exit_mmap(struct mm_struct *mm) 


	/*

	 * Set MMF_OOM_SKIP to hide this task from the oom killer/reaper

	 * because the memory has been already freed. Do not bother checking

	 * mm_is_oom_victim because setting a bit unconditionally is cheaper.

	 * because the memory has been already freed.

	 */

	set_bit(MMF_OOM_SKIP, &mm->flags);

	mmap_write_lock(mm);

mm/oom_kill.c

+1 −3
Original line number Diff line number Diff line
@@ -765,10 +765,8 @@ static void mark_oom_victim(struct task_struct *tsk) 
		return;



	/* oom_mm is bound to the signal struct life time. */

	if (!cmpxchg(&tsk->signal->oom_mm, NULL, mm)) {

	if (!cmpxchg(&tsk->signal->oom_mm, NULL, mm))

		mmgrab(tsk->signal->oom_mm);

		set_bit(MMF_OOM_VICTIM, &mm->flags);

	}



	/*

	 * Make sure that the task is woken up from uninterruptible sleep