Hi Andrew, On Wed, Jun 1, 2022 at 2:37 PM Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > The patch titled > Subject: mm: delete unused MMF_OOM_VICTIM flag > has been added to the -mm mm-unstable branch. Its filename is > mm-delete-unused-mmf_oom_victim-flag.patch I can't find this and the accompanying patch (https://lore.kernel.org/all/20220601213748.DAF1DC385A5@xxxxxxxxxxxxxxx/ and https://lore.kernel.org/all/20220601213751.9305CC385A5@xxxxxxxxxxxxxxx/) in any tree now and can't find any notifications about them being dropped. Could you please check what happened to them? I remember there was a minor conflict with maple-tree patchset that we resolved, so maybe they are queued together? Thanks, Suren. > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-delete-unused-mmf_oom_victim-flag.patch > > This patch will later appear in the mm-unstable branch at > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > > Before you just go and hit "reply", please: > a) Consider who else should be cc'ed > b) Prefer to cc a suitable mailing list as well > c) Ideally: find the original patch on the mailing list and do a > reply-to-all to that, adding suitable additional cc's > > *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** > > The -mm tree is included into linux-next via the mm-everything > branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm > and is updated there every 2-3 working days > > ------------------------------------------------------ > From: Suren Baghdasaryan <surenb@xxxxxxxxxx> > Subject: mm: delete unused MMF_OOM_VICTIM flag > Date: Tue, 31 May 2022 15:31:00 -0700 > > With the last usage of MMF_OOM_VICTIM in exit_mmap gone, this flag is now > unused and can be removed. > > Link: https://lkml.kernel.org/r/20220531223100.510392-2-surenb@xxxxxxxxxx > Signed-off-by: Suren Baghdasaryan <surenb@xxxxxxxxxx> > Acked-by: Michal Hocko <mhocko@xxxxxxxx> > Cc: David Rientjes <rientjes@xxxxxxxxxx> > Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> > Cc: Johannes Weiner <hannes@xxxxxxxxxxx> > Cc: Roman Gushchin <guro@xxxxxx> > Cc: Minchan Kim <minchan@xxxxxxxxxx> > Cc: "Kirill A . Shutemov" <kirill@xxxxxxxxxxxxx> > Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> > Cc: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx> > Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx> > Cc: Oleg Nesterov <oleg@xxxxxxxxxx> > Cc: David Hildenbrand <david@xxxxxxxxxx> > Cc: Jann Horn <jannh@xxxxxxxxxx> > Cc: Shakeel Butt <shakeelb@xxxxxxxxxx> > Cc: Peter Xu <peterx@xxxxxxxxxx> > Cc: John Hubbard <jhubbard@xxxxxxxxxx> > Cc: Shuah Khan <shuah@xxxxxxxxxx> > Cc: Liam Howlett <liam.howlett@xxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > include/linux/oom.h | 9 --------- > include/linux/sched/coredump.h | 7 +++---- > mm/oom_kill.c | 4 +--- > 3 files changed, 4 insertions(+), 16 deletions(-) > > --- a/include/linux/oom.h~mm-delete-unused-mmf_oom_victim-flag > +++ a/include/linux/oom.h > @@ -78,15 +78,6 @@ static inline bool tsk_is_oom_victim(str > } > > /* > - * 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 > * address space which is reflected by MMF_UNSTABLE flag set in > --- a/include/linux/sched/coredump.h~mm-delete-unused-mmf_oom_victim-flag > +++ a/include/linux/sched/coredump.h > @@ -71,9 +71,8 @@ static inline int get_dumpable(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 > * 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 |\ > --- a/mm/oom_kill.c~mm-delete-unused-mmf_oom_victim-flag > +++ a/mm/oom_kill.c > @@ -765,10 +765,8 @@ static void mark_oom_victim(struct task_ > 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 > _ > > Patches currently in -mm which might be from surenb@xxxxxxxxxx are > > mm-drop-oom-code-from-exit_mmap.patch > mm-delete-unused-mmf_oom_victim-flag.patch >
