From mboxrd@z Thu Jan 1 00:00:00 1970 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 A8669CD3431 for ; Wed, 4 Sep 2024 09:06:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 384A26B00AB; Wed, 4 Sep 2024 05:06:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30B0F6B0163; Wed, 4 Sep 2024 05:06:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CAFC8D0242; Wed, 4 Sep 2024 05:06:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DB2D38D0239 for ; Wed, 4 Sep 2024 05:06:58 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 85885A0C93 for ; Wed, 4 Sep 2024 09:06:58 +0000 (UTC) X-FDA: 82526476116.20.4948C94 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf19.hostedemail.com (Postfix) with ESMTP id E0EF81A000C for ; Wed, 4 Sep 2024 09:06:56 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="PuG1Q/25"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.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=1725440710; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oCgZ8vTY9f1hB++WDpklduvozT4Rrp+6kijd5Jx9ApA=; b=yJAW0dc6OcSFdnPiY4K3ggF46JU1bAOg7biVuN5X/xlcWCI/HUky3nA4YVoo/nfeusvEVG Ggw1J20Pbdvq7jeIYHh05zrvz8jWgz/3rWvo0IxQN+OW/k6nCQQKVI9KKXK9eEg156uN8I QXakNn0j3/IqhB+hP7yzj0JXw7ElTfk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725440710; a=rsa-sha256; cv=none; b=NKs0R4gPsfzUUBVBEj9C0kxIPZKJsxyb4BWic+8KKBX65qhcId9eOqrDRP/9fszSzt0OZN wh3qkqHoTqi/5iIuw+kXwVIW+pR4s9M1zOOArihfF3zJf6UlgiVRhUfCLx/m9fssx9z4QZ 5kmu9qM4oKtiAG3mqYRW2RYiUNP66mM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="PuG1Q/25"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of brauner@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=brauner@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 047DDA4319E; Wed, 4 Sep 2024 09:06:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15895C4CEC2; Wed, 4 Sep 2024 09:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725440815; bh=8pXHE83HSgNwFHSJezj0X5u1fo8c8fnfaOMKDRq/dGA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PuG1Q/252JCVeDWOig9aL6xZcgQP62JDdfn6J5sJ91mmt//4+mVtwo4L7fEilCwcd gTE42WmDbjOmSUIch+9232b/zyR93NHEFKtcyStQN+ltsL8h1MYnIKlHJWk4Pr4TPp xW9Y67S5Ljg5PqWAbRelQ58HybRnNomyhOSIOjkBp8fU9MJG2qkUmedklL3fhDN9ss r+oSJmAboOu2NQ9zcjKVY6YRPP6UDU4qFSp/Cz7R5ygEovY3WA4B9W1QzZsBwQnSor 5RW22RtdWQWkrqWriWkRi9CPUnTOiEBH6n4qH7bylRhZY11ufsi+MqHEtOjQ5A1lRl +Nt0mdkVeXEtw== Date: Wed, 4 Sep 2024 11:06:51 +0200 From: Christian Brauner To: Vlastimil Babka Cc: Jens Axboe , Jann Horn , Linus Torvalds , Mike Rapoport , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v2 02/15] slab: add struct kmem_cache_args Message-ID: <20240904-trieb-waran-bcca80d7e223@brauner> References: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> <20240903-work-kmem_cache_args-v2-2-76f97e9a4560@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E0EF81A000C X-Stat-Signature: q8fxp86x3ta4rptgf6ctkxzwcqb4nbqr X-Rspam-User: X-HE-Tag: 1725440816-464430 X-HE-Meta: U2FsdGVkX1+16OrcQDGOdZu1IQ1fyj6ucp+hdOXqQu/QOe4OdW4yGk+8gkAXf740Dh8hDIIL2fe4oTFlYy9BCcMt9tzzWgt3VR1mdj3CuQHvzRVs+AdPTV/c0hr76a4F9DKFAhnGo6L3OCj5BZ0VwvFDn2pRFr3dlXCMEW7FAtDboGJcIQbW7wA9DcdVMGNCV6xk9loFKBRfX/ifxY30OkWguyBjnO3F6xw0rNxAZVp4afeDO8G8UtBWhbIDQFBhYkpcb7HToP5+qKuN6rGQCuVj/FN+3ior51Keh+RMWbudMEFpMHCTZLQyOd7s8EfxdO74pbLGtJYs8H/QfkqNc0aRiXgTIx/Oyv9NTTYVCVsrN9/SErJzpG+GvLNOUoE/bWzzdAMmYDgszRh2+3wwnvpxuZ9gBPp/oTncbnMqLTfjVozYdEhXLCWKR5yf1kuZtwnV1xJo6kepvdkvF3icpCzg1+3lFoQndKUD+L40xqP0XqdziDPemmYlT4SMgega91IzoTHkU29E9LKdjn3/8+p1+/GjPf4k92DCaWBTHtJEW3FA6Rw56+PEUEAwTXoTZUOVx7BiS0M5BibO4mA7i1Z2iibabKUvybsj0lWgdgufs6plSMgk0Ids2383qQ5yEnZShT+HG2NYgzKcC4p5uNSAcu0tKaEKT62VbZtgg+5PUtr6xGW7t7dfy2R4UM6swMIMAGrffZF9w2Un16EzyeHOrPH8gv8YczKH0wQFp01Nm3aclpQgSo/u3E0Nc4PH8e26HwrU89jzB7JNFOcIbE2Oivd6eps5kAHAoSn57Xw7zsLx0/TCVDWRdDSKH6kyy/GOc1vNf4RLTALNWPTTi6JmbNVjwnJVTPyO7Ge6BPs/fez66+sbw+S0gJwATNcPWT79gxFBM3jjk7wVQyeT8Hqci0/EcZYwFCDnHKF/S4Mib1qIXShU7Qe8ZL3+LJPVnp1mAjY3JJYfMy3CAHz VxJGwkGz ZhFc28IsuPgtFsIaxSunTv+PQSqaSwuiKhfwlfCfpIEhmVsWab6ngzuh4hZvNtbMoSB0+lNnLqi5MBWMg/P90C0rTNimceB63Z+F7isfTEsWQDezGN/x/g9piw+YF1JUYbltyeNS0mL2U93VJDCrFxxADJLYLxyUppl91Hg0pyT1azbKdkCFk1zPPO0FTXX+aJfX/2ak81INbtLsEjRz95UepjcQlQHW79VJCxyKBL7KS4RCdiq6w7gnslR5IxEu1fpn90ZYhUdV8pl79TcGZga9DZI1VyR+OK2XkUVKwxqCmD4Ed1N6Kqs98hfQllJGjHdmDO+YfsbtL4hxha6RxnfQqnPE9Uk3RxPftuqLPUyZHHBgR4t++BetKow== 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: On Wed, Sep 04, 2024 at 10:13:11AM GMT, Vlastimil Babka wrote: > On 9/3/24 16:20, Christian Brauner wrote: > > You could describe that it's to hold less common args and there's > __kmem_cache_create_args() that takes it, and > do_kmem_cache_create_usercopy() is converted to it? Otherwise LGTM. Hm, I seem to have dropped the contents of the commit message when I split it into multiple individual commits. I've now added: "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." to the work.kmem_cache_args branch. > > > 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 > > >