Commit 6c357848 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

mm: replace hpage_nr_pages with thp_nr_pages 



The thp prefix is more frequently used than hpage and we should be
consistent between the various functions.

[akpm@linux-foundation.org: fix mm/migrate.c]

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Link: http://lkml.kernel.org/r/20200629151959.15779-6-willy@infradead.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af3bbc12

include/linux/huge_mm.h

+9 −4
Original line number Diff line number Diff line
@@ -271,9 +271,14 @@ static inline unsigned int thp_order(struct page *page) 
	return 0;

}



static inline int hpage_nr_pages(struct page *page)

/**

 * thp_nr_pages - The number of regular pages in this huge page.

 * @page: The head page of a huge page.

 */

static inline int thp_nr_pages(struct page *page)

{

	if (unlikely(PageTransHuge(page)))

	VM_BUG_ON_PGFLAGS(PageTail(page), page);

	if (PageHead(page))

		return HPAGE_PMD_NR;

	return 1;

}
@@ -336,9 +341,9 @@ static inline unsigned int thp_order(struct page *page) 
	return 0;

}



static inline int hpage_nr_pages(struct page *page)

static inline int thp_nr_pages(struct page *page)

{

	VM_BUG_ON_PAGE(PageTail(page), page);

	VM_BUG_ON_PGFLAGS(PageTail(page), page);

	return 1;

}

include/linux/mm_inline.h

+3 −3
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ static __always_inline void update_lru_size(struct lruvec *lruvec, 
static __always_inline void add_page_to_lru_list(struct page *page,

				struct lruvec *lruvec, enum lru_list lru)

{

	update_lru_size(lruvec, lru, page_zonenum(page), hpage_nr_pages(page));

	update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page));

	list_add(&page->lru, &lruvec->lists[lru]);

}



static __always_inline void add_page_to_lru_list_tail(struct page *page,

				struct lruvec *lruvec, enum lru_list lru)

{

	update_lru_size(lruvec, lru, page_zonenum(page), hpage_nr_pages(page));

	update_lru_size(lruvec, lru, page_zonenum(page), thp_nr_pages(page));

	list_add_tail(&page->lru, &lruvec->lists[lru]);

}
@@ -63,7 +63,7 @@ static __always_inline void del_page_from_lru_list(struct page *page, 
				struct lruvec *lruvec, enum lru_list lru)

{

	list_del(&page->lru);

	update_lru_size(lruvec, lru, page_zonenum(page), -hpage_nr_pages(page));

	update_lru_size(lruvec, lru, page_zonenum(page), -thp_nr_pages(page));

}



/**

include/linux/pagemap.h

+3 −3
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static inline struct page *find_subpage(struct page *head, pgoff_t index) 
	if (PageHuge(head))

		return head;



	return head + (index & (hpage_nr_pages(head) - 1));

	return head + (index & (thp_nr_pages(head) - 1));

}



struct page *find_get_entry(struct address_space *mapping, pgoff_t offset);
@@ -773,7 +773,7 @@ static inline struct page *readahead_page(struct readahead_control *rac) 


	page = xa_load(&rac->mapping->i_pages, rac->_index);

	VM_BUG_ON_PAGE(!PageLocked(page), page);

	rac->_batch_count = hpage_nr_pages(page);

	rac->_batch_count = thp_nr_pages(page);



	return page;

}
@@ -796,7 +796,7 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, 
		VM_BUG_ON_PAGE(!PageLocked(page), page);

		VM_BUG_ON_PAGE(PageTail(page), page);

		array[i++] = page;

		rac->_batch_count += hpage_nr_pages(page);

		rac->_batch_count += thp_nr_pages(page);



		/*

		 * The page cache isn't using multi-index entries yet,

mm/compaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, 
		del_page_from_lru_list(page, lruvec, page_lru(page));

		mod_node_page_state(page_pgdat(page),

				NR_ISOLATED_ANON + page_is_file_lru(page),

				hpage_nr_pages(page));

				thp_nr_pages(page));



isolate_success:

		list_add(&page->lru, &cc->migratepages);

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static void unaccount_page_cache_page(struct address_space *mapping, 
	if (PageHuge(page))

		return;



	nr = hpage_nr_pages(page);

	nr = thp_nr_pages(page);



	__mod_lruvec_page_state(page, NR_FILE_PAGES, -nr);

	if (PageSwapBacked(page)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE