From: Shaohua Li <shli@fb.com> To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org> Cc: <Kernel-team@fb.com>, <mhocko@suse.com>, <minchan@kernel.org>, <hughd@google.com>, <hannes@cmpxchg.org>, <riel@redhat.com>, <mgorman@techsingularity.net>, <akpm@linux-foundation.org> Subject: [PATCH V4 1/6] mm: delete unnecessary TTU_* flags Date: Wed, 22 Feb 2017 10:50:39 -0800 [thread overview] Message-ID: <6e99fbb58c019dac280dde73a96586c0eba880d0.1487788131.git.shli@fb.com> (raw) In-Reply-To: <cover.1487788131.git.shli@fb.com> Johannes pointed out TTU_LZFREE is unnecessary. It's true because we always have the flag set if we want to do an unmap. For cases we don't do an unmap, the TTU_LZFREE part of code should never run. Also the TTU_UNMAP is unnecessary. If no other flags set (for example, TTU_MIGRATION), an unmap is implied. Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Andrew Morton <akpm@linux-foundation.org> Suggested-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Shaohua Li <shli@fb.com> --- include/linux/rmap.h | 2 -- mm/memory-failure.c | 2 +- mm/rmap.c | 2 +- mm/vmscan.c | 11 ++++------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 8c89e90..e2cd8f9 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -83,10 +83,8 @@ struct anon_vma_chain { }; enum ttu_flags { - TTU_UNMAP = 1, /* unmap mode */ TTU_MIGRATION = 2, /* migration mode */ TTU_MUNLOCK = 4, /* munlock mode */ - TTU_LZFREE = 8, /* lazy free mode */ TTU_SPLIT_HUGE_PMD = 16, /* split huge PMD if any */ TTU_IGNORE_MLOCK = (1 << 8), /* ignore mlock */ diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3d0f2fd..b78d080 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -906,7 +906,7 @@ EXPORT_SYMBOL_GPL(get_hwpoison_page); static int hwpoison_user_mappings(struct page *p, unsigned long pfn, int trapno, int flags, struct page **hpagep) { - enum ttu_flags ttu = TTU_UNMAP | TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; + enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; struct address_space *mapping; LIST_HEAD(tokill); int ret; diff --git a/mm/rmap.c b/mm/rmap.c index 8774791..96eb85c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1418,7 +1418,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, */ VM_BUG_ON_PAGE(!PageSwapCache(page), page); - if (!PageDirty(page) && (flags & TTU_LZFREE)) { + if (!PageDirty(page)) { /* It's a freeable page by MADV_FREE */ dec_mm_counter(mm, MM_ANONPAGES); rp->lazyfreed++; diff --git a/mm/vmscan.c b/mm/vmscan.c index 26c3b40..68ea50d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -971,7 +971,6 @@ static unsigned long shrink_page_list(struct list_head *page_list, int may_enter_fs; enum page_references references = PAGEREF_RECLAIM_CLEAN; bool dirty, writeback; - bool lazyfree = false; int ret = SWAP_SUCCESS; cond_resched(); @@ -1125,7 +1124,6 @@ static unsigned long shrink_page_list(struct list_head *page_list, goto keep_locked; if (!add_to_swap(page, page_list)) goto activate_locked; - lazyfree = true; may_enter_fs = 1; /* Adding to swap updated mapping */ @@ -1143,9 +1141,8 @@ static unsigned long shrink_page_list(struct list_head *page_list, * processes. Try to unmap it here. */ if (page_mapped(page) && mapping) { - switch (ret = try_to_unmap(page, lazyfree ? - (ttu_flags | TTU_BATCH_FLUSH | TTU_LZFREE) : - (ttu_flags | TTU_BATCH_FLUSH))) { + switch (ret = try_to_unmap(page, + ttu_flags | TTU_BATCH_FLUSH)) { case SWAP_FAIL: nr_unmap_fail++; goto activate_locked; @@ -1353,7 +1350,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone, } ret = shrink_page_list(&clean_pages, zone->zone_pgdat, &sc, - TTU_UNMAP|TTU_IGNORE_ACCESS, NULL, true); + TTU_IGNORE_ACCESS, NULL, true); list_splice(&clean_pages, page_list); mod_node_page_state(zone->zone_pgdat, NR_ISOLATED_FILE, -ret); return ret; @@ -1760,7 +1757,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, if (nr_taken == 0) return 0; - nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, TTU_UNMAP, + nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, 0, &stat, false); spin_lock_irq(&pgdat->lru_lock); -- 2.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Shaohua Li <shli@fb.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Kernel-team@fb.com, mhocko@suse.com, minchan@kernel.org, hughd@google.com, hannes@cmpxchg.org, riel@redhat.com, mgorman@techsingularity.net, akpm@linux-foundation.org Subject: [PATCH V4 1/6] mm: delete unnecessary TTU_* flags Date: Wed, 22 Feb 2017 10:50:39 -0800 [thread overview] Message-ID: <6e99fbb58c019dac280dde73a96586c0eba880d0.1487788131.git.shli@fb.com> (raw) In-Reply-To: <cover.1487788131.git.shli@fb.com> Johannes pointed out TTU_LZFREE is unnecessary. It's true because we always have the flag set if we want to do an unmap. For cases we don't do an unmap, the TTU_LZFREE part of code should never run. Also the TTU_UNMAP is unnecessary. If no other flags set (for example, TTU_MIGRATION), an unmap is implied. Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Rik van Riel <riel@redhat.com> Cc: Mel Gorman <mgorman@techsingularity.net> Cc: Andrew Morton <akpm@linux-foundation.org> Suggested-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Shaohua Li <shli@fb.com> --- include/linux/rmap.h | 2 -- mm/memory-failure.c | 2 +- mm/rmap.c | 2 +- mm/vmscan.c | 11 ++++------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 8c89e90..e2cd8f9 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -83,10 +83,8 @@ struct anon_vma_chain { }; enum ttu_flags { - TTU_UNMAP = 1, /* unmap mode */ TTU_MIGRATION = 2, /* migration mode */ TTU_MUNLOCK = 4, /* munlock mode */ - TTU_LZFREE = 8, /* lazy free mode */ TTU_SPLIT_HUGE_PMD = 16, /* split huge PMD if any */ TTU_IGNORE_MLOCK = (1 << 8), /* ignore mlock */ diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3d0f2fd..b78d080 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -906,7 +906,7 @@ EXPORT_SYMBOL_GPL(get_hwpoison_page); static int hwpoison_user_mappings(struct page *p, unsigned long pfn, int trapno, int flags, struct page **hpagep) { - enum ttu_flags ttu = TTU_UNMAP | TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; + enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_IGNORE_ACCESS; struct address_space *mapping; LIST_HEAD(tokill); int ret; diff --git a/mm/rmap.c b/mm/rmap.c index 8774791..96eb85c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1418,7 +1418,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, */ VM_BUG_ON_PAGE(!PageSwapCache(page), page); - if (!PageDirty(page) && (flags & TTU_LZFREE)) { + if (!PageDirty(page)) { /* It's a freeable page by MADV_FREE */ dec_mm_counter(mm, MM_ANONPAGES); rp->lazyfreed++; diff --git a/mm/vmscan.c b/mm/vmscan.c index 26c3b40..68ea50d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -971,7 +971,6 @@ static unsigned long shrink_page_list(struct list_head *page_list, int may_enter_fs; enum page_references references = PAGEREF_RECLAIM_CLEAN; bool dirty, writeback; - bool lazyfree = false; int ret = SWAP_SUCCESS; cond_resched(); @@ -1125,7 +1124,6 @@ static unsigned long shrink_page_list(struct list_head *page_list, goto keep_locked; if (!add_to_swap(page, page_list)) goto activate_locked; - lazyfree = true; may_enter_fs = 1; /* Adding to swap updated mapping */ @@ -1143,9 +1141,8 @@ static unsigned long shrink_page_list(struct list_head *page_list, * processes. Try to unmap it here. */ if (page_mapped(page) && mapping) { - switch (ret = try_to_unmap(page, lazyfree ? - (ttu_flags | TTU_BATCH_FLUSH | TTU_LZFREE) : - (ttu_flags | TTU_BATCH_FLUSH))) { + switch (ret = try_to_unmap(page, + ttu_flags | TTU_BATCH_FLUSH)) { case SWAP_FAIL: nr_unmap_fail++; goto activate_locked; @@ -1353,7 +1350,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone, } ret = shrink_page_list(&clean_pages, zone->zone_pgdat, &sc, - TTU_UNMAP|TTU_IGNORE_ACCESS, NULL, true); + TTU_IGNORE_ACCESS, NULL, true); list_splice(&clean_pages, page_list); mod_node_page_state(zone->zone_pgdat, NR_ISOLATED_FILE, -ret); return ret; @@ -1760,7 +1757,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, if (nr_taken == 0) return 0; - nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, TTU_UNMAP, + nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, 0, &stat, false); spin_lock_irq(&pgdat->lru_lock); -- 2.9.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-02-22 18:51 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-22 18:50 [PATCH V4 0/6] mm: fix some MADV_FREE issues Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-22 18:50 ` Shaohua Li [this message] 2017-02-22 18:50 ` [PATCH V4 1/6] mm: delete unnecessary TTU_* flags Shaohua Li 2017-02-23 15:35 ` Johannes Weiner 2017-02-23 15:35 ` Johannes Weiner 2017-02-24 1:25 ` Minchan Kim 2017-02-24 1:25 ` Minchan Kim 2017-02-24 3:29 ` Hillf Danton 2017-02-24 3:29 ` Hillf Danton 2017-02-22 18:50 ` [PATCH V4 2/6] mm: don't assume anonymous pages have SwapBacked flag Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-22 18:50 ` [PATCH V4 3/6] mm: move MADV_FREE pages into LRU_INACTIVE_FILE list Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-23 15:58 ` Johannes Weiner 2017-02-23 15:58 ` Johannes Weiner 2017-02-23 16:26 ` Shaohua Li 2017-02-23 16:26 ` Shaohua Li 2017-02-23 18:22 ` Johannes Weiner 2017-02-23 18:22 ` Johannes Weiner 2017-02-23 19:04 ` Shaohua Li 2017-02-23 19:04 ` Shaohua Li 2017-02-24 1:49 ` Minchan Kim 2017-02-24 1:49 ` Minchan Kim 2017-02-24 6:15 ` Shaohua Li 2017-02-24 6:15 ` Shaohua Li 2017-02-24 23:37 ` Minchan Kim 2017-02-24 23:37 ` Minchan Kim 2017-02-22 18:50 ` [PATCH V4 4/6] mm: reclaim MADV_FREE pages Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-23 16:13 ` Johannes Weiner 2017-02-23 16:13 ` Johannes Weiner 2017-02-23 17:19 ` Shaohua Li 2017-02-23 17:19 ` Shaohua Li 2017-02-24 2:12 ` Minchan Kim 2017-02-24 2:12 ` Minchan Kim 2017-02-24 6:14 ` Shaohua Li 2017-02-24 6:14 ` Shaohua Li 2017-02-24 15:36 ` Johannes Weiner 2017-02-24 15:36 ` Johannes Weiner 2017-02-24 23:26 ` Minchan Kim 2017-02-24 23:26 ` Minchan Kim 2017-02-22 18:50 ` [PATCH V4 5/6] mm: enable MADV_FREE for swapless system Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-22 18:50 ` [PATCH V4 6/6] proc: show MADV_FREE pages info in smaps Shaohua Li 2017-02-22 18:50 ` Shaohua Li 2017-02-23 16:16 ` Johannes Weiner 2017-02-23 16:16 ` Johannes Weiner 2017-02-24 2:13 ` Minchan Kim 2017-02-24 2:13 ` Minchan Kim 2017-02-24 17:08 ` Dave Hansen 2017-02-24 17:08 ` Dave Hansen 2017-02-24 21:47 ` Shaohua Li 2017-02-24 21:47 ` Shaohua Li
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6e99fbb58c019dac280dde73a96586c0eba880d0.1487788131.git.shli@fb.com \ --to=shli@fb.com \ --cc=Kernel-team@fb.com \ --cc=akpm@linux-foundation.org \ --cc=hannes@cmpxchg.org \ --cc=hughd@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@techsingularity.net \ --cc=mhocko@suse.com \ --cc=minchan@kernel.org \ --cc=riel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.