summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMinchan Kim <minchan@kernel.org>2016-01-15 19:54:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-15 20:56:32 -0500
commit854e9ed09dedf0c19ac8640e91bcc74bc3f9e5c9 (patch)
tree4abd01fcd0378a3b3e39fb1c2de028b4076507ef /mm
parent17ec4cd985780a7e30aa45bb8f272237c12502a4 (diff)
mm: support madvise(MADV_FREE)
Linux doesn't have an ability to free pages lazy while other OS already have been supported that named by madvise(MADV_FREE). The gain is clear that kernel can discard freed pages rather than swapping out or OOM if memory pressure happens. Without memory pressure, freed pages would be reused by userspace without another additional overhead(ex, page fault + allocation + zeroing). Jason Evans said: : Facebook has been using MAP_UNINITIALIZED : (https://lkml.org/lkml/2012/1/18/308) in some of its applications for : several years, but there are operational costs to maintaining this : out-of-tree in our kernel and in jemalloc, and we are anxious to retire it : in favor of MADV_FREE. When we first enabled MAP_UNINITIALIZED it : increased throughput for much of our workload by ~5%, and although the : benefit has decreased using newer hardware and kernels, there is still : enough benefit that we cannot reasonably retire it without a replacement. : : Aside from Facebook operations, there are numerous broadly used : applications that would benefit from MADV_FREE. The ones that immediately : come to mind are redis, varnish, and MariaDB. I don't have much insight : into Android internals and development process, but I would hope to see : MADV_FREE support eventually end up there as well to benefit applications : linked with the integrated jemalloc. : : jemalloc will use MADV_FREE once it becomes available in the Linux kernel. : In fact, jemalloc already uses MADV_FREE or equivalent everywhere it's : available: *BSD, OS X, Windows, and Solaris -- every platform except Linux : (and AIX, but I'm not sure it even compiles on AIX). The lack of : MADV_FREE on Linux forced me down a long series of increasingly : sophisticated heuristics for madvise() volume reduction, and even so this : remains a common performance issue for people using jemalloc on Linux. : Please integrate MADV_FREE; many people will benefit substantially. How it works: When madvise syscall is called, VM clears dirty bit of ptes of the range. If memory pressure happens, VM checks dirty bit of page table and if it found still "clean", it means it's a "lazyfree pages" so VM could discard the page instead of swapping out. Once there was store operation for the page before VM peek a page to reclaim, dirty bit is set so VM can swap out the page instead of discarding. One thing we should notice is that basically, MADV_FREE relies on dirty bit in page table entry to decide whether VM allows to discard the page or not. IOW, if page table entry includes marked dirty bit, VM shouldn't discard the page. However, as a example, if swap-in by read fault happens, page table entry doesn't have dirty bit so MADV_FREE could discard the page wrongly. For avoiding the problem, MADV_FREE did more checks with PageDirty and PageSwapCache. It worked out because swapped-in page lives on swap cache and since it is evicted from the swap cache, the page has PG_dirty flag. So both page flags check effectively prevent wrong discarding by MADV_FREE. However, a problem in above logic is that swapped-in page has PG_dirty still after they are removed from swap cache so VM cannot consider the page as freeable any more even if madvise_free is called in future. Look at below example for detail. ptr = malloc(); memset(ptr); .. .. .. heavy memory pressure so all of pages are swapped out .. .. var = *ptr; -> a page swapped-in and could be removed from swapcache. Then, page table doesn't mark dirty bit and page descriptor includes PG_dirty .. .. madvise_free(ptr); -> It doesn't clear PG_dirty of the page. .. .. .. .. heavy memory pressure again. .. In this time, VM cannot discard the page because the page .. has *PG_dirty* To solve the problem, this patch clears PG_dirty if only the page is owned exclusively by current process when madvise is called because PG_dirty represents ptes's dirtiness in several processes so we could clear it only if we own it exclusively. Firstly, heavy users would be general allocators(ex, jemalloc, tcmalloc and hope glibc supports it) and jemalloc/tcmalloc already have supported the feature for other OS(ex, FreeBSD) barrios@blaptop:~/benchmark/ebizzy$ lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 12 On-line CPU(s) list: 0-11 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 12 NUMA node(s): 1 Vendor ID: GenuineIntel CPU family: 6 Model: 2 Stepping: 3 CPU MHz: 3200.185 BogoMIPS: 6400.53 Virtualization: VT-x Hypervisor vendor: KVM Virtualization type: full L1d cache: 32K L1i cache: 32K L2 cache: 4096K NUMA node0 CPU(s): 0-11 ebizzy benchmark(./ebizzy -S 10 -n 512) Higher avg is better. vanilla-jemalloc MADV_free-jemalloc 1 thread records: 10 records: 10 avg: 2961.90 avg: 12069.70 std: 71.96(2.43%) std: 186.68(1.55%) max: 3070.00 max: 12385.00 min: 2796.00 min: 11746.00 2 thread records: 10 records: 10 avg: 5020.00 avg: 17827.00 std: 264.87(5.28%) std: 358.52(2.01%) max: 5244.00 max: 18760.00 min: 4251.00 min: 17382.00 4 thread records: 10 records: 10 avg: 8988.80 avg: 27930.80 std: 1175.33(13.08%) std: 3317.33(11.88%) max: 9508.00 max: 30879.00 min: 5477.00 min: 21024.00 8 thread records: 10 records: 10 avg: 13036.50 avg: 33739.40 std: 170.67(1.31%) std: 5146.22(15.25%) max: 13371.00 max: 40572.00 min: 12785.00 min: 24088.00 16 thread records: 10 records: 10 avg: 11092.40 avg: 31424.20 std: 710.60(6.41%) std: 3763.89(11.98%) max: 12446.00 max: 36635.00 min: 9949.00 min: 25669.00 32 thread records: 10 records: 10 avg: 11067.00 avg: 34495.80 std: 971.06(8.77%) std: 2721.36(7.89%) max: 12010.00 max: 38598.00 min: 9002.00 min: 30636.00 In summary, MADV_FREE is about much faster than MADV_DONTNEED. This patch (of 12): Add core MADV_FREE implementation. [akpm@linux-foundation.org: small cleanups] Signed-off-by: Minchan Kim <minchan@kernel.org> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Hugh Dickins <hughd@google.com> Cc: Mika Penttil <mika.penttila@nextfour.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@suse.de> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Jason Evans <je@fb.com> Cc: Daniel Micay <danielmicay@gmail.com> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Shaohua Li <shli@kernel.org> Cc: <yalin.wang2010@gmail.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: "Shaohua Li" <shli@kernel.org> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chen Gang <gang.chen.5i5j@gmail.com> Cc: Chris Zankel <chris@zankel.net> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: David S. Miller <davem@davemloft.net> Cc: Helge Deller <deller@gmx.de> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Roland Dreier <roland@kernel.org> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Shaohua Li <shli@kernel.org> Cc: Will Deacon <will.deacon@arm.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/madvise.c170
-rw-r--r--mm/rmap.c36
-rw-r--r--mm/swap_state.c5
-rw-r--r--mm/vmscan.c14
-rw-r--r--mm/vmstat.c1
5 files changed, 217 insertions, 9 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index c889fcbb530e..ed137fde4459 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -20,6 +20,9 @@
20#include <linux/backing-dev.h> 20#include <linux/backing-dev.h>
21#include <linux/swap.h> 21#include <linux/swap.h>
22#include <linux/swapops.h> 22#include <linux/swapops.h>
23#include <linux/mmu_notifier.h>
24
25#include <asm/tlb.h>
23 26
24/* 27/*
25 * Any behaviour which results in changes to the vma->vm_flags needs to 28 * Any behaviour which results in changes to the vma->vm_flags needs to
@@ -32,6 +35,7 @@ static int madvise_need_mmap_write(int behavior)
32 case MADV_REMOVE: 35 case MADV_REMOVE:
33 case MADV_WILLNEED: 36 case MADV_WILLNEED:
34 case MADV_DONTNEED: 37 case MADV_DONTNEED:
38 case MADV_FREE:
35 return 0; 39 return 0;
36 default: 40 default:
37 /* be safe, default to 1. list exceptions explicitly */ 41 /* be safe, default to 1. list exceptions explicitly */
@@ -256,6 +260,163 @@ static long madvise_willneed(struct vm_area_struct *vma,
256 return 0; 260 return 0;
257} 261}
258 262
263static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr,
264 unsigned long end, struct mm_walk *walk)
265
266{
267 struct mmu_gather *tlb = walk->private;
268 struct mm_struct *mm = tlb->mm;
269 struct vm_area_struct *vma = walk->vma;
270 spinlock_t *ptl;
271 pte_t *orig_pte, *pte, ptent;
272 struct page *page;
273
274 split_huge_pmd(vma, pmd, addr);
275 if (pmd_trans_unstable(pmd))
276 return 0;
277
278 orig_pte = pte = pte_offset_map_lock(mm, pmd, addr, &ptl);
279 arch_enter_lazy_mmu_mode();
280 for (; addr != end; pte++, addr += PAGE_SIZE) {
281 ptent = *pte;
282
283 if (!pte_present(ptent))
284 continue;
285
286 page = vm_normal_page(vma, addr, ptent);
287 if (!page)
288 continue;
289
290 /*
291 * If pmd isn't transhuge but the page is THP and
292 * is owned by only this process, split it and
293 * deactivate all pages.
294 */
295 if (PageTransCompound(page)) {
296 if (page_mapcount(page) != 1)
297 goto out;
298 get_page(page);
299 if (!trylock_page(page)) {
300 put_page(page);
301 goto out;
302 }
303 pte_unmap_unlock(orig_pte, ptl);
304 if (split_huge_page(page)) {
305 unlock_page(page);
306 put_page(page);
307 pte_offset_map_lock(mm, pmd, addr, &ptl);
308 goto out;
309 }
310 put_page(page);
311 unlock_page(page);
312 pte = pte_offset_map_lock(mm, pmd, addr, &ptl);
313 pte--;
314 addr -= PAGE_SIZE;
315 continue;
316 }
317
318 VM_BUG_ON_PAGE(PageTransCompound(page), page);
319
320 if (PageSwapCache(page) || PageDirty(page)) {
321 if (!trylock_page(page))
322 continue;
323 /*
324 * If page is shared with others, we couldn't clear
325 * PG_dirty of the page.
326 */
327 if (page_mapcount(page) != 1) {
328 unlock_page(page);
329 continue;
330 }
331
332 if (PageSwapCache(page) && !try_to_free_swap(page)) {
333 unlock_page(page);
334 continue;
335 }
336
337 ClearPageDirty(page);
338 unlock_page(page);
339 }
340
341 if (pte_young(ptent) || pte_dirty(ptent)) {
342 /*
343 * Some of architecture(ex, PPC) don't update TLB
344 * with set_pte_at and tlb_remove_tlb_entry so for
345 * the portability, remap the pte with old|clean
346 * after pte clearing.
347 */
348 ptent = ptep_get_and_clear_full(mm, addr, pte,
349 tlb->fullmm);
350
351 ptent = pte_mkold(ptent);
352 ptent = pte_mkclean(ptent);
353 set_pte_at(mm, addr, pte, ptent);
354 tlb_remove_tlb_entry(tlb, pte, addr);
355 }
356 }
357out:
358 arch_leave_lazy_mmu_mode();
359 pte_unmap_unlock(orig_pte, ptl);
360 cond_resched();
361 return 0;
362}
363
364static void madvise_free_page_range(struct mmu_gather *tlb,
365 struct vm_area_struct *vma,
366 unsigned long addr, unsigned long end)
367{
368 struct mm_walk free_walk = {
369 .pmd_entry = madvise_free_pte_range,
370 .mm = vma->vm_mm,
371 .private = tlb,
372 };
373
374 tlb_start_vma(tlb, vma);
375 walk_page_range(addr, end, &free_walk);
376 tlb_end_vma(tlb, vma);
377}
378
379static int madvise_free_single_vma(struct vm_area_struct *vma,
380 unsigned long start_addr, unsigned long end_addr)
381{
382 unsigned long start, end;
383 struct mm_struct *mm = vma->vm_mm;
384 struct mmu_gather tlb;
385
386 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
387 return -EINVAL;
388
389 /* MADV_FREE works for only anon vma at the moment */
390 if (!vma_is_anonymous(vma))
391 return -EINVAL;
392
393 start = max(vma->vm_start, start_addr);
394 if (start >= vma->vm_end)
395 return -EINVAL;
396 end = min(vma->vm_end, end_addr);
397 if (end <= vma->vm_start)
398 return -EINVAL;
399
400 lru_add_drain();
401 tlb_gather_mmu(&tlb, mm, start, end);
402 update_hiwater_rss(mm);
403
404 mmu_notifier_invalidate_range_start(mm, start, end);
405 madvise_free_page_range(&tlb, vma, start, end);
406 mmu_notifier_invalidate_range_end(mm, start, end);
407 tlb_finish_mmu(&tlb, start, end);
408
409 return 0;
410}
411
412static long madvise_free(struct vm_area_struct *vma,
413 struct vm_area_struct **prev,
414 unsigned long start, unsigned long end)
415{
416 *prev = vma;
417 return madvise_free_single_vma(vma, start, end);
418}
419
259/* 420/*
260 * Application no longer needs these pages. If the pages are dirty, 421 * Application no longer needs these pages. If the pages are dirty,
261 * it's OK to just throw them away. The app will be more careful about 422 * it's OK to just throw them away. The app will be more careful about
@@ -379,6 +540,14 @@ madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
379 return madvise_remove(vma, prev, start, end); 540 return madvise_remove(vma, prev, start, end);
380 case MADV_WILLNEED: 541 case MADV_WILLNEED:
381 return madvise_willneed(vma, prev, start, end); 542 return madvise_willneed(vma, prev, start, end);
543 case MADV_FREE:
544 /*
545 * XXX: In this implementation, MADV_FREE works like
546 * MADV_DONTNEED on swapless system or full swap.
547 */
548 if (get_nr_swap_pages() > 0)
549 return madvise_free(vma, prev, start, end);
550 /* passthrough */
382 case MADV_DONTNEED: 551 case MADV_DONTNEED:
383 return madvise_dontneed(vma, prev, start, end); 552 return madvise_dontneed(vma, prev, start, end);
384 default: 553 default:
@@ -398,6 +567,7 @@ madvise_behavior_valid(int behavior)
398 case MADV_REMOVE: 567 case MADV_REMOVE:
399 case MADV_WILLNEED: 568 case MADV_WILLNEED:
400 case MADV_DONTNEED: 569 case MADV_DONTNEED:
570 case MADV_FREE:
401#ifdef CONFIG_KSM 571#ifdef CONFIG_KSM
402 case MADV_MERGEABLE: 572 case MADV_MERGEABLE:
403 case MADV_UNMERGEABLE: 573 case MADV_UNMERGEABLE:
diff --git a/mm/rmap.c b/mm/rmap.c
index cdc2a885a4cd..68af2e32f7ed 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1411,6 +1411,11 @@ void page_remove_rmap(struct page *page, bool compound)
1411 */ 1411 */
1412} 1412}
1413 1413
1414struct rmap_private {
1415 enum ttu_flags flags;
1416 int lazyfreed;
1417};
1418
1414/* 1419/*
1415 * @arg: enum ttu_flags will be passed to this argument 1420 * @arg: enum ttu_flags will be passed to this argument
1416 */ 1421 */
@@ -1422,7 +1427,8 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
1422 pte_t pteval; 1427 pte_t pteval;
1423 spinlock_t *ptl; 1428 spinlock_t *ptl;
1424 int ret = SWAP_AGAIN; 1429 int ret = SWAP_AGAIN;
1425 enum ttu_flags flags = (enum ttu_flags)arg; 1430 struct rmap_private *rp = arg;
1431 enum ttu_flags flags = rp->flags;
1426 1432
1427 /* munlock has nothing to gain from examining un-locked vmas */ 1433 /* munlock has nothing to gain from examining un-locked vmas */
1428 if ((flags & TTU_MUNLOCK) && !(vma->vm_flags & VM_LOCKED)) 1434 if ((flags & TTU_MUNLOCK) && !(vma->vm_flags & VM_LOCKED))
@@ -1514,6 +1520,14 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
1514 * See handle_pte_fault() ... 1520 * See handle_pte_fault() ...
1515 */ 1521 */
1516 VM_BUG_ON_PAGE(!PageSwapCache(page), page); 1522 VM_BUG_ON_PAGE(!PageSwapCache(page), page);
1523
1524 if (!PageDirty(page) && (flags & TTU_LZFREE)) {
1525 /* It's a freeable page by MADV_FREE */
1526 dec_mm_counter(mm, MM_ANONPAGES);
1527 rp->lazyfreed++;
1528 goto discard;
1529 }
1530
1517 if (swap_duplicate(entry) < 0) { 1531 if (swap_duplicate(entry) < 0) {
1518 set_pte_at(mm, address, pte, pteval); 1532 set_pte_at(mm, address, pte, pteval);
1519 ret = SWAP_FAIL; 1533 ret = SWAP_FAIL;
@@ -1534,6 +1548,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
1534 } else 1548 } else
1535 dec_mm_counter(mm, mm_counter_file(page)); 1549 dec_mm_counter(mm, mm_counter_file(page));
1536 1550
1551discard:
1537 page_remove_rmap(page, PageHuge(page)); 1552 page_remove_rmap(page, PageHuge(page));
1538 page_cache_release(page); 1553 page_cache_release(page);
1539 1554
@@ -1586,9 +1601,14 @@ static int page_not_mapped(struct page *page)
1586int try_to_unmap(struct page *page, enum ttu_flags flags) 1601int try_to_unmap(struct page *page, enum ttu_flags flags)
1587{ 1602{
1588 int ret; 1603 int ret;
1604 struct rmap_private rp = {
1605 .flags = flags,
1606 .lazyfreed = 0,
1607 };
1608
1589 struct rmap_walk_control rwc = { 1609 struct rmap_walk_control rwc = {
1590 .rmap_one = try_to_unmap_one, 1610 .rmap_one = try_to_unmap_one,
1591 .arg = (void *)flags, 1611 .arg = &rp,
1592 .done = page_not_mapped, 1612 .done = page_not_mapped,
1593 .anon_lock = page_lock_anon_vma_read, 1613 .anon_lock = page_lock_anon_vma_read,
1594 }; 1614 };
@@ -1608,8 +1628,11 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
1608 1628
1609 ret = rmap_walk(page, &rwc); 1629 ret = rmap_walk(page, &rwc);
1610 1630
1611 if (ret != SWAP_MLOCK && !page_mapped(page)) 1631 if (ret != SWAP_MLOCK && !page_mapped(page)) {
1612 ret = SWAP_SUCCESS; 1632 ret = SWAP_SUCCESS;
1633 if (rp.lazyfreed && !PageDirty(page))
1634 ret = SWAP_LZFREE;
1635 }
1613 return ret; 1636 return ret;
1614} 1637}
1615 1638
@@ -1631,9 +1654,14 @@ int try_to_unmap(struct page *page, enum ttu_flags flags)
1631int try_to_munlock(struct page *page) 1654int try_to_munlock(struct page *page)
1632{ 1655{
1633 int ret; 1656 int ret;
1657 struct rmap_private rp = {
1658 .flags = TTU_MUNLOCK,
1659 .lazyfreed = 0,
1660 };
1661
1634 struct rmap_walk_control rwc = { 1662 struct rmap_walk_control rwc = {
1635 .rmap_one = try_to_unmap_one, 1663 .rmap_one = try_to_unmap_one,
1636 .arg = (void *)TTU_MUNLOCK, 1664 .arg = &rp,
1637 .done = page_not_mapped, 1665 .done = page_not_mapped,
1638 .anon_lock = page_lock_anon_vma_read, 1666 .anon_lock = page_lock_anon_vma_read,
1639 1667
diff --git a/mm/swap_state.c b/mm/swap_state.c
index d783872d746c..676ff2991380 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -185,13 +185,12 @@ int add_to_swap(struct page *page, struct list_head *list)
185 * deadlock in the swap out path. 185 * deadlock in the swap out path.
186 */ 186 */
187 /* 187 /*
188 * Add it to the swap cache and mark it dirty 188 * Add it to the swap cache.
189 */ 189 */
190 err = add_to_swap_cache(page, entry, 190 err = add_to_swap_cache(page, entry,
191 __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN); 191 __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
192 192
193 if (!err) { /* Success */ 193 if (!err) {
194 SetPageDirty(page);
195 return 1; 194 return 1;
196 } else { /* -ENOMEM radix-tree allocation failure */ 195 } else { /* -ENOMEM radix-tree allocation failure */
197 /* 196 /*
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 983e407afc09..5ac86956ff9d 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -906,6 +906,8 @@ static unsigned long shrink_page_list(struct list_head *page_list,
906 int may_enter_fs; 906 int may_enter_fs;
907 enum page_references references = PAGEREF_RECLAIM_CLEAN; 907 enum page_references references = PAGEREF_RECLAIM_CLEAN;
908 bool dirty, writeback; 908 bool dirty, writeback;
909 bool lazyfree = false;
910 int ret = SWAP_SUCCESS;
909 911
910 cond_resched(); 912 cond_resched();
911 913
@@ -1049,6 +1051,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
1049 goto keep_locked; 1051 goto keep_locked;
1050 if (!add_to_swap(page, page_list)) 1052 if (!add_to_swap(page, page_list))
1051 goto activate_locked; 1053 goto activate_locked;
1054 lazyfree = true;
1052 may_enter_fs = 1; 1055 may_enter_fs = 1;
1053 1056
1054 /* Adding to swap updated mapping */ 1057 /* Adding to swap updated mapping */
@@ -1060,14 +1063,17 @@ static unsigned long shrink_page_list(struct list_head *page_list,
1060 * processes. Try to unmap it here. 1063 * processes. Try to unmap it here.
1061 */ 1064 */
1062 if (page_mapped(page) && mapping) { 1065 if (page_mapped(page) && mapping) {
1063 switch (try_to_unmap(page, 1066 switch (ret = try_to_unmap(page, lazyfree ?
1064 ttu_flags|TTU_BATCH_FLUSH)) { 1067 (ttu_flags | TTU_BATCH_FLUSH | TTU_LZFREE) :
1068 (ttu_flags | TTU_BATCH_FLUSH))) {
1065 case SWAP_FAIL: 1069 case SWAP_FAIL:
1066 goto activate_locked; 1070 goto activate_locked;
1067 case SWAP_AGAIN: 1071 case SWAP_AGAIN:
1068 goto keep_locked; 1072 goto keep_locked;
1069 case SWAP_MLOCK: 1073 case SWAP_MLOCK:
1070 goto cull_mlocked; 1074 goto cull_mlocked;
1075 case SWAP_LZFREE:
1076 goto lazyfree;
1071 case SWAP_SUCCESS: 1077 case SWAP_SUCCESS:
1072 ; /* try to free the page below */ 1078 ; /* try to free the page below */
1073 } 1079 }
@@ -1174,6 +1180,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
1174 } 1180 }
1175 } 1181 }
1176 1182
1183lazyfree:
1177 if (!mapping || !__remove_mapping(mapping, page, true)) 1184 if (!mapping || !__remove_mapping(mapping, page, true))
1178 goto keep_locked; 1185 goto keep_locked;
1179 1186
@@ -1186,6 +1193,9 @@ static unsigned long shrink_page_list(struct list_head *page_list,
1186 */ 1193 */
1187 __ClearPageLocked(page); 1194 __ClearPageLocked(page);
1188free_it: 1195free_it:
1196 if (ret == SWAP_LZFREE)
1197 count_vm_event(PGLAZYFREED);
1198
1189 nr_reclaimed++; 1199 nr_reclaimed++;
1190 1200
1191 /* 1201 /*
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 6489086f0753..64bd0aa13f75 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -783,6 +783,7 @@ const char * const vmstat_text[] = {
783 783
784 "pgfault", 784 "pgfault",
785 "pgmajfault", 785 "pgmajfault",
786 "pglazyfreed",
786 787
787 TEXTS_FOR_ZONES("pgrefill") 788 TEXTS_FOR_ZONES("pgrefill")
788 TEXTS_FOR_ZONES("pgsteal_kswapd") 789 TEXTS_FOR_ZONES("pgsteal_kswapd")