mm: correctly determine LAST_CPUPID_WIDTH
PATCH 1/2 mm: correctly determine LAST_CPUPID_WIDTH
The naming convention used in include/linux/page-flags-layout.h:
*_SHIFT: the number of bits trying to allocate *_WIDTH: the number of bits successfully allocated
So when it comes to LAST_CPUPID_WIDTH, we need to check whether all previous *_WIDTH and LAST_CPUPID_SHIFT can fit into page flags. This means we need to use NODES_WIDTH, not NODES_SHIFT.
Signed-off-by Yu Zhao <[email protected]>
--- include/linux/page-flags-layout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/page-flags-layout.h +1 -1
@@ -83,7 +83,7 @@#define KASAN_TAG_WIDTH 0#endif -#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_SHIFT +LAST_CPUPID_SHIFT +KASAN_TAG_WIDTH \ +#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_WIDTH +LAST_CPUPID_SHIFT +KASAN_TAG_WIDTH \ <=BITS_PER_LONG -NR_PAGEFLAGS #define LAST_CPUPID_WIDTH LAST_CPUPID_SHIFT#else
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog
PATCH 2/2 mm: clean up include/linux/page-flags-layout.h
Tidy things up and delete comments stating the obvious with typos or making no sense.
Signed-off-by Yu Zhao <[email protected]>
--- include/linux/page-flags-layout.h | 62 +++++++++++++++---------------- mm/mm_init.c | 4 -- 2 files changed, 29 insertions(+), 37 deletions(-)
include/linux/page-flags-layout.h +29 -33
@@ -21,16 +21,17 @@#elif MAX_NR_ZONES <=8 #define ZONES_SHIFT 3#else -#error ZONES_SHIFT -- too many zones configured adjust calculation +#error ZONES_SHIFT "Too many zones configured"#endif +#define ZONES_WIDTH ZONES_SHIFT +#ifdef CONFIG_SPARSEMEM #include <asm/sparsemem.h> - -/* SECTION_SHIFT #bits space required to store a section # */ #define SECTIONS_SHIFT (MAX_PHYSMEM_BITS - SECTION_SIZE_BITS) - -#endif /* CONFIG_SPARSEMEM */ +#else +#define SECTIONS_SHIFT 0 +#endif #ifndef BUILD_VDSO32_64 /*
@@ -54,17 +55,28 @@#define SECTIONS_WIDTH 0#endif -#define ZONES_WIDTH ZONES_SHIFT - -#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_SHIFT <=BITS_PER_LONG -NR_PAGEFLAGS +#if ZONES_WIDTH +SECTIONS_WIDTH +NODES_SHIFT <=BITS_PER_LONG -NR_PAGEFLAGS #define NODES_WIDTH NODES_SHIFT -#else -#ifdef CONFIG_SPARSEMEM_VMEMMAP +#elif defined(CONFIG_SPARSEMEM_VMEMMAP )#error "Vmemmap: No space for nodes field in page flags" -#endif +#else #define NODES_WIDTH 0#endif +/* +* Note that this #define MUST have a value so that it can be tested with +* the IS_ENABLED() macro. +*/ +#if NODES_SHIFT !=0 &&NODES_WIDTH ==0 +#define NODE_NOT_IN_PAGE_FLAGS 1 +#endif + +#if defined(CONFIG_KASAN_SW_TAGS ) || defined(CONFIG_KASAN_HW_TAGS ) +#define KASAN_TAG_WIDTH 8 +#else +#define KASAN_TAG_WIDTH 0 +#endif +#ifdef CONFIG_NUMA_BALANCING #define LAST__PID_SHIFT 8#define LAST__PID_MASK ((1 << LAST__PID_SHIFT)-1)
@@ -77,37 +89,21 @@#define LAST_CPUPID_SHIFT 0#endif -#if defined(CONFIG_KASAN_SW_TAGS ) || defined(CONFIG_KASAN_HW_TAGS ) -#define KASAN_TAG_WIDTH 8 -#else -#define KASAN_TAG_WIDTH 0 -#endif - -#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_WIDTH +LAST_CPUPID_SHIFT +KASAN_TAG_WIDTH \ +#if ZONES_WIDTH +SECTIONS_WIDTH +NODES_WIDTH +KASAN_TAG_WIDTH +LAST_CPUPID_SHIFT \ <=BITS_PER_LONG -NR_PAGEFLAGS #define LAST_CPUPID_WIDTH LAST_CPUPID_SHIFT#else #define LAST_CPUPID_WIDTH 0#endif -#if SECTIONS_WIDTH +NODES_WIDTH +ZONES_WIDTH +LAST_CPUPID_WIDTH +KASAN_TAG_WIDTH \ +#if LAST_CPUPID_SHIFT !=0 &&LAST_CPUPID_WIDTH ==0 +#define LAST_CPUPID_NOT_IN_PAGE_FLAGS +#endif + +#if ZONES_WIDTH +SECTIONS_WIDTH +NODES_WIDTH +KASAN_TAG_WIDTH +LAST_CPUPID_WIDTH \ >BITS_PER_LONG -NR_PAGEFLAGS #error "Not enough bits in page flags"#endif -/* -* We are going to use the flags for the page to node mapping if its in -* there. This includes the case where there is no node, so it is implicit. -* Note that this #define MUST have a value so that it can be tested with -* the IS_ENABLED() macro. -*/ -#if !(NODES_WIDTH >0 ||NODES_SHIFT ==0 ) -#define NODE_NOT_IN_PAGE_FLAGS 1 -#endif - -#if defined(CONFIG_NUMA_BALANCING ) &&LAST_CPUPID_WIDTH ==0 -#define LAST_CPUPID_NOT_IN_PAGE_FLAGS -#endif -#endif #endif /* _LINUX_PAGE_FLAGS_LAYOUT */
mm/mm_init.c +0 -4
@@ -19,10 +19,6 @@#ifdef CONFIG_DEBUG_MEMORY_INIT int __meminitdata mminit_loglevel; -#ifndef SECTIONS_SHIFT -#define SECTIONS_SHIFT 0 -#endif -/* The zonelists are simply reported, validation is manual. */ void __init mminit_verify_zonelist (void ) {
Signature · 1 line
2.30.1.766.gb4fecdf3b7-goog