Re: [PATCH 1/8] mm: Separate out FOLIO_FLAGS from PAGEFLAGS

[David Hildenbrand <david@redhat.com>]

On 27.02.24 20:23, Matthew Wilcox (Oracle) wrote:
> We've progressed far enough with the folio transition that some flags
> are now no longer checked on pages, but only on folios.  To prevent
> new users appearing, prepare to only define the folio versions of the
> flag test/set/clear.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>   include/linux/page-flags.h | 63 ++++++++++++++++++++++++++------------
>   1 file changed, 43 insertions(+), 20 deletions(-)
> 
> diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
> index 735cddc13d20..95ab75d0b39c 100644
> --- a/include/linux/page-flags.h
> +++ b/include/linux/page-flags.h
> @@ -367,54 +367,77 @@ static unsigned long *folio_flags(struct folio *folio, unsigned n)
>   #define FOLIO_PF_NO_COMPOUND	0
>   #define FOLIO_PF_SECOND		1
>   
> +#define FOLIO_HEAD_PAGE		0
> +#define FOLIO_SECOND_PAGE	1
> +
>   /*
>    * Macros to create function definitions for page flags
>    */
> +#define FOLIO_TEST_FLAG(name, page)					\
> +static __always_inline bool folio_test_##name(struct folio *folio)	\
> +{ return test_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define FOLIO_SET_FLAG(name, page)					\
> +static __always_inline void folio_set_##name(struct folio *folio)	\
> +{ set_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define FOLIO_CLEAR_FLAG(name, page)					\
> +static __always_inline void folio_clear_##name(struct folio *folio)	\
> +{ clear_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define __FOLIO_SET_FLAG(name, page)					\
> +static __always_inline void __folio_set_##name(struct folio *folio)	\
> +{ __set_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define __FOLIO_CLEAR_FLAG(name, page)					\
> +static __always_inline void __folio_clear_##name(struct folio *folio)	\
> +{ __clear_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define FOLIO_TEST_SET_FLAG(name, page)					\
> +static __always_inline bool folio_test_set_##name(struct folio *folio)	\
> +{ return test_and_set_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define FOLIO_TEST_CLEAR_FLAG(name, page)				\
> +static __always_inline bool folio_test_clear_##name(struct folio *folio) \
> +{ return test_and_clear_bit(PG_##name, folio_flags(folio, page)); }
> +
> +#define FOLIO_FLAG(name, page)						\
> +FOLIO_TEST_FLAG(name, page)						\
> +FOLIO_SET_FLAG(name, page)						\
> +FOLIO_CLEAR_FLAG(name, page)
> +
>   #define TESTPAGEFLAG(uname, lname, policy)				\
> -static __always_inline bool folio_test_##lname(struct folio *folio)	\
> -{ return test_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }	\
> +FOLIO_TEST_FLAG(lname, FOLIO_##policy)					\
>   static __always_inline int Page##uname(struct page *page)		\
>   { return test_bit(PG_##lname, &policy(page, 0)->flags); }
>   
>   #define SETPAGEFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -void folio_set_##lname(struct folio *folio)				\
> -{ set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\
> +FOLIO_SET_FLAG(lname, FOLIO_##policy)					\
>   static __always_inline void SetPage##uname(struct page *page)		\
>   { set_bit(PG_##lname, &policy(page, 1)->flags); }
>   
>   #define CLEARPAGEFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -void folio_clear_##lname(struct folio *folio)				\
> -{ clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\
> +FOLIO_CLEAR_FLAG(lname, FOLIO_##policy)					\
>   static __always_inline void ClearPage##uname(struct page *page)		\
>   { clear_bit(PG_##lname, &policy(page, 1)->flags); }
>   
>   #define __SETPAGEFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -void __folio_set_##lname(struct folio *folio)				\
> -{ __set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }		\
> +__FOLIO_SET_FLAG(lname, FOLIO_##policy)					\
>   static __always_inline void __SetPage##uname(struct page *page)		\
>   { __set_bit(PG_##lname, &policy(page, 1)->flags); }
>   
>   #define __CLEARPAGEFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -void __folio_clear_##lname(struct folio *folio)				\
> -{ __clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); }	\
> +__FOLIO_CLEAR_FLAG(lname, FOLIO_##policy)				\
>   static __always_inline void __ClearPage##uname(struct page *page)	\
>   { __clear_bit(PG_##lname, &policy(page, 1)->flags); }
>   
>   #define TESTSETFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -bool folio_test_set_##lname(struct folio *folio)			\
> -{ return test_and_set_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
> +FOLIO_TEST_SET_FLAG(lname, FOLIO_##policy)				\
>   static __always_inline int TestSetPage##uname(struct page *page)	\
>   { return test_and_set_bit(PG_##lname, &policy(page, 1)->flags); }
>   
>   #define TESTCLEARFLAG(uname, lname, policy)				\
> -static __always_inline							\
> -bool folio_test_clear_##lname(struct folio *folio)			\
> -{ return test_and_clear_bit(PG_##lname, folio_flags(folio, FOLIO_##policy)); } \
> +FOLIO_TEST_CLEAR_FLAG(lname, FOLIO_##policy)				\
>   static __always_inline int TestClearPage##uname(struct page *page)	\
>   { return test_and_clear_bit(PG_##lname, &policy(page, 1)->flags); }
>   

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Cheers,

David / dhildenb