Commit a04d12c2 authored by Kemeng Shi's avatar Kemeng Shi Committed by Andrew Morton
Browse files

mm/page_alloc: remove unnecessary inner __get_pfnblock_flags_mask 

Patch series "Two minor cleanups for get pageblock migratetype".

This series contains two minor cleanups for get pageblock migratetype. 
More details can be found in respective patches.


This patch (of 2):

get_pfnblock_flags_mask() just calls inline inner
__get_pfnblock_flags_mask without any extra work.  Just opencode
__get_pfnblock_flags_mask in get_pfnblock_flags_mask and replace call to
__get_pfnblock_flags_mask with call to get_pfnblock_flags_mask to remove
unnecessary __get_pfnblock_flags_mask.

Link: https://lkml.kernel.org/r/20230811115945.3423894-1-shikemeng@huaweicloud.com
Link: https://lkml.kernel.org/r/20230811115945.3423894-2-shikemeng@huaweicloud.com


Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Acked-by: default avatarMel Gorman <mgorman@techsingularity.net>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 368d983b

mm/page_alloc.c

+11 −19
Original line number Diff line number Diff line
@@ -371,10 +371,16 @@ static inline int pfn_to_bitidx(const struct page *page, unsigned long pfn) 
	return (pfn >> pageblock_order) * NR_PAGEBLOCK_BITS;

}



static __always_inline

unsigned long __get_pfnblock_flags_mask(const struct page *page,

					unsigned long pfn,

					unsigned long mask)

/**

 * get_pfnblock_flags_mask - Return the requested group of flags for the pageblock_nr_pages block of pages

 * @page: The page within the block of interest

 * @pfn: The target page frame number

 * @mask: mask of bits that the caller is interested in

 *

 * Return: pageblock_bits flags

 */

unsigned long get_pfnblock_flags_mask(const struct page *page,

					unsigned long pfn, unsigned long mask)

{

	unsigned long *bitmap;

	unsigned long bitidx, word_bitidx;
@@ -393,24 +399,10 @@ unsigned long __get_pfnblock_flags_mask(const struct page *page, 
	return (word >> bitidx) & mask;

}



/**

 * get_pfnblock_flags_mask - Return the requested group of flags for the pageblock_nr_pages block of pages

 * @page: The page within the block of interest

 * @pfn: The target page frame number

 * @mask: mask of bits that the caller is interested in

 *

 * Return: pageblock_bits flags

 */

unsigned long get_pfnblock_flags_mask(const struct page *page,

					unsigned long pfn, unsigned long mask)

{

	return __get_pfnblock_flags_mask(page, pfn, mask);

}



static __always_inline int get_pfnblock_migratetype(const struct page *page,

					unsigned long pfn)

{

	return __get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK);

	return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK);

}



/**