page flags: prioritize kasan bits over last-cpuid
PATCH v3 1/1 page flags: prioritize kasan bits over last-cpuid
ARM64 randdconfig builds regularly run into a build error, especially when NUMA_BALANCING and SPARSEMEM are enabled but not SPARSEMEM_VMEMMAP:
#error "KASAN: not enough bits in page flags for tag"
The last-cpuid bits are already contitional on the available space, so the result of the calculation is a bit random on whether they were already left out or not.
Adding the kasan tag bits before last-cpuid makes it much more likely to end up with a successful build here, and should be reliable for randconfig at least, as long as that does not randomize NR_CPUS or NODES_SHIFT but uses the defaults.
In order for the modified check to not trigger in the x86 vdso32 code where all constants are wrong (building with -m32), enclose all the definitions with an #ifdef.
---
v3: rework the #error message to make more sense
v2: fix a build regression with vdso32
--- include/linux/page-flags-layout.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
include/linux/page-flags-layout.h +11 -7
@@ -32,6 +32,7 @@#endif /* CONFIG_SPARSEMEM */ +#ifndef BUILD_VDSO32_64 /* * page->flags layout: *
@@ -76,20 +77,22 @@#define LAST_CPUPID_SHIFT 0#endif -#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_SHIFT +LAST_CPUPID_SHIFT <=BITS_PER_LONG -NR_PAGEFLAGS +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_TAG_WIDTH 8 +#else +#define KASAN_TAG_WIDTH 0 +#endif + +#if SECTIONS_WIDTH +ZONES_WIDTH +NODES_SHIFT +LAST_CPUPID_SHIFT +KASAN_TAG_WIDTH \ + <=BITS_PER_LONG -NR_PAGEFLAGS #define LAST_CPUPID_WIDTH LAST_CPUPID_SHIFT#else #define LAST_CPUPID_WIDTH 0#endif -#ifdef CONFIG_KASAN_SW_TAGS -#define KASAN_TAG_WIDTH 8#if SECTIONS_WIDTH +NODES_WIDTH +ZONES_WIDTH +LAST_CPUPID_WIDTH +KASAN_TAG_WIDTH \ >BITS_PER_LONG -NR_PAGEFLAGS -#error "KASAN: not enough bits in page flags for tag" -#endif -#else -#define KASAN_TAG_WIDTH 0 +#error "Not enough bits in page flags"#endif /*
@@ -104,4 +107,5 @@#define LAST_CPUPID_NOT_IN_PAGE_FLAGS #endif +#endif #endif /* _LINUX_PAGE_FLAGS_LAYOUT */
Signature · 1 line
2.20.0
Quoted 14 lines · Arnd Bergmann
ARM64 randdconfig builds regularly run into a build error, especially when
NUMA_BALANCINGand SPARSEMEM are enabled but notSPARSEMEM_VMEMMAP:#error "KASAN: not enough bits in page flags for tag"
The last-cpuid bits are already contitional on the available space, so the result of the calculation is a bit random on whether they were already left out or not.
Adding the kasan tag bits before last-cpuid makes it much more likely to end up with a successful build here, and should be reliable for randconfig at least, as long as that does not randomize
NR_CPUSorNODES_SHIFTbut uses the defaults.
Quoted 8 lines
In order for the modified check to not trigger in the x86 vdso32 code where all constants are wrong (building with -m32), enclose all the definitions with an #ifdef.
Fixes 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc")Reviewed-by Andrey Konovalov <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>