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 8CDA4CD37AE for ; Wed, 4 Sep 2024 05:07:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E5748D018A; Wed, 4 Sep 2024 01:07:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 195F26B015B; Wed, 4 Sep 2024 01:07:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03FFE8D0228; Wed, 4 Sep 2024 01:07:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D94858D018A for ; Wed, 4 Sep 2024 01:07:10 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5C5CEA99AC for ; Wed, 4 Sep 2024 05:07:10 +0000 (UTC) X-FDA: 82525871820.24.7E5A55E Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf23.hostedemail.com (Postfix) with ESMTP id BCFEC14000B for ; Wed, 4 Sep 2024 05:07:08 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=vQYXFhhj; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@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=1725426404; 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=QdHn9yZXo+2G/CRUmBcO41un1RhSlKK6N+Fj57jjneY=; b=17WNgJt5xTAaJlM9kODi+VrPteAIkmglAhrOGx0pewxO632aCiCpgRv3IcxBbV1y2YkaOF 5y8soIMjmgcrd2cPzu1IfGSOrV6idRB3dm8pb6IrRc2gFyU1sNnq31/KBUgjnzqxD5DB/h r8PPRpo59YeCmJvdmd1WfUlBVYC0sTE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=vQYXFhhj; spf=pass (imf23.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725426404; a=rsa-sha256; cv=none; b=v38riunC+mlhZa6GXPz4x6NsyDZxRMpIkUkjy0ljhpMWnt7w3O/j4TpmPUh2Ohv/uLzm0/ hZfHts0pz20PqZFrIZ6zxIGdvYckCbVw70OXgIrHxGQeKPg7N+uECjtu1uRx7JzhghXriF 40Q8M1lHecH8/JbCIGuRA0dhKZR8Rgw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id E23B8A4067E; Wed, 4 Sep 2024 05:07:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62269C4CEC2; Wed, 4 Sep 2024 05:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725426427; bh=6ZfBzM/jQeLuMoY9RwgpNL0az2L3n0G0wqsjMs3H5kU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=vQYXFhhjsZSr/ytMoB4VS7nbOjXkCIZNDLki9v4Mzph9syzIPNLCCgAy61bkT0RWo q5S0Vf1rfYDJGweu0hZZCQJE8wOGzgTJl6koGOa57NL1SNlChh3fcLW+cQMH/a4v+P lNx5AAhMjsT23YgMBY10MrKrIh+mLSim5ABS9kJaEq9+kXfDLUFY0vavSpADNIJU3+ 7pi6n83sByJYuaM8/5YhL/w8+C2bWMe9wKY0LhejHRTsiWLeY3goyTqu8+vAXSBoUW uO+hbSvQCIhjRU3agAy9FBEWKdPa7GsfZxA1mfvJ/JAEzZOWB3mn54/cM9bwL3Gnts hYgaWDWYVUriQ== Date: Wed, 4 Sep 2024 08:04:21 +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 08/15] slab: pass struct kmem_cache_args to do_kmem_cache_create() Message-ID: References: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> <20240903-work-kmem_cache_args-v2-8-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-8-76f97e9a4560@kernel.org> X-Rspam-User: X-Stat-Signature: r5hcpt3ygpo7atmpb7huxs1df85x9ocn X-Rspamd-Queue-Id: BCFEC14000B X-Rspamd-Server: rspam11 X-HE-Tag: 1725426428-540632 X-HE-Meta: U2FsdGVkX18cqb7wzLVO06GAItDXKVvncyqOokEU+S4bHAeKoRNPwWB81Hwa+gEsZrZMWbVUKt7qYujKTztEKQb0iVKV2+y1m4h4B4LdaOpbbJbXEYn0wNYIWCOPka+RlUOlNtsOUrV8GLpAaIvtV5CSx0m9HZ66epczZ4toWIvOaGQ9J8nYjK6KI2TRG9FF0fGWgXBrzH2Q3ff/UK4V971mXoO4VEQhsTQ3gdtNUN4BhU7oofhd1bRiAJ6vRf93TbnIiyf76Zg6sa80vpcxOm6ixUdl74tWkz0yVANJqmo/LcmLrXJr9uGi4nqxMHF/r4h5YAmEAh5lqeFuCOZYrEIqH+YfcGZL0R8OlfDCacLuwdESPPQshWqVmki/8AgDLf/lX5Gcj4pWxFC7dHRattA9fCq1xcVFzxBeiXxHBVHk+VMHt+W0YWFtEX9saFtT3fnPT3AcVS4oS0JEmGJFkjRHdzkj6KxJuQehjpURRBQWC2jPDYci+5EKbMliCnD6yr5ybRPF2h+VIAs34XShEz7rn1SmfHSzuAi3jJmVt06UceXJWSbrS0uJ5pGf1iZArjKEbDhZqXb/SZRWsWZ7TaqN4w3+jDJz0qConsq4M7+odIQEZUBZPXq+yRu5ZHI130xQ3vUkMALTro1n187fv4G5E7gzabk6KNIVclweR8kjpqeRfZg7ToPaJVBiNzQxPyJd0kVP53A4h89q5okDflH+VwaFruMcDUiZfkvKkCJ9mS5z7fFfzJd5XIVvky6W1Cd3cCKaBcw8YPlr0s3w8lyOjXzYBlattV4qfPbYkNfyfmn3e+cK1rsXtQ3RrrL5y6HYQJvCe3Wb0USxbWXjLeli0aDGRlW04cu6Lp/TAieKQQsOFNKwVtVIbnFxWyAZynEau62EOAMBZ77Czr+6wermujUgTlYR0PxCmrjncLYt42hpYiQKrekMFRlhpS5SjI4w5gihIIqk/5ofcGm r6X4Xr9s IW3X1atdUQhjwEMQR3JBr4Zf/B8bbWTBpCYOJAOEYZSMQbL/at3xRm/AAsNmZX3qEE420nSFo1rjNeZDo6E70dLm3fKhPOKUvSU5orwR35cuR8gMDOm4QnrKhyiaa2qn/wzLJHn6nKnmGNYI1rFMiKNMpYlgCri42LDviKeRJJjDSQSafL/h4T0FRePoepmxZfdroWNPcL2iMR/nTYFdCxOqpKe1CXCrsWwxkwzh/1aA7lXZ4+spTqC/4O9L1qLho21ouRnuX0ndltAS/3bxte1660z8hUOBcDSk282C+zdKb/80Adg0SNp4EZUwMZOBtawmO 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:49PM +0200, Christian Brauner wrote: > and initialize most things in do_kmem_cache_create(). In a follow-up > patch we'll remove rcu_freeptr_offset from struct kmem_cache. > > Signed-off-by: Christian Brauner Reviewed-by: Mike Rapoport (Microsoft) > --- > mm/slab.h | 4 +++- > mm/slab_common.c | 27 ++++++--------------------- > mm/slub.c | 17 ++++++++++++++++- > 3 files changed, 25 insertions(+), 23 deletions(-) > > diff --git a/mm/slab.h b/mm/slab.h > index 684bb48c4f39..c7a4e0fc3cf1 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -424,7 +424,9 @@ kmalloc_slab(size_t size, kmem_buckets *b, gfp_t flags, unsigned long caller) > gfp_t kmalloc_fix_flags(gfp_t flags); > > /* Functions provided by the slab allocators */ > -int do_kmem_cache_create(struct kmem_cache *, slab_flags_t flags); > +int do_kmem_cache_create(struct kmem_cache *s, const char *name, > + unsigned int size, struct kmem_cache_args *args, > + slab_flags_t flags); > > void __init kmem_cache_init(void); > extern void create_boot_cache(struct kmem_cache *, const char *name, > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 9baa61c9c670..19ae3dd6e36f 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -224,20 +224,7 @@ static struct kmem_cache *create_cache(const char *name, > s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL); > if (!s) > goto out; > - > - s->name = name; > - s->size = s->object_size = object_size; > - 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 = args->useroffset; > - s->usersize = args->usersize; > -#endif > - err = do_kmem_cache_create(s, flags); > + err = do_kmem_cache_create(s, name, object_size, args, flags); > if (err) > goto out_free_cache; > > @@ -788,9 +775,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, > { > int err; > unsigned int align = ARCH_KMALLOC_MINALIGN; > - > - s->name = name; > - s->size = s->object_size = size; > + struct kmem_cache_args kmem_args = {}; > > /* > * kmalloc caches guarantee alignment of at least the largest > @@ -799,14 +784,14 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, > */ > if (flags & SLAB_KMALLOC) > align = max(align, 1U << (ffs(size) - 1)); > - s->align = calculate_alignment(flags, align, size); > + kmem_args.align = calculate_alignment(flags, align, size); > > #ifdef CONFIG_HARDENED_USERCOPY > - s->useroffset = useroffset; > - s->usersize = usersize; > + kmem_args.useroffset = useroffset; > + kmem_args.usersize = usersize; > #endif > > - err = do_kmem_cache_create(s, flags); > + err = do_kmem_cache_create(s, name, size, &kmem_args, flags); > > if (err) > panic("Creation of kmalloc slab %s size=%u failed. Reason %d\n", > diff --git a/mm/slub.c b/mm/slub.c > index 30f4ca6335c7..4719b60215b8 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -5843,14 +5843,29 @@ __kmem_cache_alias(const char *name, unsigned int size, unsigned int align, > return s; > } > > -int do_kmem_cache_create(struct kmem_cache *s, slab_flags_t flags) > +int do_kmem_cache_create(struct kmem_cache *s, const char *name, > + unsigned int size, struct kmem_cache_args *args, > + slab_flags_t flags) > { > int err = -EINVAL; > > + s->name = name; > + s->size = s->object_size = size; > + > s->flags = kmem_cache_flags(flags, s->name); > #ifdef CONFIG_SLAB_FREELIST_HARDENED > s->random = get_random_long(); > #endif > + 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 = args->useroffset; > + s->usersize = args->usersize; > +#endif > > if (!calculate_sizes(s)) > goto out; > > -- > 2.45.2 > -- Sincerely yours, Mike.