From: Yu Zhao <yuzhao@google.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Michal Hocko <mhocko@kernel.org>
Cc: Alex Shi <alex.shi@linux.alibaba.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
Roman Gushchin <guro@fb.com>, Shakeel Butt <shakeelb@google.com>,
Chris Down <chris@chrisdown.name>,
Yafang Shao <laoar.shao@gmail.com>,
Vlastimil Babka <vbabka@suse.cz>,
Huang Ying <ying.huang@intel.com>,
Pankaj Gupta <pankaj.gupta.linux@gmail.com>,
Matthew Wilcox <willy@infradead.org>,
Konstantin Khlebnikov <koct9i@gmail.com>,
Minchan Kim <minchan@kernel.org>,
Jaewon Kim <jaewon31.kim@samsung.com>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Yu Zhao <yuzhao@google.com>
Subject: [PATCH 03/13] mm: move __ClearPageLRU() into page_off_lru()
Date: Thu, 17 Sep 2020 21:00:41 -0600 [thread overview]
Message-ID: <20200918030051.650890-4-yuzhao@google.com> (raw)
In-Reply-To: <20200918030051.650890-1-yuzhao@google.com>
Now we have a total of three places that free lru pages when their
references become zero (after we drop the reference from isolation).
Before this patch, they all do:
__ClearPageLRU()
page_off_lru()
del_page_from_lru_list()
After this patch, they become:
page_off_lru()
__ClearPageLRU()
del_page_from_lru_list()
This change should have no side effects.
Signed-off-by: Yu Zhao <yuzhao@google.com>
---
include/linux/mm_inline.h | 1 +
mm/swap.c | 2 --
mm/vmscan.c | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 8fc71e9d7bb0..be9418425e41 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -92,6 +92,7 @@ static __always_inline enum lru_list page_off_lru(struct page *page)
{
enum lru_list lru;
+ __ClearPageLRU(page);
if (PageUnevictable(page)) {
__ClearPageUnevictable(page);
lru = LRU_UNEVICTABLE;
diff --git a/mm/swap.c b/mm/swap.c
index 40bf20a75278..8362083f00c9 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -86,7 +86,6 @@ static void __page_cache_release(struct page *page)
spin_lock_irqsave(&pgdat->lru_lock, flags);
lruvec = mem_cgroup_page_lruvec(page, pgdat);
VM_BUG_ON_PAGE(!PageLRU(page), page);
- __ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
spin_unlock_irqrestore(&pgdat->lru_lock, flags);
}
@@ -895,7 +894,6 @@ void release_pages(struct page **pages, int nr)
lruvec = mem_cgroup_page_lruvec(page, locked_pgdat);
VM_BUG_ON_PAGE(!PageLRU(page), page);
- __ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
}
diff --git a/mm/vmscan.c b/mm/vmscan.c
index f257d2f61574..f9a186a96410 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1862,7 +1862,6 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec,
add_page_to_lru_list(page, lruvec, lru);
if (put_page_testzero(page)) {
- __ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_off_lru(page));
if (unlikely(PageCompound(page))) {
--
2.28.0.681.g6f77f65b4e-goog
next prev parent reply other threads:[~2020-09-18 3:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 3:00 [PATCH 00/13] mm: clean up some lru related pieces Yu Zhao
2020-09-18 3:00 ` [PATCH 01/13] mm: use add_page_to_lru_list() Yu Zhao
2020-09-18 7:32 ` Michal Hocko
2020-09-18 10:05 ` Yu Zhao
2020-09-18 3:00 ` [PATCH 02/13] mm: use page_off_lru() Yu Zhao
2020-09-18 7:37 ` Michal Hocko
2020-09-18 10:27 ` Yu Zhao
2020-09-18 11:09 ` Michal Hocko
2020-09-18 18:53 ` Yu Zhao
2020-09-21 11:16 ` Michal Hocko
2020-09-18 11:24 ` Michal Hocko
2020-09-18 3:00 ` Yu Zhao [this message]
2020-09-18 7:38 ` [PATCH 03/13] mm: move __ClearPageLRU() into page_off_lru() Michal Hocko
2020-09-18 3:00 ` [PATCH 04/13] mm: shuffle lru list addition and deletion functions Yu Zhao
2020-09-18 3:00 ` [PATCH 05/13] mm: don't pass enum lru_list to lru list addition functions Yu Zhao
2020-09-18 3:00 ` [PATCH 06/13] mm: don't pass enum lru_list to trace_mm_lru_insertion() Yu Zhao
2020-09-18 3:00 ` [PATCH 07/13] mm: don't pass enum lru_list to del_page_from_lru_list() Yu Zhao
2020-09-18 3:00 ` [PATCH 08/13] mm: rename page_off_lru() to __clear_page_lru_flags() Yu Zhao
2020-09-18 3:00 ` [PATCH 09/13] mm: inline page_lru_base_type() Yu Zhao
2020-09-18 3:00 ` [PATCH 10/13] mm: VM_BUG_ON lru page flags Yu Zhao
2020-09-18 3:00 ` [PATCH 11/13] mm: inline __update_lru_size() Yu Zhao
2020-09-18 3:00 ` [PATCH 12/13] mm: make lruvec_lru_size() static Yu Zhao
2020-09-18 3:00 ` [PATCH 13/13] mm: enlarge the int parameter of update_lru_size() Yu Zhao
2020-09-18 7:45 ` [PATCH 00/13] mm: clean up some lru related pieces Michal Hocko
2020-09-18 9:36 ` Yu Zhao
2020-09-18 20:46 ` Hugh Dickins
2020-09-18 21:01 ` Yu Zhao
2020-09-18 21:19 ` Hugh Dickins
2020-09-19 0:31 ` Alex Shi
2020-10-13 2:30 ` Hugh Dickins
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=20200918030051.650890-4-yuzhao@google.com \
--to=yuzhao@google.com \
--cc=akpm@linux-foundation.org \
--cc=alex.shi@linux.alibaba.com \
--cc=cgroups@vger.kernel.org \
--cc=chris@chrisdown.name \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=jaewon31.kim@samsung.com \
--cc=koct9i@gmail.com \
--cc=laoar.shao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=minchan@kernel.org \
--cc=mingo@redhat.com \
--cc=pankaj.gupta.linux@gmail.com \
--cc=rostedt@goodmis.org \
--cc=shakeelb@google.com \
--cc=vbabka@suse.cz \
--cc=vdavydov.dev@gmail.com \
--cc=willy@infradead.org \
--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).