io_uring: port to struct kmem_cache_args

Port req_cachep to 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>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 3942db160f18ef3bc09c6f666724263a4117635d..d9d721d1424eb9637968a46233af838ab5d17913 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -3638,6 +3638,11 @@ SYSCALL_DEFINE2(io_uring_setup, u32, entries,
 
 static int __init io_uring_init(void)
 {
+       struct kmem_cache_args kmem_args = {
+               .useroffset = offsetof(struct io_kiocb, cmd.data),
+               .usersize = sizeof_field(struct io_kiocb, cmd.data),
+       };
+
 #define __BUILD_BUG_VERIFY_OFFSET_SIZE(stype, eoffset, esize, ename) do { \
        BUILD_BUG_ON(offsetof(stype, ename) != eoffset); \
        BUILD_BUG_ON(sizeof_field(stype, ename) != esize); \
@@ -3722,12 +3727,9 @@ static int __init io_uring_init(void)
         * range, and HARDENED_USERCOPY will complain if we haven't
         * correctly annotated this range.
         */
-       req_cachep = kmem_cache_create_usercopy("io_kiocb",
-                               sizeof(struct io_kiocb), 0,
-                               SLAB_HWCACHE_ALIGN | SLAB_PANIC |
-                               SLAB_ACCOUNT | SLAB_TYPESAFE_BY_RCU,
-                               offsetof(struct io_kiocb, cmd.data),
-                               sizeof_field(struct io_kiocb, cmd.data), NULL);
+       req_cachep = kmem_cache_create("io_kiocb", sizeof(struct io_kiocb), &kmem_args,
+                               SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT |
+                               SLAB_TYPESAFE_BY_RCU);
        io_buf_cachep = KMEM_CACHE(io_buffer,
                                          SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_ACCOUNT);