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 6F693CD37AE for ; Wed, 4 Sep 2024 05:05:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C920F8D0227; Wed, 4 Sep 2024 01:05:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C429D8D018A; Wed, 4 Sep 2024 01:05:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B09938D0227; Wed, 4 Sep 2024 01:05:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8F5EE8D018A for ; Wed, 4 Sep 2024 01:05:29 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0007C80D4B for ; Wed, 4 Sep 2024 05:05:28 +0000 (UTC) X-FDA: 82525867536.21.26B4DEE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 503E712000A for ; Wed, 4 Sep 2024 05:05:27 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CzksLJpy; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725426221; 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=W58c6AiZeQ8m17Xll3uMT3O6YwVjU99nGte6NXi5SJ4=; b=Rg5Yv08OHMryYTeEC8nX+NJq78U/KVNva9jLTWgNLFgh6+yIJ98gobe+eKLTVD+VjIIczL hve0inqyUWdhoEeOnoOf4kFZsMSSG+ziKzD/6Y8AzyWNzHyy2Xr7H1vdY8UacgGqUL6wZF TCjaYSUcpgGTSW4dxuIK9gZEreyyQBg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725426221; a=rsa-sha256; cv=none; b=NM1INN8FsYgQASEJQdWNw+lEcU4S6TUA7qpZwHpJURNaB/6ixRZPWPONJwsaPF4qbWP64V eqTzCgIdX3JLbNin1nCyfi8u5wKjeCk/alOx0v6nq5F7m3PKQ0eQky3+n0o79/I7phebMA HLyxYt77MPZyN75hpV6oO4QT7uzClUg= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=CzksLJpy; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 1314F5C54CC; Wed, 4 Sep 2024 05:05:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80FDCC4CEC3; Wed, 4 Sep 2024 05:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725426324; bh=hYYe/f3Heq7cL4pkEkMqVo9uukiq3LWgcMvvuf73EzI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CzksLJpyMDutTGERgh2LGapeYK0k/1/Si86MKcPc+MS1RCwiis3kv6glhhmhcs1C8 u+FeRZSJ6xGTrv/k3bipSpZMDJ7ijphZVEuATZC6hnsF9DfnXToF4Obv/1L8VixsOW nuzj1LLF1Vz0HLp45gPj0Zc2AWEBiU7YTZAJ0fqDlQw9kx5pFxdGG5QxXrDR+Ykq66 kY3XjBEQ9lRtRxOw6IkgzpVzgrZWlSE6V9j4BeusYJdA0qM5tp5DtFXWWXr4rFSFdS d5DinNiXeQguXXi3uCuNpNyAYh2UxYzNAIq2bX+nwnkmaBGN/QfUyWtj3PLJcD5d8N BPbhH4GASpodw== Date: Wed, 4 Sep 2024 08:02:37 +0300 From: Mike Rapoport To: Christian Brauner Cc: Vlastimil Babka , Jens Axboe , Jann Horn , Linus Torvalds , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v2 07/15] slub: pull kmem_cache_open() into do_kmem_cache_create() Message-ID: References: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> <20240903-work-kmem_cache_args-v2-7-76f97e9a4560@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240903-work-kmem_cache_args-v2-7-76f97e9a4560@kernel.org> X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 503E712000A X-Stat-Signature: fn54tw1rm88u8e8z5xcdcfb1sc1b451j X-Rspam-User: X-HE-Tag: 1725426327-860131 X-HE-Meta: U2FsdGVkX19K8zU2NeNBow92GX2TyuOcQzKCW0DpwDbkF2rp1IL0+7L3HqacqfU1cwNlu0eruhkyj3pVDf63PtHXOnTwYzrpllEYYTLumEZQ13AZgaaV9SW/lyBsvj3TR6E7BkqsEEaAiSFFBLaWWvD67hsyd4fBaYHlenwyhVWah1XQzC7KT4YuavKihseubobgrb4ljcU3rb/hPTMSqs4xbKj/j9mFqo2q+no/CVt9M5iic+6whkdS4klD6KALD+y/Ikms4sJiK66IAlcNIdggqNhFpLuCXBlZ+n6gmOdEcuAY60gjjzdHiNfr4t1sGLzVusO9F1+2BM9rt13gldkKFshn9dTVjA3SfGsxTgGwVt6CVAY5RNiER81rHrJ2GA2YEa0gFclMj6kPeQby4x3mBrL8AheK5Pv2H2lxQ4j0xZAZxHRpTCLplW3f3dSYEdpUHQM33wmJTmxc9h7hrzqNdyWpCMNZsoBQfTVV8R6sWaauVt1ovtpq+G+6CDTswyv/wLnR1yEBi844e5YABgD9e1TpVLfRgUX26BlDZ3I5cw0z6uEiH8oRYu9MzDBhZCXhgO3hOMEpBd5jt5HVhp0bGjdYFtuqd7DpdCTSdjwYvXAfV9UduUlGcZ+0+iCnuQyddA85unNTRQN+LWULTEilOdGQlCGD9agDk1hN11vNHQfEFo6ix2319VtSis2DHMq+YHaPertrhwO4FZ9tl1FoT5F1RbmayX++kubgoE0z3qLU0ipEnlCoscpDB7ascSUmc1LGB/Yv/eVNn0OZOzqhTDxToY2kjd4u132pxUXIKrMoHyZgWEBnIovBn7WKZ0LC8gpgidGBKAxAoC025kG9F5suVP3AAXDiAXA3aHtGDJ/p7cYbZCselXKxgpTaUOFBLfi3yHFwgDJO8rl877p6WWbz0UJWwNzFhMVeeSB8icXkB6RMU2A+a0PpDQ9C68m9N0x/JfMCD44x3YW Vbw7gz6P C6qJ+qybIW1k/Y6wByapI1G531swJ0nCyPXaLNeIpz6vfUM1swr54QwtB6Uq+WtdcYp9DQYnpNtk0RwGXzgMQWTNWq5pzV5JEMwjFc7rvq/hLNCgcGSfKAUix8mOItUw9MJnXtJulegZqFO3d6IIM0xoxyHo70iZmXg9uWmDGcB34x5e1SS+hcWS4G8BsecguXEarviDHUK62ucaZGiwAepH0lJBHYgjVN//U9wAiCXFtLSSMucdGgxS2cSHw+t5u5F5AjbgK5fqtU1KyP+jQepxYGRoPP2ijJIQfvHP8oNaP3/IFlw6HQyzrCPzah6sEcQ0TR/9eX/XEAl0= 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 Tue, Sep 03, 2024 at 04:20:48PM +0200, Christian Brauner wrote: > do_kmem_cache_create() is the only caller and we're going to pass down > struct kmem_cache_args in a follow-up patch. > > Signed-off-by: Christian Brauner Error handling in kmem_cache_open begs for improvement, but that's not related to this patch. Reviewed-by: Mike Rapoport (Microsoft) > --- > mm/slub.c | 132 +++++++++++++++++++++++++++++--------------------------------- > 1 file changed, 62 insertions(+), 70 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index 23d9d783ff26..30f4ca6335c7 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -5290,65 +5290,6 @@ static int calculate_sizes(struct kmem_cache *s) > return !!oo_objects(s->oo); > } > > -static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) > -{ > - s->flags = kmem_cache_flags(flags, s->name); > -#ifdef CONFIG_SLAB_FREELIST_HARDENED > - s->random = get_random_long(); > -#endif > - > - if (!calculate_sizes(s)) > - goto error; > - if (disable_higher_order_debug) { > - /* > - * Disable debugging flags that store metadata if the min slab > - * order increased. > - */ > - if (get_order(s->size) > get_order(s->object_size)) { > - s->flags &= ~DEBUG_METADATA_FLAGS; > - s->offset = 0; > - if (!calculate_sizes(s)) > - goto error; > - } > - } > - > -#ifdef system_has_freelist_aba > - if (system_has_freelist_aba() && !(s->flags & SLAB_NO_CMPXCHG)) { > - /* Enable fast mode */ > - s->flags |= __CMPXCHG_DOUBLE; > - } > -#endif > - > - /* > - * The larger the object size is, the more slabs we want on the partial > - * list to avoid pounding the page allocator excessively. > - */ > - s->min_partial = min_t(unsigned long, MAX_PARTIAL, ilog2(s->size) / 2); > - s->min_partial = max_t(unsigned long, MIN_PARTIAL, s->min_partial); > - > - set_cpu_partial(s); > - > -#ifdef CONFIG_NUMA > - s->remote_node_defrag_ratio = 1000; > -#endif > - > - /* Initialize the pre-computed randomized freelist if slab is up */ > - if (slab_state >= UP) { > - if (init_cache_random_seq(s)) > - goto error; > - } > - > - if (!init_kmem_cache_nodes(s)) > - goto error; > - > - if (alloc_kmem_cache_cpus(s)) > - return 0; > - > -error: > - __kmem_cache_release(s); > - return -EINVAL; > -} > - > static void list_slab_objects(struct kmem_cache *s, struct slab *slab, > const char *text) > { > @@ -5904,26 +5845,77 @@ __kmem_cache_alias(const char *name, unsigned int size, unsigned int align, > > int do_kmem_cache_create(struct kmem_cache *s, slab_flags_t flags) > { > - int err; > + int err = -EINVAL; > > - err = kmem_cache_open(s, flags); > - if (err) > - return err; > + s->flags = kmem_cache_flags(flags, s->name); > +#ifdef CONFIG_SLAB_FREELIST_HARDENED > + s->random = get_random_long(); > +#endif > + > + if (!calculate_sizes(s)) > + goto out; > + if (disable_higher_order_debug) { > + /* > + * Disable debugging flags that store metadata if the min slab > + * order increased. > + */ > + if (get_order(s->size) > get_order(s->object_size)) { > + s->flags &= ~DEBUG_METADATA_FLAGS; > + s->offset = 0; > + if (!calculate_sizes(s)) > + goto out; > + } > + } > + > +#ifdef system_has_freelist_aba > + if (system_has_freelist_aba() && !(s->flags & SLAB_NO_CMPXCHG)) { > + /* Enable fast mode */ > + s->flags |= __CMPXCHG_DOUBLE; > + } > +#endif > + > + /* > + * The larger the object size is, the more slabs we want on the partial > + * list to avoid pounding the page allocator excessively. > + */ > + s->min_partial = min_t(unsigned long, MAX_PARTIAL, ilog2(s->size) / 2); > + s->min_partial = max_t(unsigned long, MIN_PARTIAL, s->min_partial); > + > + set_cpu_partial(s); > + > +#ifdef CONFIG_NUMA > + s->remote_node_defrag_ratio = 1000; > +#endif > + > + /* Initialize the pre-computed randomized freelist if slab is up */ > + if (slab_state >= UP) { > + if (init_cache_random_seq(s)) > + goto out; > + } > + > + if (!init_kmem_cache_nodes(s)) > + goto out; > + > + if (!alloc_kmem_cache_cpus(s)) > + goto out; > > /* Mutex is not taken during early boot */ > - if (slab_state <= UP) > - return 0; > + if (slab_state <= UP) { > + err = 0; > + goto out; > + } > > err = sysfs_slab_add(s); > - if (err) { > - __kmem_cache_release(s); > - return err; > - } > + if (err) > + goto out; > > if (s->flags & SLAB_STORE_USER) > debugfs_slab_add(s); > > - return 0; > +out: > + if (err) > + __kmem_cache_release(s); > + return err; > } > > #ifdef SLAB_SUPPORTS_SYSFS > > -- > 2.45.2 > -- Sincerely yours, Mike.