Commit f2f48408 authored by Nanyong Sun's avatar Nanyong Sun Committed by Andrew Morton
Browse files

mm: move mm flags to mm_types.h 

The types of mm flags are now far beyond the core dump related features. 
This patch moves mm flags from linux/sched/coredump.h to linux/mm_types.h.
The linux/sched/coredump.h has include the mm_types.h, so the C files
related to coredump does not need to change head file inclusion.  In
addition, the inclusion of sched/coredump.h now can be deleted from the C
files that irrelevant to core dump.

Link: https://lkml.kernel.org/r/20240926074922.2721274-1-sunnanyong@huawei.com


Signed-off-by: default avatarNanyong Sun <sunnanyong@huawei.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 021781b0

include/linux/huge_mm.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _LINUX_HUGE_MM_H

#define _LINUX_HUGE_MM_H



#include <linux/sched/coredump.h>

#include <linux/mm_types.h>



#include <linux/fs.h> /* only for vma_is_dax() */

include/linux/khugepaged.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
#ifndef _LINUX_KHUGEPAGED_H

#define _LINUX_KHUGEPAGED_H



#include <linux/sched/coredump.h> /* MMF_VM_HUGEPAGE */



extern unsigned int khugepaged_max_ptes_none __read_mostly;

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

extern struct attribute_group khugepaged_attr_group;

include/linux/ksm.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/pagemap.h>

#include <linux/rmap.h>

#include <linux/sched.h>

#include <linux/sched/coredump.h>



#ifdef CONFIG_KSM

int ksm_madvise(struct vm_area_struct *vma, unsigned long start,

include/linux/mm_types.h

+84 −0
Original line number Diff line number Diff line
@@ -1499,4 +1499,88 @@ enum { 
	/* See also internal only FOLL flags in mm/internal.h */

};



/* mm flags */



/*

 * The first two bits represent core dump modes for set-user-ID,

 * the modes are SUID_DUMP_* defined in linux/sched/coredump.h

 */

#define MMF_DUMPABLE_BITS 2

#define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1)

/* coredump filter bits */

#define MMF_DUMP_ANON_PRIVATE	2

#define MMF_DUMP_ANON_SHARED	3

#define MMF_DUMP_MAPPED_PRIVATE	4

#define MMF_DUMP_MAPPED_SHARED	5

#define MMF_DUMP_ELF_HEADERS	6

#define MMF_DUMP_HUGETLB_PRIVATE 7

#define MMF_DUMP_HUGETLB_SHARED  8

#define MMF_DUMP_DAX_PRIVATE	9

#define MMF_DUMP_DAX_SHARED	10



#define MMF_DUMP_FILTER_SHIFT	MMF_DUMPABLE_BITS

#define MMF_DUMP_FILTER_BITS	9

#define MMF_DUMP_FILTER_MASK \

	(((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT)

#define MMF_DUMP_FILTER_DEFAULT \

	((1 << MMF_DUMP_ANON_PRIVATE) |	(1 << MMF_DUMP_ANON_SHARED) |\

	 (1 << MMF_DUMP_HUGETLB_PRIVATE) | MMF_DUMP_MASK_DEFAULT_ELF)



#ifdef CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS

# define MMF_DUMP_MASK_DEFAULT_ELF	(1 << MMF_DUMP_ELF_HEADERS)

#else

# define MMF_DUMP_MASK_DEFAULT_ELF	0

#endif

					/* leave room for more dump flags */

#define MMF_VM_MERGEABLE	16	/* KSM may merge identical pages */

#define MMF_VM_HUGEPAGE		17	/* set when mm is available for khugepaged */



/*

 * This one-shot flag is dropped due to necessity of changing exe once again

 * on NFS restore

 */

//#define MMF_EXE_FILE_CHANGED	18	/* see prctl_set_mm_exe_file() */



#define MMF_HAS_UPROBES		19	/* has uprobes */

#define MMF_RECALC_UPROBES	20	/* MMF_HAS_UPROBES can be wrong */

#define MMF_OOM_SKIP		21	/* mm is of no interest for the OOM killer */

#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_DISABLE_THP_MASK	(1 << MMF_DISABLE_THP)

#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

 * a counter on its own. We're aggresive on this bit for now: even if the

 * 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		27	/* FOLL_PIN has run, never cleared */



#define MMF_HAS_MDWE		28

#define MMF_HAS_MDWE_MASK	(1 << MMF_HAS_MDWE)





#define MMF_HAS_MDWE_NO_INHERIT	29



#define MMF_VM_MERGE_ANY	30

#define MMF_VM_MERGE_ANY_MASK	(1 << MMF_VM_MERGE_ANY)



#define MMF_TOPDOWN		31	/* mm searches top down by default */

#define MMF_TOPDOWN_MASK	(1 << MMF_TOPDOWN)



#define MMF_INIT_MASK		(MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\

				 MMF_DISABLE_THP_MASK | MMF_HAS_MDWE_MASK |\

				 MMF_VM_MERGE_ANY_MASK | MMF_TOPDOWN_MASK)



static inline unsigned long mmf_init_flags(unsigned long flags)

{

	if (flags & (1UL << MMF_HAS_MDWE_NO_INHERIT))

		flags &= ~((1UL << MMF_HAS_MDWE) |

			   (1UL << MMF_HAS_MDWE_NO_INHERIT));

	return flags & MMF_INIT_MASK;

}



#endif /* _LINUX_MM_TYPES_H */

include/linux/oom.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/types.h>

#include <linux/nodemask.h>

#include <uapi/linux/oom.h>

#include <linux/sched/coredump.h> /* MMF_* */

#include <linux/mm.h> /* VM_FAULT* */



struct zonelist;