From patchwork Wed Sep 4 10:21:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13790370 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49939CD3431 for ; Wed, 4 Sep 2024 10:23:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDFFE8D024F; Wed, 4 Sep 2024 06:23:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C90628D0242; Wed, 4 Sep 2024 06:23:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B82BA8D024F; Wed, 4 Sep 2024 06:23:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9419C8D0242 for ; Wed, 4 Sep 2024 06:23:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 4949AA0F51 for ; Wed, 4 Sep 2024 10:23:01 +0000 (UTC) X-FDA: 82526667762.25.4B0E85E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 6F19A140010 for ; Wed, 4 Sep 2024 10:22:59 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lrPSuG+i; spf=pass (imf23.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=brauner@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725445331; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wbNz6RNjV9KoW5aO6PbBG7Un9bjRmB++cl0YdehIvX4=; b=KUXwpQGAItNrSzZQgetDwgseL/NrI9HF+d0KWCtwLJvc+cjWI1e7D1zzUs9QpALtVkTAoh 0OfEQru/BLrmSmpsP/Tc2ym340PygLtOyh76Fp/aQFYuurh/0zcOdYHFyG0MnPRCnQaHjc 8mJ5ClW0ZDuV/1BE7jqo3a1OKVvFzXM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=lrPSuG+i; spf=pass (imf23.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=brauner@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725445331; a=rsa-sha256; cv=none; b=FfPAsZwpxH6mXA8rsJT8TVcKJBPxoWhlVvOKEJ3tg9wQ06PbPGfoIHqz1Z3+LXexdNG1Yf qaeQmixVQ4a7SQhz5Ig7bm8nD4Vpxdl55wnMDj9dMNt9r3Zk3yyl4NUsZWSV/d0gluyC35 aTGkQ3o3IBpSyWAvWHh98YxyvxBexG8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 376245C5720; Wed, 4 Sep 2024 10:22:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA1E4C4CEC2; Wed, 4 Sep 2024 10:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725445378; bh=fyePhUeJgoPiuTJClIk+6OpwiFIuMNlpyvRSeOBVO/I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lrPSuG+iQHm9RvIy0WSzIC2PaCeqRuJifT/frNLorTp/Y+si8I22TATwm54EoN0D/ wF2P4/AMPbEdKK8eAUsdGJnFov14GBDKvKX233goB9TE5E+/nTOFTrtxZydchwpjK1 +0ROLJQWn2g/nElnAFEGmPaXKWER5LFg02TTLWE8FQYKvkqBiIj0JdJHaHPRCsfNeW z/GvHBdEK/9S6wPDwW2H85vXa1ChSZCNWtDyoMoRQhfHefYlRAxgclb4rvVPxQlxEL HaG1ACOdWYQDoDWn9c4EU632lFH62HODflmben8lJ2I1zQb7trHaHaGJlfVK93r/hW 5MIvW4MbSGP9w== From: Christian Brauner Date: Wed, 04 Sep 2024 12:21:22 +0200 Subject: [PATCH v3 17/17] io_uring: port to struct kmem_cache_args MIME-Version: 1.0 Message-Id: <20240904-work-kmem_cache_args-v3-17-05db2179a8c2@kernel.org> References: <20240904-work-kmem_cache_args-v3-0-05db2179a8c2@kernel.org> In-Reply-To: <20240904-work-kmem_cache_args-v3-0-05db2179a8c2@kernel.org> To: Vlastimil Babka , Jens Axboe , Jann Horn , Linus Torvalds , Mike Rapoport Cc: Kees Cook , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Christian Brauner X-Mailer: b4 0.15-dev-37811 X-Developer-Signature: v=1; a=openpgp-sha256; l=1645; i=brauner@kernel.org; h=from:subject:message-id; bh=fyePhUeJgoPiuTJClIk+6OpwiFIuMNlpyvRSeOBVO/I=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTdMNm954/H99mFK48VyBu05f33uZhWXFSRZ9Oa3Nj54 xK3WOHZjlIWBjEuBlkxRRaHdpNwueU8FZuNMjVg5rAygQxh4OIUgInU8jH8jxfh7RF5IrdmtcJi O4uEiafyNqqu2X9kyg62j7sr95lqdjH8D1pQYvVGdIZVkvf/uVXinWfkBDd91tHiPr1kRtkmwQZ rLgA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 6F19A140010 X-Stat-Signature: zkpfe3h516ta8me4h7mr9t6faepmxfcw X-HE-Tag: 1725445379-253397 X-HE-Meta: U2FsdGVkX1968wQelY1eZHlK6pLNFUGkNRh6ys4G7h3jdKVvEPlPUCva5gKyKEW+KVD7hA7BdUOUa96VAf8qzMl0xjXXHbC/7ZZLVFNhpPT1gnKYmg5hZflJsD5GJv66PN4PtwRovmiEVfLrFi2CP8sN8EP/FUZddnZS5vV66eMGSmJ6dNb6JJPepoHK6vd8HOD49TfX8MSwZCJEXG6xrjCDcO67j86bQS41JmSOjBIs2DqsU2+fllSlHx8nH7AD1B1gImvfoTxY2cbBOOUAyPHm0Gz8vXVdMyUlSDZen59laaFTYAdL5N09RUUs2bIDHhJGVMeb/e3yN+eGAeXxfiAwf62ZKRMnEe6DLE5o3IgOLjYkTSZLd9oNG8fHuAruRNUT2OkkSpQzbeUmcFlLHWHZ1aPVyEh6knK/6Fe9MniqQx2GvLLGwkJiozlGaWQZFCDQxLtRgw9faAmSRsQGcsJqDyxm8E4itErJwZASVLW1fbawprN39lePljbyWuXBy7eR9kZrQh5w5z+cOAnakUlxGSw6W1tbEOv+umhZoPxqy0cxGpiAywOCKjQOH003cgn3t73qhEiwmC0T0gkyPGCQ5nQy95qH2uZIVEqyl/we9lyZmv2NzLDKF1WxQEaP+gy0tqHvFNahWtAahCnWdPUsLDVA16ZIwbvKQIQZXPKqDQ3DGelYHpnHAHi+3Fh8snEf3Zvx+ZXvn8SCOz0XVIRDppqgDzEFsKFB8EZocbWne7VfGOhNWP/54nRoxusiJbWf9UJod6P3IkrYfK3myJDjtKpc4ebWsR0JkYJc4Ov5APSR+yii+nUJVOC65uc2HWUExmTbpAvyii3xsCZH80nt9Pfc45O3FAgx7fVIu616UBcC96jtFU6VJIWEOXYPT0V02N0R1rx874Vit6YAJOdOxSmNLoIJVwL0LfTbErV2PpUR1xKUsKwqKrIagimiG0iFp+NyuSp1E4/w2WL RDFg3kDz eCWp634py8QduqdxDAvXLb2bS8WHu5onWyd9DlRnHe/2OyxOMOqGqMNpV4TVZtRZnlPJ9tax99TubDWoPBkRx9FfZSnssy1Zp4u70sEEWqSTZYmZmLKVlUq8GP3Z+NMT2fFRm9JmSNKK4YURD8XBrQWasrKPuF1b3RTjb9zagSt2ynumI0UgawSl1uX/PUynCgX5jxbqiVSjt3GADxe3+AaSfaDpKyCP3Gn9AS97TaYd44tw+pOg92NqHKQYsEROlY9JJNfaCk/f+TX9r8w/A9TXfS8VSmvV2Ptt3pM4VNDiZcUmPFBTzFooQxg1KeBGoeS39AgCPzH11PQA9IWMnlQhUGyPRwRGm/9+K1B7JArN92WM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Port req_cachep to struct kmem_cache_args. Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Vlastimil Babka Signed-off-by: Christian Brauner --- io_uring/io_uring.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 3942db160f18..d9d721d1424e 100644 --- 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);