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>,
kernel test robot <lkp@intel.com>
Subject: [PATCH v4 5/5] mm/hugetlb: add folio_hstate()
Date: Thu, 22 Sep 2022 10:42:07 -0500 [thread overview]
Message-ID: <20220922154207.1575343-6-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20220922154207.1575343-1-sidhartha.kumar@oracle.com>
Helper function to retrieve hstate information from a hugetlb folio.
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
---
include/linux/hugetlb.h | 14 ++++++++++++--
mm/migrate.c | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index f92b9e6c8f9e..b4473bc43806 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -858,10 +858,15 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift,
}
#endif
+static inline struct hstate *folio_hstate(struct folio *folio)
+{
+ VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio);
+ return size_to_hstate(folio_size(folio));
+}
+
static inline struct hstate *page_hstate(struct page *page)
{
- VM_BUG_ON_PAGE(!PageHuge(page), page);
- return size_to_hstate(page_size(page));
+ return folio_hstate(page_folio(page));
}
static inline unsigned hstate_index_to_shift(unsigned index)
@@ -1070,6 +1075,11 @@ static inline struct hstate *hstate_vma(struct vm_area_struct *vma)
return NULL;
}
+static inline struct hstate *folio_hstate(struct folio *folio)
+{
+ return NULL;
+}
+
static inline struct hstate *page_hstate(struct page *page)
{
return NULL;
diff --git a/mm/migrate.c b/mm/migrate.c
index c228afba0963..17b92af421b9 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1607,7 +1607,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
nid = folio_nid(folio);
if (folio_test_hugetlb(folio)) {
- struct hstate *h = page_hstate(&folio->page);
+ struct hstate *h = folio_hstate(folio);
gfp_mask = htlb_modify_alloc_mask(h, gfp_mask);
return alloc_huge_page_nodemask(h, nid, mtc->nmask, gfp_mask);
--
2.31.1
prev parent reply other threads:[~2022-09-22 15:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 15:42 [PATCH v4 0/5] begin converting hugetlb code to folios Sidhartha Kumar
2022-09-22 15:42 ` [PATCH v4 1/5] mm/hugetlb: add folio support to hugetlb specific flag macros Sidhartha Kumar
2022-09-23 3:01 ` Muchun Song
2022-09-22 15:42 ` [PATCH v4 2/5] mm: add private field of first tail to struct page and struct folio Sidhartha Kumar
2022-09-22 15:42 ` [PATCH v4 3/5] mm/hugetlb: add hugetlb_folio_subpool() helpers Sidhartha Kumar
2022-09-22 15:42 ` [PATCH v4 4/5] hugetlbfs: convert hugetlb_delete_from_page_cache() to use folios Sidhartha Kumar
2022-09-23 23:02 ` Mike Kravetz
2022-09-22 15:42 ` Sidhartha Kumar [this message]
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=20220922154207.1575343-6-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=lkp@intel.com \
--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).