From patchwork Wed Sep 4 10:21:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13790355 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 6507BCA0ED3 for ; Wed, 4 Sep 2024 10:22:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EB5E08D0243; Wed, 4 Sep 2024 06:22:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3CF38D0242; Wed, 4 Sep 2024 06:22:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB7938D0243; Wed, 4 Sep 2024 06:22:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A44EC8D0242 for ; Wed, 4 Sep 2024 06:22:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2657AA9E45 for ; Wed, 4 Sep 2024 10:22:02 +0000 (UTC) X-FDA: 82526665284.16.26AA3F5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 549EC40019 for ; Wed, 4 Sep 2024 10:22:00 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="R1y/uMG6"; spf=pass (imf17.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=1725445224; 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=jxVftAYU0xDJ8Ce3plBhtpBX6qnB3UkHBV8DhWYp8Qo=; b=m+wkY7ksCDS1cxshcEUw45liTXkdGXjWa44+8IjMuhcjK7ACYClDwnc7dH/3duy+cNoJvd IZZ3VsY5+YBvXLEVUCVS3UQF34nNinoAIQ97MFpdndasGdTKw+DUR4D6KoIwjRZ1uf64p1 ZuRqLTzZLSR87PZEREHy3cEijIF1LXI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725445224; a=rsa-sha256; cv=none; b=yZhExTFJ9xnLe6hTtG7cnLyNTMV7ur9u+pguq4L/M++XWKriBBp10QXwhCsD2bQl0A6CV7 GCB6f5MNOoPFKKiQtL39F9ExbcvA9tMhc8lDBWe6X4vPdtpeHyx2rw0FcWsLm94brOgWyU RnUrgIt4IDLKGKP3MZkjgJuRKttJzag= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="R1y/uMG6"; spf=pass (imf17.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0AA1B5C5706; Wed, 4 Sep 2024 10:21:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0DB0C4CEC6; Wed, 4 Sep 2024 10:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725445319; bh=YrF0YLTWmhzO7ohK2/AAEF++N1Zrk2GGMPwzT5f/roQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=R1y/uMG6e0aaQJlJr5qnvCpHQ3FGR8xCSzgrJj43XHhClJcTH4aQgaRS0vIgoHBt1 jw1g4OsII1pDgv1IGB/YhIhdBx2fO2Ffq3uhe3aCPNGgyPcF/W3VCB+Q7u79OOzaUD cVhFkmhqSf5uA3i4oRlL38Oe6CMmbIMWymgqw+7gO/ElkY7Mp2Bac/wpTba6o4VAZ/ jEZvnnO9LHyDpghOuFNmjRsPUZl40k3dCPjCFn3294/WQRCsfb7Y6FnjVZQwM8XgOS y4FhlZBWVAFW601oThoHu20D5kW0/nsSXsajbVjzMdaPQqDh3LPyIF+xk17yYUY9Wj WbK8uxxKCt+AA== From: Christian Brauner Date: Wed, 04 Sep 2024 12:21:07 +0200 Subject: [PATCH v3 02/17] slab: add struct kmem_cache_args MIME-Version: 1.0 Message-Id: <20240904-work-kmem_cache_args-v3-2-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=5895; i=brauner@kernel.org; h=from:subject:message-id; bh=YrF0YLTWmhzO7ohK2/AAEF++N1Zrk2GGMPwzT5f/roQ=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTdMNn5Zy1b43m913E1vBfFXhlN6hf4K6t8o4d1sZH0D NOX0RkaHaUsDGJcDLJiiiwO7Sbhcst5KjYbZWrAzGFlAhnCwMUpABOxncrw32W15y+9mCesh/rF jnjanXMQy1z6QeRw3pwetYV7bfi1LjMyfM0T6tlg35cW4vT058FtGzhnW3B/aNK0zY/a8sgoNP0 6MwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 549EC40019 X-Stat-Signature: y6mbywqxubhz74urjajcru778hkdzjok X-HE-Tag: 1725445320-133885 X-HE-Meta: U2FsdGVkX19X/0+7Il4bfzxRxTGycKDx4pHj6Y7RYloEjWN7FVha0SeYj82YXEGYYLJR1dyC+t5pCv2JT2hts5SKCZAtVnNY2A3KHsZOJNuf+/s6jjXYN8EEwSBg4zYEVhxsku/fWcoJOTybcCCxK7/BrVA67mqQMFLvHW09LGGUNOghA3zlA1hnCXK0GfZngOSCnM+JAhWnoC0JZYy+0vvTl9JKc2+8FkXl1m2Chv/dtCFSP7Jxvy7TEE6xd80en+lcjPpd7AE1pV8o/2cKUVe69VunjlXndhHJ6qjCYk/wN4pNR3r1Lpho/ucuoznUr+XWn2wrjWcSy4mr6N+UAPUiZ/RTQCeoh09472C1crjgXKJVNK6l34xx/zhPFzavxWnoDSKtSs64tuk2AZ1g5S9XkK/FHsubFND+EJYN1Jb7mnc1GErwRV5sCPeY7OCaCKPNMwtXMeasdBZn0Z7HB4qlBIXEdJNu2aXxwXnRKm422uDwJauGZwh+tRxE70lpC5XhTxoGDAL3NcWoM2LqjvTqo2M+zkFGiI3MR15a1ja79CJF9bxDIHPbwpTpPbICbUh6xd8lCOBu8KK3rNZP02I5esaL2afkjId+b71/FdIaHEmu1WaOcwlqDtmc7/Bx7iez2rfllmc9c73JJrtc204OBRqyEeMBJxFjtFT6JN2/ok1/ty9wpmP+2Y5rJO/LCg3s+mxBGCz9bQhjVrx+DY6SMn6uKnRunM25/M4bmcNaRCrBbE5lkGYpV9t+6nY6IlwwMXe5QI1BTsEDk+RU3p19hHgjSGphKKVtuZSictu96lzIj7wkucSeqb7cSGiG3Ubiu3MIZtISc25bmTasd91dF22WAMxsyZEK7Zt4Mc1G2ZxAlI2xDl7+B+m6Tjygu5HCy8bBa6HBc0fJ2FGUbNsvlXEBU/WWCdfk3dCJ9KLRWpbfAEq2LOLRWmwXaYQtdhsP15BbXxbQR9Xcaq/ KcK7ahtc rLQo/44gyRnyO7F/u/Q7FSWw/qOtD9PmkVDeKpUwZXTAkAvbCoUqCxp2wa3wWNhP5eoU+NkLigVTql7cZKLChoU2mT5LqWfhEV/rNy45cH7Ja26A5oCqJiNg3jTuUa9B8XtWJDJYVWMVbGq/mOJltS6s61ZjfekTXCV4RSG1wVJwUD78Si182LYfUbWqRy/xXI0ZI4wwMYyjUoBiD6sMGtT2hGtJaRJYG2BEVuOuTk7HoHoTDj6LZxoOgJ2ProYOI44/p11fpSMsCMQv62qYXuJWmH8uk+YBr94SZ5CGTtQko7+MO0XvkwJhTcXD4mP1lytTvk4Z6gK41W7iqiDrM3vJ5kr2JSSWGh/nNBxer82UjQf4= 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: Currently we have multiple kmem_cache_create*() variants that take up to seven separate parameters with one of the functions having to grow an eigth parameter in the future to handle both usercopy and a custom freelist pointer. Add a struct kmem_cache_args structure and move less common parameters into it. Core parameters such as name, object size, and flags continue to be passed separately. Add a new function __kmem_cache_create_args() that takes a struct kmem_cache_args pointer and port do_kmem_cache_create_usercopy() over to it. In follow-up patches we will port the other kmem_cache_create*() variants over to it as well. Reviewed-by: Kees Cook Reviewed-by: Jens Axboe Reviewed-by: Mike Rapoport (Microsoft) Reviewed-by: Vlastimil Babka Signed-off-by: Christian Brauner --- include/linux/slab.h | 21 ++++++++++++++++ mm/slab_common.c | 67 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 5b2da2cf31a8..79d8c8bca4a4 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -240,6 +240,27 @@ struct mem_cgroup; */ bool slab_is_available(void); +/** + * @align: The required alignment for the objects. + * @useroffset: Usercopy region offset + * @usersize: Usercopy region size + * @freeptr_offset: Custom offset for the free pointer in RCU caches + * @use_freeptr_offset: Whether a @freeptr_offset is used + * @ctor: A constructor for the objects. + */ +struct kmem_cache_args { + unsigned int align; + unsigned int useroffset; + unsigned int usersize; + unsigned int freeptr_offset; + bool use_freeptr_offset; + void (*ctor)(void *); +}; + +struct kmem_cache *__kmem_cache_create_args(const char *name, + unsigned int object_size, + struct kmem_cache_args *args, + slab_flags_t flags); struct kmem_cache *kmem_cache_create(const char *name, unsigned int size, unsigned int align, slab_flags_t flags, void (*ctor)(void *)); diff --git a/mm/slab_common.c b/mm/slab_common.c index 91e0e36e4379..0f13c045b8d1 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -248,14 +248,24 @@ static struct kmem_cache *create_cache(const char *name, return ERR_PTR(err); } -static struct kmem_cache * -do_kmem_cache_create_usercopy(const char *name, - unsigned int size, unsigned int freeptr_offset, - unsigned int align, slab_flags_t flags, - unsigned int useroffset, unsigned int usersize, - void (*ctor)(void *)) +/** + * __kmem_cache_create_args - Create a kmem cache + * @name: A string which is used in /proc/slabinfo to identify this cache. + * @object_size: The size of objects to be created in this cache. + * @args: Arguments for the cache creation (see struct kmem_cache_args). + * @flags: See %SLAB_* flags for an explanation of individual @flags. + * + * Cannot be called within a interrupt, but can be interrupted. + * + * Return: a pointer to the cache on success, NULL on failure. + */ +struct kmem_cache *__kmem_cache_create_args(const char *name, + unsigned int object_size, + struct kmem_cache_args *args, + slab_flags_t flags) { struct kmem_cache *s = NULL; + unsigned int freeptr_offset = UINT_MAX; const char *cache_name; int err; @@ -275,7 +285,7 @@ do_kmem_cache_create_usercopy(const char *name, mutex_lock(&slab_mutex); - err = kmem_cache_sanity_check(name, size); + err = kmem_cache_sanity_check(name, object_size); if (err) { goto out_unlock; } @@ -296,12 +306,14 @@ do_kmem_cache_create_usercopy(const char *name, /* Fail closed on bad usersize of useroffset values. */ if (!IS_ENABLED(CONFIG_HARDENED_USERCOPY) || - WARN_ON(!usersize && useroffset) || - WARN_ON(size < usersize || size - usersize < useroffset)) - usersize = useroffset = 0; - - if (!usersize) - s = __kmem_cache_alias(name, size, align, flags, ctor); + WARN_ON(!args->usersize && args->useroffset) || + WARN_ON(object_size < args->usersize || + object_size - args->usersize < args->useroffset)) + args->usersize = args->useroffset = 0; + + if (!args->usersize) + s = __kmem_cache_alias(name, object_size, args->align, flags, + args->ctor); if (s) goto out_unlock; @@ -311,9 +323,11 @@ do_kmem_cache_create_usercopy(const char *name, goto out_unlock; } - s = create_cache(cache_name, size, freeptr_offset, - calculate_alignment(flags, align, size), - flags, useroffset, usersize, ctor); + 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); if (IS_ERR(s)) { err = PTR_ERR(s); kfree_const(cache_name); @@ -335,6 +349,27 @@ do_kmem_cache_create_usercopy(const char *name, } return s; } +EXPORT_SYMBOL(__kmem_cache_create_args); + +static struct kmem_cache * +do_kmem_cache_create_usercopy(const char *name, + unsigned int size, unsigned int freeptr_offset, + unsigned int align, slab_flags_t flags, + unsigned int useroffset, unsigned int usersize, + void (*ctor)(void *)) +{ + struct kmem_cache_args kmem_args = { + .align = align, + .use_freeptr_offset = freeptr_offset != UINT_MAX, + .freeptr_offset = freeptr_offset, + .useroffset = useroffset, + .usersize = usersize, + .ctor = ctor, + }; + + return __kmem_cache_create_args(name, size, &kmem_args, flags); +} + /** * kmem_cache_create_usercopy - Create a cache with a region suitable