From: Yu Zhao <yuzhao@google.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Alexander Duyck" <alexander.h.duyck@linux.intel.com>,
"Huang Ying" <ying.huang@intel.com>,
"David Hildenbrand" <david@redhat.com>,
"Michal Hocko" <mhocko@suse.com>,
"Yang Shi" <yang.shi@linux.alibaba.com>, "Qian Cai" <cai@lca.pw>,
"Mel Gorman" <mgorman@suse.de>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Hugh Dickins" <hughd@google.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
"Joonsoo Kim" <iamjoonsoo.kim@lge.com>,
"Yu Zhao" <yuzhao@google.com>
Subject: [PATCH v2 1/3] mm: remove activate_page() from unuse_pte()
Date: Tue, 18 Aug 2020 12:47:02 -0600 [thread overview]
Message-ID: <20200818184704.3625199-1-yuzhao@google.com> (raw)
We don't initially add anon pages to active lruvec after
commit b518154e59aa ("mm/vmscan: protect the workingset on anonymous LRU").
Remove activate_page() from unuse_pte(), which seems to be missed by
the commit. And make the function static while we are at it.
Before the commit, we called lru_cache_add_active_or_unevictable() to
add new ksm pages to active lruvec. Therefore, activate_page() wasn't
necessary for them in the first place.
Signed-off-by: Yu Zhao <yuzhao@google.com>
---
include/linux/swap.h | 1 -
mm/swap.c | 4 ++--
mm/swapfile.c | 5 -----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 661046994db4..df6207346078 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -340,7 +340,6 @@ extern void lru_note_cost_page(struct page *);
extern void lru_cache_add(struct page *);
extern void lru_add_page_tail(struct page *page, struct page *page_tail,
struct lruvec *lruvec, struct list_head *head);
-extern void activate_page(struct page *);
extern void mark_page_accessed(struct page *);
extern void lru_add_drain(void);
extern void lru_add_drain_cpu(int cpu);
diff --git a/mm/swap.c b/mm/swap.c
index d16d65d9b4e0..25c4043491b3 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -348,7 +348,7 @@ static bool need_activate_page_drain(int cpu)
return pagevec_count(&per_cpu(lru_pvecs.activate_page, cpu)) != 0;
}
-void activate_page(struct page *page)
+static void activate_page(struct page *page)
{
page = compound_head(page);
if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
@@ -368,7 +368,7 @@ static inline void activate_page_drain(int cpu)
{
}
-void activate_page(struct page *page)
+static void activate_page(struct page *page)
{
pg_data_t *pgdat = page_pgdat(page);
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 12f59e641b5e..c287c560f96d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1925,11 +1925,6 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd,
lru_cache_add_inactive_or_unevictable(page, vma);
}
swap_free(entry);
- /*
- * Move the page to the active list so it is not
- * immediately swapped out again after swapon.
- */
- activate_page(page);
out:
pte_unmap_unlock(pte, ptl);
if (page != swapcache) {
--
2.28.0.220.ged08abb693-goog
next reply other threads:[~2020-08-18 18:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 18:47 Yu Zhao [this message]
2020-08-18 18:47 ` [PATCH v2 2/3] mm: remove superfluous __ClearPageActive() Yu Zhao
2020-08-19 23:04 ` Yang Shi
2020-08-18 18:47 ` [PATCH v2 3/3] mm: remove superfluous __ClearPageWaiters() Yu Zhao
2020-08-19 23:06 ` Yang Shi
2020-08-19 23:39 ` Yu Zhao
2020-08-20 0:16 ` Yang Shi
2020-08-20 6:18 ` Michal Hocko
2020-08-20 8:12 ` Yu Zhao
2020-08-19 22:16 ` [PATCH v2 1/3] mm: remove activate_page() from unuse_pte() Yang Shi
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=20200818184704.3625199-1-yuzhao@google.com \
--to=yuzhao@google.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@linux.intel.com \
--cc=cai@lca.pw \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.com \
--cc=npiggin@gmail.com \
--cc=yang.shi@linux.alibaba.com \
--cc=ying.huang@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).