tools-testing-fix-testing-vma-and-testing-radix-tree-build.patch removed from -mm tree
The quilt patch titled
Subject: tools/testing: fix testing/vma and testing/radix-tree build
has been removed from the -mm tree. Its filename was
tools-testing-fix-testing-vma-and-testing-radix-tree-build.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: tools/testing: fix testing/vma and testing/radix-tree build
Date: Thu, 26 Feb 2026 01:31:11 +0200
Build of VMA and radix-tree tests is unhappy after the conversion of kzalloc() to kzalloc_obj() in lib/idr.c:
cc -I../shared -I. -I../../include -I../../arch/x86/include -I../../../lib -g -Og -Wall -D_LGPL_SOURCE -fsanitize=address -fsanitize=undefined -DNUM_VMA_FLAG_BITS=128 -DNUM_MM_FLAG_BITS=128 -c -o idr.o idr.c
idr.c: In function `ida_alloc_range':
idr.c:420:34: error: implicit declaration of function kzalloc_obj'; did you mean kzalloc_node'? [-Wimplicit-function-declaration]
420 | bitmap = kzalloc_obj(*bitmap, GFP_NOWAIT);
| ^~~~~~~~~~~
| kzalloc_node
idr.c:420:32: error: assignment to `struct ida_bitmap *' from `int' makes pointer from integer without a cast [-Wint-conversion]
420 | bitmap = kzalloc_obj(*bitmap, GFP_NOWAIT);
| ^
idr.c:447:40: error: assignment to `struct ida_bitmap *' from `int' makes pointer from integer without a cast [-Wint-conversion]
447 | bitmap = kzalloc_obj(*bitmap, GFP_NOWAIT);
| ^
idr.c:468:15: error: assignment to `struct ida_bitmap *' from `int' makes pointer from integer without a cast [-Wint-conversion]
468 | alloc = kzalloc_obj(*bitmap, gfp);
| ^make: *** [<builtin>: idr.o] Error 1
Import necessary macros from include/linux to tools/include/linux to fix the compilation.
---
tools/include/linux/gfp.h | 4 ++++ tools/include/linux/overflow.h | 19 +++++++++++++++++++ tools/include/linux/slab.h | 9 +++++++++ 3 files changed, 32 insertions(+)
tools/include/linux/gfp.h renamed from tools/include/linux/gfp.h~tools-testing-fix-testing-vma-and-testing-radix-tree-build +4 -0
@@ -5,6 +5,10 @@#include <linux/types.h> #include <linux/gfp_types.h> +/* Helper macro to avoid gfp flags if they are the default one */ +#define __default_gfp (a,...) a +#define default_gfp (...) __default_gfp(__VA_ARGS__ __VA_OPT__(,) GFP_KERNEL) +static inline bool gfpflags_allow_blocking (const gfp_t gfp_flags) {return !!(gfp_flags & __GFP_DIRECT_RECLAIM);
tools/include/linux/overflow.h renamed from tools/include/linux/overflow.h~tools-testing-fix-testing-vma-and-testing-radix-tree-build +19 -0
@@ -69,6 +69,25 @@ })/** +* size_mul() - Calculate size_t multiplication with saturation at SIZE_MAX +* @factor1: first factor +* @factor2: second factor +* +* Returns: calculate @factor1 * @factor2, both promoted to size_t, +* with any overflow causing the return value to be SIZE_MAX. The +* lvalue must be size_t to avoid implicit type conversion. +*/ +static inline size_t __must_check size_mul (size_t factor1,size_t factor2) +{ +size_t bytes; + +if (check_mul_overflow (factor1, factor2, &bytes)) +return SIZE_MAX ; + +return bytes; +} + +/** * array_size() - Calculate size of 2-dimensional array. * * @a: dimension one
tools/include/linux/slab.h renamed from tools/include/linux/slab.h~tools-testing-fix-testing-vma-and-testing-radix-tree-build +9 -0
@@ -202,4 +202,13 @@ static inline unsigned int kmem_cache_sh return sheaf->size; } +#define __alloc_objs (KMALLOC ,GFP ,TYPE ,COUNT ) \ +({ \ + const size_t __obj_size = size_mul(sizeof(TYPE), COUNT); \ + (TYPE *)KMALLOC(__obj_size, GFP); \ +}) + +#define kzalloc_obj (P , ...) \ + __alloc_objs(kzalloc, default_gfp(__VA_ARGS__), typeof(P), 1) +#endif /* _TOOLS_SLAB_H */
_
Patches currently in -mm which might be from [email protected] are
mm-dont-special-case-mmu-for-is_zero_pfn-and-my_zero_pfn.patch mm-rename-my_zero_pfn-to-zero_pfn.patch arch-mm-consolidate-empty_zero_page.patch mm-cache-struct-page-for-empty_zero_page-and-return-it-from-zero_page.patch