Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4356f21d authored by Minchan Kim's avatar Minchan Kim Committed by Linus Torvalds
Browse files

mm: change isolate mode from #define to bitwise type 



Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
macro isn't recommended as it's type-unsafe and making debugging harder as
symbol cannot be passed throught to the debugger.

Quote from Johannes
" Hmm, it would probably be cleaner to fully convert the isolation mode
into independent flags.  INACTIVE, ACTIVE, BOTH is currently a
tri-state among flags, which is a bit ugly."

This patch moves isolate mode from swap.h to mmzone.h by memcontrol.h

Signed-off-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9e84ac1

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

+4 −4
Original line number Diff line number Diff line
@@ -379,10 +379,10 @@ EVENT_PROCESS: 


			# To closer match vmstat scanning statistics, only count isolate_both

			# and isolate_inactive as scanning. isolate_active is rotation

			# isolate_inactive == 0

			# isolate_active   == 1

			# isolate_both     == 2

			if ($isolate_mode != 1) {

			# isolate_inactive == 1

			# isolate_active   == 2

			# isolate_both     == 3

			if ($isolate_mode != 2) {

				$perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;

			}

			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;

include/linux/memcontrol.h

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ enum mem_cgroup_page_stat_item { 
extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,

					struct list_head *dst,

					unsigned long *scanned, int order,

					int mode, struct zone *z,

					isolate_mode_t mode,

					struct zone *z,

					struct mem_cgroup *mem_cont,

					int active, int file);

include/linux/mmzone.h

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,14 @@ static inline int is_unevictable_lru(enum lru_list l) 
#define LRU_ALL_EVICTABLE (LRU_ALL_FILE | LRU_ALL_ANON)

#define LRU_ALL	     ((1 << NR_LRU_LISTS) - 1)



/* Isolate inactive pages */

#define ISOLATE_INACTIVE	((__force isolate_mode_t)0x1)

/* Isolate active pages */

#define ISOLATE_ACTIVE		((__force isolate_mode_t)0x2)



/* LRU Isolation modes. */

typedef unsigned __bitwise__ isolate_mode_t;



enum zone_watermarks {

	WMARK_MIN,

	WMARK_LOW,

include/linux/swap.h

+1 −6
Original line number Diff line number Diff line
@@ -243,15 +243,10 @@ static inline void lru_cache_add_file(struct page *page) 
	__lru_cache_add(page, LRU_INACTIVE_FILE);

}



/* LRU Isolation modes. */

#define ISOLATE_INACTIVE 0	/* Isolate inactive pages. */

#define ISOLATE_ACTIVE 1	/* Isolate active pages. */

#define ISOLATE_BOTH 2		/* Isolate both active and inactive pages. */



/* linux/mm/vmscan.c */

extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order,

					gfp_t gfp_mask, nodemask_t *mask);

extern int __isolate_lru_page(struct page *page, int mode, int file);

extern int __isolate_lru_page(struct page *page, isolate_mode_t mode, int file);

extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem,

						  gfp_t gfp_mask, bool noswap);

extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,

include/trace/events/vmscan.h

+4 −4
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, 
		unsigned long nr_lumpy_taken,

		unsigned long nr_lumpy_dirty,

		unsigned long nr_lumpy_failed,

		int isolate_mode),

		isolate_mode_t isolate_mode),



	TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode),
@@ -278,7 +278,7 @@ DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template, 
		__field(unsigned long, nr_lumpy_taken)

		__field(unsigned long, nr_lumpy_dirty)

		__field(unsigned long, nr_lumpy_failed)

		__field(int, isolate_mode)

		__field(isolate_mode_t, isolate_mode)

	),



	TP_fast_assign(
@@ -312,7 +312,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_lru_isolate, 
		unsigned long nr_lumpy_taken,

		unsigned long nr_lumpy_dirty,

		unsigned long nr_lumpy_failed,

		int isolate_mode),

		isolate_mode_t isolate_mode),



	TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode)
@@ -327,7 +327,7 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate, 
		unsigned long nr_lumpy_taken,

		unsigned long nr_lumpy_dirty,

		unsigned long nr_lumpy_failed,

		int isolate_mode),

		isolate_mode_t isolate_mode),



	TP_ARGS(order, nr_requested, nr_scanned, nr_taken, nr_lumpy_taken, nr_lumpy_dirty, nr_lumpy_failed, isolate_mode)