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

Commit a2383320 authored by Johannes Weiner's avatar Johannes Weiner Committed by Suren Baghdasaryan
Browse files

BACKPORT: mm: workingset: tell cache transitions from workingset thrashing 

Refaults happen during transitions between workingsets as well as in-place
thrashing.  Knowing the difference between the two has a range of
applications, including measuring the impact of memory shortage on the
system performance, as well as the ability to smarter balance pressure
between the filesystem cache and the swap-backed workingset.

During workingset transitions, inactive cache refaults and pushes out
established active cache.  When that active cache isn't stale, however,
and also ends up refaulting, that's bonafide thrashing.

Introduce a new page flag that tells on eviction whether the page has been
active or not in its lifetime.  This bit is then stored in the shadow
entry, to classify refaults as transitioning or thrashing.

How many page->flags does this leave us with on 32-bit?

	20 bits are always page flags

	21 if you have an MMU

	23 with the zone bits for DMA, Normal, HighMem, Movable

	29 with the sparsemem section bits

	30 if PAE is enabled

	31 with this patch.

So on 32-bit PAE, that leaves 1 bit for distinguishing two NUMA nodes.  If
that's not enough, the system can switch to discontigmem and re-gain the 6
or 7 sparsemem section bits.

Link: http://lkml.kernel.org/r/20180828172258.3185-3-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarDaniel Drake <drake@endlessm.com>
Tested-by: default avatarSuren Baghdasaryan <surenb@google.com>
Cc: Christopher Lameter <cl@linux.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Weiner <jweiner@fb.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Enderborg <peter.enderborg@sony.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vinayak Menon <vinmenon@codeaurora.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit 1899ad18c6072d689896badafb81267b0a1092a4)

Conflicts:
        mm/workingset.c

(manual merge in workingset_refault, used inc_node_state instead of
inc_lruvec_state)

Bug: 111308141
Test: modified lmkd to use PSI and tested using lmkd_unit_test

Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Change-Id: Ifad7cfee8bb98b62b223fe82241639af19b7dddb
parent 86c5c11a

include/linux/mmzone.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ enum node_stat_item { 
	NR_PAGES_SCANNED,	/* pages scanned since last reclaim */

	WORKINGSET_REFAULT,

	WORKINGSET_ACTIVATE,

	WORKINGSET_RESTORE,

	WORKINGSET_NODERECLAIM,

	NR_ANON_MAPPED,	/* Mapped anonymous pages */

	NR_FILE_MAPPED,	/* pagecache pages mapped into pagetables.

include/linux/page-flags.h

+4 −1
Original line number Diff line number Diff line
@@ -74,12 +74,13 @@ 
enum pageflags {

	PG_locked,		/* Page is locked. Don't touch. */

	PG_waiters,		/* Page has waiters, check its waitqueue */

	PG_error,

	PG_referenced,

	PG_uptodate,

	PG_dirty,

	PG_lru,

	PG_active,

	PG_workingset,

	PG_error,

	PG_slab,

	PG_owner_priv_1,	/* Owner use. If pagecache, fs may use*/

	PG_arch_1,
@@ -270,6 +271,8 @@ PAGEFLAG(Dirty, dirty, PF_HEAD) TESTSCFLAG(Dirty, dirty, PF_HEAD) 
PAGEFLAG(LRU, lru, PF_HEAD) __CLEARPAGEFLAG(LRU, lru, PF_HEAD)

PAGEFLAG(Active, active, PF_HEAD) __CLEARPAGEFLAG(Active, active, PF_HEAD)

	TESTCLEARFLAG(Active, active, PF_HEAD)

PAGEFLAG(Workingset, workingset, PF_HEAD)

	TESTCLEARFLAG(Workingset, workingset, PF_HEAD)

__PAGEFLAG(Slab, slab, PF_NO_TAIL)

__PAGEFLAG(SlobFree, slob_free, PF_NO_TAIL)

PAGEFLAG(Checked, checked, PF_NO_COMPOUND)	   /* Used by some filesystems */

include/linux/swap.h

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ struct swap_info_struct { 


/* linux/mm/workingset.c */

void *workingset_eviction(struct address_space *mapping, struct page *page);

bool workingset_refault(void *shadow);

void workingset_refault(struct page *page, void *shadow);

void workingset_activation(struct page *page);

extern struct list_lru workingset_shadow_nodes;

include/trace/events/mmflags.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ 
	{1UL << PG_dirty,		"dirty"		},		\

	{1UL << PG_lru,			"lru"		},		\

	{1UL << PG_active,		"active"	},		\

	{1UL << PG_workingset,		"workingset"	},		\

	{1UL << PG_slab,		"slab"		},		\

	{1UL << PG_owner_priv_1,	"owner_priv_1"	},		\

	{1UL << PG_arch_1,		"arch_1"	},		\

mm/filemap.c

+3 −6
Original line number Diff line number Diff line
@@ -743,12 +743,9 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping, 
		 * data from the working set, only to cache data that will

		 * get overwritten with something else, is a waste of memory.

		 */

		if (!(gfp_mask & __GFP_WRITE) &&

		    shadow && workingset_refault(shadow)) {

			SetPageActive(page);

			workingset_activation(page);

		} else

			ClearPageActive(page);

		WARN_ON_ONCE(PageActive(page));

		if (!(gfp_mask & __GFP_WRITE) && shadow)

			workingset_refault(page, shadow);

		lru_cache_add(page);

	}

	return ret;