This is a note to let you know that I've just added the patch titled Revert "revert "mm: vmscan: do not swap anon pages just because free+file is low"" to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-revert-mm-vmscan-do-not-swap-anon-pages-just.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From fde350e9497d7fb5a222dc02c4364ac6d998c64d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Date: Sat, 7 Jun 2014 19:11:23 -0700 Subject: Revert "revert "mm: vmscan: do not swap anon pages just because free+file is low"" This reverts commit 623762517e2370be3b3f95f4fe08d6c063a49b06. Ben rightly points out that commit 0bf1457f0cfc, which is what this original commit was reverting, never ended up in 3.14-stable, but was only for 3.15. So revert this patch as we now have the same check twice in a row, which is pretty pointless. Although the comments were "prettier"... Cc: Ben Hutchings <ben@xxxxxxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Rafael Aquini <aquini@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 18 ------------------ 1 file changed, 18 deletions(-) --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1916,24 +1916,6 @@ static void get_scan_count(struct lruvec } /* - * Prevent the reclaimer from falling into the cache trap: as - * cache pages start out inactive, every cache fault will tip - * the scan balance towards the file LRU. And as the file LRU - * shrinks, so does the window for rotation from references. - * This means we have a runaway feedback loop where a tiny - * thrashing file LRU becomes infinitely more attractive than - * anon pages. Try to detect this based on file LRU size. - */ - if (global_reclaim(sc)) { - unsigned long free = zone_page_state(zone, NR_FREE_PAGES); - - if (unlikely(file + free <= high_wmark_pages(zone))) { - scan_balance = SCAN_ANON; - goto out; - } - } - - /* * There is enough inactive page cache, do not reclaim * anything from the anonymous working set right now. */ Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-3.14/sched-deadline-fix-memory-leak.patch queue-3.14/arm-omap5-hwmod_data-correct-idlemode-for-mcpdm.patch queue-3.14/arm-omap4-fix-the-boot-regression-with-cpu_idle-enabled.patch queue-3.14/arm-8051-1-put_user-fix-possible-data-corruption-in-put_user.patch queue-3.14/cpufreq-cpu0-drop-wrong-devm-usage.patch queue-3.14/drm-gf119-disp-fix-nasty-bug-which-can-clobber-sor0-s-clock-setup.patch queue-3.14/sched-use-cpupri_nr_priorities-instead-of-max_rt_prio-in-cpupri-check.patch queue-3.14/mm-memory-failure.c-fix-memory-leak-by-race-between-poison-and-unpoison.patch queue-3.14/sched-sanitize-irq-accounting-madness.patch queue-3.14/drm-radeon-also-try-gart-for-cpu-accessed-buffers.patch queue-3.14/mips-fix-typo-when-reporting-cache-and-ftlb-errors-for-imgtec-cores.patch queue-3.14/perf-prevent-false-warning-in-perf_swevent_add.patch queue-3.14/arm-omap2-nand-fix-nand-on-omap2-and-omap3-boards.patch queue-3.14/drm-radeon-pm-don-t-allow-debugfs-sysfs-access-when-px-card-is-off-v2.patch queue-3.14/documentation-fix-docbooks-...-building.patch queue-3.14/drm-radeon-handle-non-vga-class-pci-devices-with-atrm.patch queue-3.14/firewire-revert-to-4-gb-rdma-fix-protocols-using-memory-space.patch queue-3.14/drm-radeon-fix-register-typo-on-si.patch queue-3.14/dm-thin-add-no_space_timeout-dm-thin-pool-module-param.patch queue-3.14/hwmon-ntc_thermistor-fix-dependencies.patch queue-3.14/arm-8064-1-fix-v7-m-signal-return.patch queue-3.14/hwmon-ntc_thermistor-fix-of-device-id-mapping.patch queue-3.14/cpufreq-remove-race-while-accessing-cur_policy.patch queue-3.14/perf-fix-race-in-removing-an-event.patch queue-3.14/revert-revert-mm-vmscan-do-not-swap-anon-pages-just.patch queue-3.14/arm-omap3-clock-back-propagate-rate-change-from-cam_mclk-to-dpll4_m5-on-all-omap3-platforms.patch queue-3.14/arm-imx-fix-error-handling-in-ipu-device-registration.patch queue-3.14/scsi-scsi_transport_sas-move-bsg-destructor-into-sas_rphy_remove.patch queue-3.14/dm-cache-always-split-discards-on-cache-block-boundaries.patch queue-3.14/perf-limit-perf_event_attr-sample_period-to-63-bits.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html