Commit 149562f7 authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/hugetlb: add hugetlb_folio_subpool() helpers 

Allow hugetlbfs_migrate_folio to check and read subpool information by
passing in a folio.

Link: https://lkml.kernel.org/r/20220922154207.1575343-4-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Colin Cross <ccross@google.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: William Kucharski <william.kucharski@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d340625f

fs/hugetlbfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -1091,10 +1091,10 @@ static int hugetlbfs_migrate_folio(struct address_space *mapping, 
	if (rc != MIGRATEPAGE_SUCCESS)

		return rc;



	if (hugetlb_page_subpool(&src->page)) {

		hugetlb_set_page_subpool(&dst->page,

					hugetlb_page_subpool(&src->page));

		hugetlb_set_page_subpool(&src->page, NULL);

	if (hugetlb_folio_subpool(src)) {

		hugetlb_set_folio_subpool(dst,

					hugetlb_folio_subpool(src));

		hugetlb_set_folio_subpool(src, NULL);

	}



	if (mode != MIGRATE_SYNC_NO_COPY)

include/linux/hugetlb.h

+13 −2
Original line number Diff line number Diff line
@@ -718,18 +718,29 @@ 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_folio_subpool(struct folio *folio,

					struct hugepage_subpool *subpool)

{

	folio_set_private_1(folio, (unsigned long)subpool);

}



static inline void hugetlb_set_page_subpool(struct page *hpage,

					struct hugepage_subpool *subpool)

{

	set_page_private(hpage + SUBPAGE_INDEX_SUBPOOL, (unsigned long)subpool);

	hugetlb_set_folio_subpool(page_folio(hpage), subpool);

}



static inline struct hstate *hstate_file(struct file *f)