slab: silence sparse warning with type-based partitioning
Subsystems (3)
PATCH 1/1 slab: silence sparse warning with type-based partitioning
Sparse does not know __builtin_infer_alloc_token() and complains:
sparse: sparse: undefined identifier '__builtin_infer_alloc_token'
Fix it by using a dummy variant of __kmalloc_token() if __CHECKER__ is defined.
Fixes feb662d9168b ("slab: support for compiler-assisted type-based slab cache partitioning")
Reported-by kernel test robot <[email protected]>
Signed-off-by Marco Elver <[email protected]>
--- include/linux/slab.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/slab.h +5 -1
@@ -505,8 +505,12 @@ typedef struct { unsigned long v; } kmalloc_token_t;extern unsigned long random_kmalloc_seed;#define __kmalloc_token (...) ((kmalloc_token_t){ .v = _CODE_LOCATION_ })#elif defined(CONFIG_KMALLOC_PARTITION_TYPED ) +#ifdef __CHECKER__ +#define __kmalloc_token (...) ((kmalloc_token_t){ .v = 0 }) +#else /* !__CHECKER__ */ #define __kmalloc_token (...) ((kmalloc_token_t){ .v = __builtin_infer_alloc_token(__VA_ARGS__) }) -#endif +#endif /* __CHECKER__ */ +#endif /* CONFIG_KMALLOC_PARTITION_TYPED */ #define DECL_TOKEN_PARAM (_token) , kmalloc_token_t (_token)#define _PASS_TOKEN_PARAM (_token) , (_token)#define PASS_TOKEN_PARAM (_token) (_token)
Signature · 1 line
2.55.0.229.g6434b31f56-goog
Vlastimil Babka (SUSE)
maintainerQuoted 11 lines · Marco Elver
Sparse does not know
__builtin_infer_alloc_token()and complains:sparse: sparse: undefined identifier '
__builtin_infer_alloc_token'Fix it by using a dummy variant of
__kmalloc_token()if__CHECKER__is defined.Fixes feb662d9168b ("slab: support for compiler-assisted type-based slab cache partitioning")Reported-by kernel test robot <[email protected]>Signed-off-by Marco Elver <[email protected]>
Added to slab/for-next-fixes, thanks!
Quoted 22 lines
--- include/linux/slab.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)include/linux/slab.h +5
-1@@ -505,8 +505,12 @@ typedef struct { unsigned long v; } kmalloc_token_t;extern unsigned long random_kmalloc_seed;#define __kmalloc_token (...) ((kmalloc_token_t){ .v = _CODE_LOCATION_ })#elif defined(CONFIG_KMALLOC_PARTITION_TYPED ) +#ifdef __CHECKER__ +#define __kmalloc_token (...) ((kmalloc_token_t){ .v = 0 }) +#else /* !__CHECKER__ */ #define __kmalloc_token (...) ((kmalloc_token_t){ .v = __builtin_infer_alloc_token(__VA_ARGS__) }) -#endif +#endif /* __CHECKER__ */ +#endif /* CONFIG_KMALLOC_PARTITION_TYPED */ #define DECL_TOKEN_PARAM (_token) , kmalloc_token_t (_token)#define _PASS_TOKEN_PARAM (_token) , (_token)#define PASS_TOKEN_PARAM (_token) (_token)
Quoted 4 lines · Marco Elver
Sparse does not know
__builtin_infer_alloc_token()and complains:sparse: sparse: undefined identifier '
__builtin_infer_alloc_token'
Quoted 8 lines
Fix it by using a dummy variant of
__kmalloc_token()if__CHECKER__is defined.Fixes feb662d9168b ("slab: support for compiler-assisted type-based slab cache partitioning")Reported-by kernel test robot <[email protected]>Signed-off-by Marco Elver <[email protected]>---
FWIW,
Quoted 21 lines
include/linux/slab.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)include/linux/slab.h +5
-1@@ -505,8 +505,12 @@ typedef struct { unsigned long v; } kmalloc_token_t;extern unsigned long random_kmalloc_seed;#define __kmalloc_token (...) ((kmalloc_token_t){ .v = _CODE_LOCATION_ })#elif defined(CONFIG_KMALLOC_PARTITION_TYPED ) +#ifdef __CHECKER__ +#define __kmalloc_token (...) ((kmalloc_token_t){ .v = 0 }) +#else /* !__CHECKER__ */ #define __kmalloc_token (...) ((kmalloc_token_t){ .v = __builtin_infer_alloc_token(__VA_ARGS__) }) -#endif +#endif /* __CHECKER__ */ +#endif /* CONFIG_KMALLOC_PARTITION_TYPED */ #define DECL_TOKEN_PARAM (_token) , kmalloc_token_t (_token)#define _PASS_TOKEN_PARAM (_token) , (_token)#define PASS_TOKEN_PARAM (_token) (_token)
Signature · 2 lines
Cheers, Harry / Hyeonggon