mm/vmscan: make the annotations of refaults code at the right place

After patch "mm/workingset: prepare the workingset detection
infrastructure for anon LRU", we can handle the refaults of anonymous
pages too.  So the annotations of refaults should cover both of anonymous
pages and file pages.

Link: https://lkml.kernel.org/r/20220813080757.59131-1-yang.yang29@zte.com.cn
Fixes: 170b04b7ae ("mm/workingset: prepare the workingset detection infrastructure for anon LRU")
Signed-off-by: Yang Yang <yang.yang29@zte.com.cn>
Signed-off-by: CGEL ZTE <cgel.zte@gmail.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Yang Yang 2022-08-13 08:07:58 +00:00 committed by Andrew Morton
parent 4ed9824346
commit d3629af59f
1 changed files with 5 additions and 5 deletions

View File

@ -3228,6 +3228,11 @@ again:
if (!sc->force_deactivate) { if (!sc->force_deactivate) {
unsigned long refaults; unsigned long refaults;
/*
* When refaults are being observed, it means a new
* workingset is being established. Deactivate to get
* rid of any stale active pages quickly.
*/
refaults = lruvec_page_state(target_lruvec, refaults = lruvec_page_state(target_lruvec,
WORKINGSET_ACTIVATE_ANON); WORKINGSET_ACTIVATE_ANON);
if (refaults != target_lruvec->refaults[WORKINGSET_ANON] || if (refaults != target_lruvec->refaults[WORKINGSET_ANON] ||
@ -3236,11 +3241,6 @@ again:
else else
sc->may_deactivate &= ~DEACTIVATE_ANON; sc->may_deactivate &= ~DEACTIVATE_ANON;
/*
* When refaults are being observed, it means a new
* workingset is being established. Deactivate to get
* rid of any stale active pages quickly.
*/
refaults = lruvec_page_state(target_lruvec, refaults = lruvec_page_state(target_lruvec,
WORKINGSET_ACTIVATE_FILE); WORKINGSET_ACTIVATE_FILE);
if (refaults != target_lruvec->refaults[WORKINGSET_FILE] || if (refaults != target_lruvec->refaults[WORKINGSET_FILE] ||