From patchwork Tue Sep 3 14:20:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13788788 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 6E4A2CD3439 for ; Tue, 3 Sep 2024 14:22:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F1AE8D017C; Tue, 3 Sep 2024 10:22:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39E128D0151; Tue, 3 Sep 2024 10:22:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 131BC8D017C; Tue, 3 Sep 2024 10:22:40 -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 DFB348D0151 for ; Tue, 3 Sep 2024 10:22:39 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9235840414 for ; Tue, 3 Sep 2024 14:22:39 +0000 (UTC) X-FDA: 82523642838.05.E4E7597 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf25.hostedemail.com (Postfix) with ESMTP id 9FD01A000D for ; Tue, 3 Sep 2024 14:22:37 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HU3gT6w0; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of brauner@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=brauner@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725373287; a=rsa-sha256; cv=none; b=Ab11Yi0PLOCuvR9+gsODFfAx+6SI7oDho+I1+P5veib0sny9JE5RP6wPvbqfx1r1xXAIxq bI+XTncDnDBeHWwFzKiF/3PCPd88khOTgepnxPYlza/BjF6G0sN8vjO8o79/OAnrcOaEkl V5u9QaoBqTkTSE1wDT/pjcORe/vxgkQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HU3gT6w0; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of brauner@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=brauner@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725373287; 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=yEY0+sYD4afS7Y69IH9fptdKaBQqOQvxxzlHkXobPM4=; b=ri1hA6I1psq0ob79H/eYZeMXJFUw///DWrMaR+pKxbHBP1qEVkzzktqUEyr7eA4Wypl+S9 vmyOUvyIqsKNLKG18mitlhx3GNaGyacFX8lKcBXI2ti+Pvg8eNFNW3DR8xh19oPkwuQTCf B1MqT9k5SHWaS1/9N9sfnmCz5sst+qQ= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id D150FA4363C; Tue, 3 Sep 2024 14:22:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6A06C4CEC9; Tue, 3 Sep 2024 14:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725373356; bh=Kwi+I1VrtzNjFT2qOG43GSdAkcM45KGq+XLRDdRsBW4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HU3gT6w0kxMRCh5cjqQ6GVZT9zHNO+tW5OEaJBvo0wqjvITuNxXJnWE0javyOTqvr FQwWfOYB3XwW8uiTGL2BRtw0FoBY4nIFYHGzhueA7CW6+ZyWob9/v19WpyvgykMF4F 0P5Y++52gJVpGcEw0uSSOQl7l/1cihjlemmOLneEIhFzMqJeYJJTjt7Sh9wrB3qQZL zetPgbUDZvBTIRqtEdsoFD8Ulima2cMJVWDVNxfp/B1qF2Xnx2SVhJALGh05CPWFwm 6zvELTznDpr/2y7c4+PII7Y1eE8bujIG2SPWHhcRfP6+MLYRrjAPDYDXSFPKDYKOUF OXufpqNfUg41g== From: Christian Brauner Date: Tue, 03 Sep 2024 16:20:47 +0200 Subject: [PATCH v2 06/15] slab: pass struct kmem_cache_args to create_cache() MIME-Version: 1.0 Message-Id: <20240903-work-kmem_cache_args-v2-6-76f97e9a4560@kernel.org> References: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> In-Reply-To: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> To: Vlastimil Babka , Jens Axboe , Jann Horn , Linus Torvalds , Mike Rapoport Cc: 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=3048; i=brauner@kernel.org; h=from:subject:message-id; bh=Kwi+I1VrtzNjFT2qOG43GSdAkcM45KGq+XLRDdRsBW4=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRdl54t6HCjduvW5zuL87Xma60vmixz2EVi+v1EUzOu/ KIdp1n2dZSyMIhxMciKKbI4tJuEyy3nqdhslKkBM4eVCWQIAxenAEzkdTcjw1bOm71eDxO4vzrM tfp8IvronE09clPakure3Xb5PMPU4hQjw+M3m9gORTG+O3BeYtH19PclB7bZnHnHsN+5Xm53kE4 CIzsA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Rspamd-Queue-Id: 9FD01A000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 4gfn8c4j9owxcxhomone4fee8agubqqf X-HE-Tag: 1725373357-778771 X-HE-Meta: U2FsdGVkX183GBbLDV7asRmE+N5mFoh4K1xHfLeahuXA7ifzULfABqE9c+IqrBVsyrXB+PeAW1Lz/eRvios+pu/KA4oddSiFdHKkvdxkHTZALVyO4EnuDMwt25OTDXn2z9ht9nGhngZGbHTfrSts5ojAYwZfbv/0uw0gGbahuFZnFGGDeC8xJAkW/nbCYB0DeVg4IFwZneJ7kXhuh0rlQd6cVu7XvSKWCseNpOG0Jkvg6OkVjCH4IuFPdxKusvyZToXnSjOr8jzje0rU7sZLYmx55JEJSOvfOv/V4cZdVuiPYoUcYbcDiw3KIPP+s9R69hVhjQRWI8VOfA5iVYkJAyWczXv59adhdbNce9e2JLlMgD8IfVrlI95u45u90erVU3Bwdx3QbWNqC8HoA4wj7c7kZvrnlKUMP4f2GVxKZ+G6hQB2PW9j0tozfLcpeFpVTNvydW5fCwNextwMFifSnHwc7YlE+aGQ1QQIL8wth5svsi5A092PWq0HdyMiLSQeYHOGD45OiJhP5BOoxXGQ0X/PJA7YAEDVvRCqgB4l36jKorrikZ/EUgNoNtccaT+0w1+EeGmEnNEAwgQjtW86FiTt3rpL2wv3AD0N3dDB94ILQ+ytjWh88uBGz4wvcdqSoRcJb9PzgjfcRINlD95hd118QBXmj3/az98wRWUJtWv5q8EuCx3R2JBlYDveziHMFKomh47qIOAtG5XtXMYEsyShqtPaIhcitSkWr+VaImvPEbjaCeZLOU2DtMf3QYoNTDOVlz5ImLmbCqQZArvNsObPQSYX3tQv2+IYTtiXcwq/ESADQQoRcT/dLLarmSf+MwxuWraYWUikkTcr7GZu9fY2IJFn6tg1NpM6jp05LA1A1H085AvY1LHjdJbCsfncgSzN4UxpNbQdTdF0jpbFG8XwsIwgSn6Q7qG+QuhW1yxe5p+SFlycRajr3tBAz4C8RqPX6Wkvc5+jN1AbS2d sPFTo4Uv 2QCIYrKux7aLKfRLvlPgjdZuPBLTMihcTP64D39FdANFgKBGyhtJAYO8pNHsw5T5LpcCSB0Z+1kif+FatppP3rN4SSCMDIMP373qjJWJADZ+du2ppoUHUh40JCf0e//5E2elJ/Bx1EuAsQ4oiDlAU8pPXJAD+cu6uQ19HVP+go0Z0Z+uMseumeYmQhi+2Ii7VJXhpjLl7106pbPG9HlbEAPor/rO2uV27xy5i+H5BVN7Uhy3rkj6YQdZ2Zqu5REfZY9fKLwni4JXph3/DyEHOXaB0zWreiNthb/1G 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: Pass struct kmem_cache_args to create_cache() so that we can later simplify further helpers. Signed-off-by: Christian Brauner Reviewed-by: Mike Rapoport (Microsoft) --- mm/slab_common.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/mm/slab_common.c b/mm/slab_common.c index 16c36a946135..9baa61c9c670 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -202,22 +202,22 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, } static struct kmem_cache *create_cache(const char *name, - unsigned int object_size, unsigned int freeptr_offset, - unsigned int align, slab_flags_t flags, - unsigned int useroffset, unsigned int usersize, - void (*ctor)(void *)) + unsigned int object_size, + struct kmem_cache_args *args, + slab_flags_t flags) { struct kmem_cache *s; int err; - if (WARN_ON(useroffset + usersize > object_size)) - useroffset = usersize = 0; + if (WARN_ON(args->useroffset + args->usersize > object_size)) + args->useroffset = args->usersize = 0; /* If a custom freelist pointer is requested make sure it's sane. */ err = -EINVAL; - if (freeptr_offset != UINT_MAX && - (freeptr_offset >= object_size || !(flags & SLAB_TYPESAFE_BY_RCU) || - !IS_ALIGNED(freeptr_offset, sizeof(freeptr_t)))) + if (args->use_freeptr_offset && + (args->freeptr_offset >= object_size || + !(flags & SLAB_TYPESAFE_BY_RCU) || + !IS_ALIGNED(args->freeptr_offset, sizeof(freeptr_t)))) goto out; err = -ENOMEM; @@ -227,12 +227,15 @@ static struct kmem_cache *create_cache(const char *name, s->name = name; s->size = s->object_size = object_size; - s->rcu_freeptr_offset = freeptr_offset; - s->align = align; - s->ctor = ctor; + if (args->use_freeptr_offset) + s->rcu_freeptr_offset = args->freeptr_offset; + else + s->rcu_freeptr_offset = UINT_MAX; + s->align = args->align; + s->ctor = args->ctor; #ifdef CONFIG_HARDENED_USERCOPY - s->useroffset = useroffset; - s->usersize = usersize; + s->useroffset = args->useroffset; + s->usersize = args->usersize; #endif err = do_kmem_cache_create(s, flags); if (err) @@ -265,7 +268,6 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, slab_flags_t flags) { struct kmem_cache *s = NULL; - unsigned int freeptr_offset = UINT_MAX; const char *cache_name; int err; @@ -323,11 +325,8 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, goto out_unlock; } - if (args->use_freeptr_offset) - freeptr_offset = args->freeptr_offset; - s = create_cache(cache_name, object_size, freeptr_offset, - calculate_alignment(flags, args->align, object_size), - flags, args->useroffset, args->usersize, args->ctor); + args->align = calculate_alignment(flags, args->align, object_size); + s = create_cache(cache_name, object_size, args, flags); if (IS_ERR(s)) { err = PTR_ERR(s); kfree_const(cache_name);