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

Commit 78ce155f authored by Wei Yang's avatar Wei Yang Committed by Greg Kroah-Hartman
Browse files

vmscan: return NODE_RECLAIM_NOSCAN in node_reclaim() when CONFIG_NUMA is n 

[ Upstream commit 8b09549c2bfd9f3f8f4cdad74107ef4f4ff9cdd7 ]

Commit fa5e084e ("vmscan: do not unconditionally treat zones that
fail zone_reclaim() as full") changed the return value of
node_reclaim().  The original return value 0 means NODE_RECLAIM_SOME
after this commit.

While the return value of node_reclaim() when CONFIG_NUMA is n is not
changed.  This will leads to call zone_watermark_ok() again.

This patch fixes the return value by adjusting to NODE_RECLAIM_NOSCAN.
Since node_reclaim() is only called in page_alloc.c, move it to
mm/internal.h.

Link: http://lkml.kernel.org/r/20181113080436.22078-1-richard.weiyang@gmail.com


Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarMatthew Wilcox <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1b0e201c

include/linux/swap.h

+0 −6
Original line number Diff line number Diff line
@@ -371,14 +371,8 @@ extern unsigned long vm_total_pages; 
extern int node_reclaim_mode;

extern int sysctl_min_unmapped_ratio;

extern int sysctl_min_slab_ratio;

extern int node_reclaim(struct pglist_data *, gfp_t, unsigned int);

#else

#define node_reclaim_mode 0

static inline int node_reclaim(struct pglist_data *pgdat, gfp_t mask,

				unsigned int order)

{

	return 0;

}

#endif



extern int page_evictable(struct page *page);

mm/internal.h

+10 −0
Original line number Diff line number Diff line
@@ -444,6 +444,16 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn, 
#define NODE_RECLAIM_SOME	0

#define NODE_RECLAIM_SUCCESS	1



#ifdef CONFIG_NUMA

extern int node_reclaim(struct pglist_data *, gfp_t, unsigned int);

#else

static inline int node_reclaim(struct pglist_data *pgdat, gfp_t mask,

				unsigned int order)

{

	return NODE_RECLAIM_NOSCAN;

}

#endif



extern int hwpoison_filter(struct page *p);



extern u32 hwpoison_filter_dev_major;