Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 41c93088127df2579e8ca64010929ec9e41d5543

Authored by Ying Han
Committed by Linus Torvalds
1 parent 66aebce747
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()" 

This reverts commit c38446cc65e1f2b3eb8630c53943b94c4f65f670.

Before the commit, the code makes senses to me but not after the commit.
The "nr_reclaimed" is the number of pages reclaimed by scanning through
the memcg's lru lists.  The "nr_to_reclaim" is the target value for the
whole function.  For example, we like to early break the reclaim if
reclaimed 32 pages under direct reclaim (not DEF_PRIORITY).

After the reverted commit, the target "nr_to_reclaim" is decremented each
time by "nr_reclaimed" but we still use it to compare the "nr_reclaimed".
It just doesn't make sense to me...

Signed-off-by: Ying Han <yinghan@google.com>
Acked-by: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Hillf Danton <dhillf@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff

... ... @@ -2107,12 +2107,7 @@
2107 2107 * with multiple processes reclaiming pages, the total
2108 2108 * freeing target can get unreasonably large.
2109 2109 */
2110   - if (nr_reclaimed >= nr_to_reclaim)
2111   - nr_to_reclaim = 0;
2112   - else
2113   - nr_to_reclaim -= nr_reclaimed;
2114   -
2115   - if (!nr_to_reclaim && priority < DEF_PRIORITY)
  2110 + if (nr_reclaimed >= nr_to_reclaim && priority < DEF_PRIORITY)
2116 2111 break;
2117 2112 }
2118 2113 blk_finish_plug(&plug);