As the 'struct page_frag_cache' is going to replace the 'struct page_frag' in sched.h, including page_frag_cache.h in sched.h has a compiler error caused by interdependence between mm_types.h and mm.h for asm-offsets.c, see [1]. Avoid the above compiler error by moving the 'struct page_frag_cache' to sched.h as suggested by Alexander, see [2]. 1. https://lore.kernel.org/all/15623dac-9358-4597-b3ee-3694a5956920@xxxxxxxxx/ 2. https://lore.kernel.org/all/CAKgT0UdH1yD=LSCXFJ=YM_aiA4OomD-2wXykO42bizaWMt_HOA@xxxxxxxxxxxxxx/ Suggested-by: Alexander Duyck <alexander.duyck@xxxxxxxxx> Signed-off-by: Yunsheng Lin <linyunsheng@xxxxxxxxxx> --- include/linux/mm_types_task.h | 18 ++++++++++++++++++ include/linux/page_frag_cache.h | 20 +------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/linux/mm_types_task.h b/include/linux/mm_types_task.h index a2f6179b672b..f2610112a642 100644 --- a/include/linux/mm_types_task.h +++ b/include/linux/mm_types_task.h @@ -8,6 +8,7 @@ * (These are defined separately to decouple sched.h from mm_types.h as much as possible.) */ +#include <linux/align.h> #include <linux/types.h> #include <asm/page.h> @@ -46,6 +47,23 @@ struct page_frag { #endif }; +#define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) +#define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE) +struct page_frag_cache { + /* encoded_va consists of the virtual address, pfmemalloc bit and order + * of a page. + */ + unsigned long encoded_va; + +#if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) && (BITS_PER_LONG <= 32) + __u16 remaining; + __u16 pagecnt_bias; +#else + __u32 remaining; + __u32 pagecnt_bias; +#endif +}; + /* Track pages that require TLB flushes */ struct tlbflush_unmap_batch { #ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH diff --git a/include/linux/page_frag_cache.h b/include/linux/page_frag_cache.h index cd60e08f6d44..e0d65b57ac80 100644 --- a/include/linux/page_frag_cache.h +++ b/include/linux/page_frag_cache.h @@ -3,18 +3,15 @@ #ifndef _LINUX_PAGE_FRAG_CACHE_H #define _LINUX_PAGE_FRAG_CACHE_H -#include <linux/align.h> #include <linux/bits.h> #include <linux/build_bug.h> #include <linux/log2.h> #include <linux/types.h> #include <linux/mm.h> +#include <linux/mm_types_task.h> #include <linux/mmdebug.h> #include <asm/page.h> -#define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) -#define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE) - #define PAGE_FRAG_CACHE_ORDER_MASK GENMASK(7, 0) #define PAGE_FRAG_CACHE_PFMEMALLOC_BIT BIT(8) #define PAGE_FRAG_CACHE_PFMEMALLOC_SHIFT 8 @@ -53,21 +50,6 @@ static inline void *encoded_page_address(unsigned long encoded_va) return (void *)(encoded_va & PAGE_MASK); } -struct page_frag_cache { - /* encoded_va consists of the virtual address, pfmemalloc bit and order - * of a page. - */ - unsigned long encoded_va; - -#if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) && (BITS_PER_LONG <= 32) - __u16 remaining; - __u16 pagecnt_bias; -#else - __u32 remaining; - __u32 pagecnt_bias; -#endif -}; - static inline void page_frag_cache_init(struct page_frag_cache *nc) { memset(nc, 0, sizeof(*nc)); -- 2.33.0
