From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, songmuchun@bytedance.com,
mike.kravetz@oracle.com, willy@infradead.org, vbabka@suse.cz,
william.kucharski@oracle.com, dhowells@redhat.com,
peterx@redhat.com, arnd@arndb.de, ccross@google.com,
hughd@google.com, ebiederm@xmission.com,
Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v3 3/6] mm/hugetlb: add hugetlb_folio_subpool() helper
Date: Thu, 8 Sep 2022 12:37:03 -0700 [thread overview]
Message-ID: <20220908193706.1716548-4-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20220908193706.1716548-1-sidhartha.kumar@oracle.com>
Allows hugetlbfs_migrate_folio to check subpool information by passing
in a folio.
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
(cherry picked from commit cd9e187858b45b890097cfcd0b2eb4bbbb9a59ae)
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
fs/hugetlbfs/inode.c | 4 ++--
include/linux/hugetlb.h | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 52d9b390389b..c2e9c0cdbd81 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -1151,9 +1151,9 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping,
if (rc != MIGRATEPAGE_SUCCESS)
return rc;
- if (hugetlb_page_subpool(&src->page)) {
+ if (hugetlb_folio_subpool(src)) {
hugetlb_set_page_subpool(&dst->page,
- hugetlb_page_subpool(&src->page));
+ hugetlb_folio_subpool(src));
hugetlb_set_page_subpool(&src->page, NULL);
}
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 0952ea50251d..1e7c4007386e 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -744,12 +744,17 @@ extern unsigned int default_hstate_idx;
#define default_hstate (hstates[default_hstate_idx])
+static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio *folio)
+{
+ return (void *)folio_get_private_1(folio);
+}
+
/*
* hugetlb page subpool pointer located in hpage[1].private
*/
static inline struct hugepage_subpool *hugetlb_page_subpool(struct page *hpage)
{
- return (void *)page_private(hpage + SUBPAGE_INDEX_SUBPOOL);
+ return hugetlb_folio_subpool(page_folio(hpage));
}
static inline void hugetlb_set_page_subpool(struct page *hpage,
--
2.31.1
next prev parent reply other threads:[~2022-09-08 19:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 19:37 [PATCH v3 0/6] begin converting hugetlb code to folios Sidhartha Kumar
2022-09-08 19:37 ` [PATCH v3 1/6] mm/hugetlb: add folio support to hugetlb specific flag macros Sidhartha Kumar
2022-09-19 22:09 ` Mike Kravetz
2022-09-08 19:37 ` [PATCH v3 2/6] mm: add private field of first tail to struct page and struct folio Sidhartha Kumar
2022-09-19 22:14 ` Mike Kravetz
2022-09-08 19:37 ` Sidhartha Kumar [this message]
2022-09-19 22:24 ` [PATCH v3 3/6] mm/hugetlb: add hugetlb_folio_subpool() helper Mike Kravetz
2022-09-08 19:37 ` [PATCH v3 4/6] mm/hugetlb: add hugetlb_set_folio_subpool() helper Sidhartha Kumar
2022-09-19 22:26 ` Mike Kravetz
2022-09-08 19:37 ` [PATCH v3 5/6] hugetlbfs: convert hugetlb_delete_from_page_cache() to use folios Sidhartha Kumar
2022-09-19 22:33 ` Mike Kravetz
2022-09-08 19:37 ` [PATCH v3 6/6] mm/hugetlb: add folio_hstate() Sidhartha Kumar
2022-09-19 22:43 ` Mike Kravetz
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=20220908193706.1716548-4-sidhartha.kumar@oracle.com \
--to=sidhartha.kumar@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ccross@google.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=peterx@redhat.com \
--cc=songmuchun@bytedance.com \
--cc=vbabka@suse.cz \
--cc=william.kucharski@oracle.com \
--cc=willy@infradead.org \
/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).