slab: port KMEM_CACHE_USERCOPY() to struct kmem_cache_args

Make KMEM_CACHE_USERCOPY() use struct kmem_cache_args.

Reviewed-by: Kees Cook <kees@kernel.org>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 1f38d94387cc0ac8b5d21a15eeeb34e9a5c253e7..7e15a3a3edb19720e68b5d22dd2b6364ff674173 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -294,12 +294,13 @@ int kmem_cache_shrink(struct kmem_cache *s);
  * To whitelist a single field for copying to/from usercopy, use this
  * macro instead for KMEM_CACHE() above.
  */
-#define KMEM_CACHE_USERCOPY(__struct, __flags, __field)                        \
-               kmem_cache_create_usercopy(#__struct,                   \
-                       sizeof(struct __struct),                        \
-                       __alignof__(struct __struct), (__flags),        \
-                       offsetof(struct __struct, __field),             \
-                       sizeof_field(struct __struct, __field), NULL)
+#define KMEM_CACHE_USERCOPY(__struct, __flags, __field)                                                \
+       __kmem_cache_create_args(#__struct, sizeof(struct __struct),                            \
+                       &(struct kmem_cache_args) {                                             \
+                               .align          = __alignof__(struct __struct),                 \
+                               .useroffset     = offsetof(struct __struct, __field),           \
+                               .usersize       = sizeof_field(struct __struct, __field),       \
+                       }, (__flags))
 
 /*
  * Common kmalloc functions provided by all allocators