From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeelb@google.com>,
Muchun Song <muchun.song@linux.dev>,
cgroups@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 4/4] memcg: Use a folio in get_mctgt_type_thp
Date: Thu, 11 Jan 2024 18:12:19 +0000 [thread overview]
Message-ID: <20240111181219.3462852-5-willy@infradead.org> (raw)
In-Reply-To: <20240111181219.3462852-1-willy@infradead.org>
Replace five calls to compound_head() with one.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/memcontrol.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index b6096c34b3e4..935f48c4d399 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6161,6 +6161,7 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
unsigned long addr, pmd_t pmd, union mc_target *target)
{
struct page *page = NULL;
+ struct folio *folio;
enum mc_target_type ret = MC_TARGET_NONE;
if (unlikely(is_swap_pmd(pmd))) {
@@ -6170,17 +6171,18 @@ static enum mc_target_type get_mctgt_type_thp(struct vm_area_struct *vma,
}
page = pmd_page(pmd);
VM_BUG_ON_PAGE(!page || !PageHead(page), page);
+ folio = page_folio(page);
if (!(mc.flags & MOVE_ANON))
return ret;
- if (page_memcg(page) == mc.from) {
+ if (folio_memcg(folio) == mc.from) {
ret = MC_TARGET_PAGE;
if (target) {
- get_page(page);
- if (!trylock_page(page)) {
- put_page(page);
+ folio_get(folio);
+ if (!folio_trylock(folio)) {
+ folio_put(folio);
return MC_TARGET_NONE;
}
- target->folio = page_folio(page);
+ target->folio = folio;
}
}
return ret;
--
2.43.0
next prev parent reply other threads:[~2024-01-11 18:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 18:12 [PATCH 0/4] Convert memcontrol charge moving to use folios Matthew Wilcox (Oracle)
2024-01-11 18:12 ` [PATCH 1/4] memcg: Convert mem_cgroup_move_charge_pte_range() to use a folio Matthew Wilcox (Oracle)
2024-01-15 8:03 ` Muchun Song
2024-01-11 18:12 ` [PATCH 2/4] memcg: Return the folio in union mc_target Matthew Wilcox (Oracle)
2024-01-15 3:49 ` Muchun Song
2024-01-11 18:12 ` [PATCH 3/4] memcg: Use a folio in get_mctgt_type Matthew Wilcox (Oracle)
2024-01-11 19:34 ` Johannes Weiner
2024-01-15 3:48 ` Muchun Song
2024-01-11 18:12 ` Matthew Wilcox (Oracle) [this message]
2024-01-12 1:57 ` [PATCH 4/4] memcg: Use a folio in get_mctgt_type_thp Roman Gushchin
2024-01-15 3:47 ` Muchun Song
2024-01-26 17:57 ` [PATCH 0/4] Convert memcontrol charge moving to use folios Shakeel Butt
2024-02-21 7:48 ` Michal Hocko
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=20240111181219.3462852-5-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=muchun.song@linux.dev \
--cc=roman.gushchin@linux.dev \
--cc=shakeelb@google.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).