From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 398B8C433EF for ; Thu, 19 May 2022 17:34:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242706AbiESRed (ORCPT ); Thu, 19 May 2022 13:34:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241532AbiESReR (ORCPT ); Thu, 19 May 2022 13:34:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A77E5EE3D for ; Thu, 19 May 2022 10:34:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4F2AEB8277E for ; Thu, 19 May 2022 17:34:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2B5FC34113; Thu, 19 May 2022 17:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652981652; bh=62F7XzRiVXfF1lkQEGYZWZq/KvXVJquBP1SMQBNsCEk=; h=Date:To:From:Subject:From; b=uf1+0UXD9yvvoYANG9lvDmTHQXb43Y+iRlY/vX48ABD1D2c44tecoKSAjaIQ8qq3x OL4hE6mra4+Dr/A6o7NBWNuPKxy39OISCg781FzjOhq7JtPe+WxpfRbAoXuaxhrxZs Ce/V2E6ed38QyWMxkfhpAxWvTFOVt+iHMyhPr2qY= Date: Thu, 19 May 2022 10:34:12 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, skhan@linuxfoundation.org, shakeelb@google.com, rientjes@google.com, peterx@redhat.com, oleg@redhat.com, minchan@kernel.org, mhocko@suse.com, kirill@shutemov.name, jhubbard@nvidia.com, jannh@google.com, hch@infradead.org, hannes@cmpxchg.org, guro@fb.com, david@redhat.com, brauner@kernel.org, aarcange@redhat.com, surenb@google.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-delete-unused-mmf_oom_victim-flag.patch added to mm-unstable branch Message-Id: <20220519173412.D2B5FC34113@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org 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 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 Subject: mm: delete unused MMF_OOM_VICTIM flag Date: Mon, 16 May 2022 00:56:19 -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/20220516075619.1277152-2-surenb@google.com Signed-off-by: Suren Baghdasaryan Acked-by: Michal Hocko Reviewed-by: Shuah Khan Cc: David Rientjes Cc: Matthew Wilcox (Oracle) Cc: Johannes Weiner Cc: Roman Gushchin Cc: Minchan Kim Cc: "Kirill A . Shutemov" Cc: Andrea Arcangeli Cc: Christian Brauner (Microsoft) Cc: Christoph Hellwig Cc: Oleg Nesterov Cc: David Hildenbrand Cc: Jann Horn Cc: Shakeel Butt Cc: Peter Xu Cc: John Hubbard Signed-off-by: Andrew Morton --- 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 @@ -732,10 +732,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@google.com are selftests-vm-add-process_mrelease-tests.patch mm-drop-oom-code-from-exit_mmap.patch mm-delete-unused-mmf_oom_victim-flag.patch