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 94494CD4853 for ; Wed, 4 Sep 2024 15:19:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD2F76B0360; Wed, 4 Sep 2024 11:19:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8CF86B0361; Wed, 4 Sep 2024 11:19:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C22B56B0362; Wed, 4 Sep 2024 11:19:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9FE176B0360 for ; Wed, 4 Sep 2024 11:19:07 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 2B8BF1416CF for ; Wed, 4 Sep 2024 15:19:07 +0000 (UTC) X-FDA: 82527413934.19.BEC0BA7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 59D744000D for ; Wed, 4 Sep 2024 15:19:05 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T5eBQYXJ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725463074; a=rsa-sha256; cv=none; b=go7xSTlpuaGgmm9PJKEN7E6S5zt6I6cvf+8+fsUuyHjwY7cQL/xh5k1VKOt+kRoX7WaQKB OVFZaVJ6Q4+sQkMlB4AHvg92/Aa884aqkXRrW/DC6aOWz/jupZU7+Wm0HM702FpvQFgUz3 fQ6T6frXweZmV1yXcG0C1gnbhLoeGKA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T5eBQYXJ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf27.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=1725463074; 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=WtzXKzFyDqXnnjbLJ+ZC+756xySEWNX4llxiiJphl1c=; b=x51GUbfr81ET6kcUmSA8/2/BrHpVf2rby/w2/wYqsBJY3JZ+0bB1jD9bCntePSmZLQphCe X5Xm1BF7f7huMlVHca1NfLLKUzTMrI5DwRjdbJnUQNV/odSFmAJA7s/2Z8NxNaWJS/eGHz k3OGHgrgakuTIF2tLwKqXiglM14ESXU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C97EE5C5806; Wed, 4 Sep 2024 15:19:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7543DC4CEC2; Wed, 4 Sep 2024 15:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725463144; bh=4Chh2Trjq5PXaev8Wq994yU6ASdDaYO/5cXJBfvCKsU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=T5eBQYXJngCBoEx6C7EPsk11Sq40ju6uc3HzdMFGqc1mPFsJiULiAJ3Y0DT8sW5Qu 4B6H0MTzcjpf/Smyed2MU7S7uB/FHysVHHW1ZMW2Wq3Zqt/lY2rVpklJ9P9sAJgPpT K3OnAn6KQeQnwuTGL8MqDu0Ot5neBtxoN52Jk9PUfjRAwzoj9lj4XlR9GPinYC4Hum UZzaOlzE3t4yBLviHQDZsiHB45ajDg86UrehJjYyVb27k8c3qEnQcqxBKo4QB5lbkk g+VKledzKUFdUcDhT5weErza6vVhVNzoez5ZVu4v6g3/UYuYpsMmaq3XQst3S5ntvB nzSd0euuHHy0g== Date: Wed, 4 Sep 2024 18:16:16 +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 02/15] slab: add struct kmem_cache_args Message-ID: 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=us-ascii Content-Disposition: inline In-Reply-To: <20240903-work-kmem_cache_args-v2-2-76f97e9a4560@kernel.org> X-Rspamd-Queue-Id: 59D744000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 51x4r96j8qrgti5o4wjuxbdwt1mx1e5q X-HE-Tag: 1725463145-864551 X-HE-Meta: U2FsdGVkX18G+0sVdCcXujsIWnN1+qcHTRgt7O1oTZd5/gUry/FaooHWzwSFWahlb1nXkoy7LOB+BmOvjNe8I3dYnbYfwevXwR2ZdxBUIX4XQ12CH3aQnEIxVY1VFBf6d0wXcbslakaHRG3R0t2Bnlc+sP8sz3nHusDCvJN/IysihbJxEvhY2HLXj0eGUAalF3F7uj9NI5sBZGzbU1lpO1ufXIlRwg/pTfb0klJGKXwN24fjnAhTf9jXqRO6lWqWtN3nHOnTuDbtYxj3LtfyRIEKg0lgzlj6aXiaXw53O+3fnnbyoZW7KYwcaTs2fF0cWIjrxXE7w6cPlBFuTwYzb2UAJqT6MnIeqvCshalnayM0rQ4/aja8sYIda95fZpRg5wNKGNCvhb8NL0NEUOWvzDjxuF2mavfPzNe6tIgyVFUms9JVaawG8HEDpkhEFU1Z8S3kEBILr2B/e8dLuBUKvLZSjUI2lkgTay8Obd7d7B4ZE0UV67VHOqJrk/T2RTUyHyZO1K2lP3xHW/ALwHTKQc1ZHtbAZrbKryplqSJz2NQdgZbMX5hvehME3eRYH2STbS5K3sN7y3U1nxvZBq0nPyKZA0aGypKvFXdfhqKDb67PXIqxTk/dNoBm2umgMei97jBAt2dKWPEeJa4dZSHE4wc4Us+W+aLeQIbxtARTFC4YpnLHh1iuBLBPV5UjizFOv+c1lCHqDM3TfVgRRHVL63CRt+4aVX02m+xPITEPDDH2b0IrXuYM8Vh88rZI4tYpwqDMPj9jEEsZzujYKHlf+RJ/pwsZx2Gf5jG/mHrwnfQ52WaSehu7ewwujq8uVWxzkLHc4ODddaf9O2DnqcP/rGGzla/00Sfx4uSLOg9RECG980H1qZoSdY2OfEYXn6THEairvjLedc5bJuhq6Bv0G0JRl8KvlXCIEJhVmeuoOhuk7ZWhuwuEAX2QVVn3fISdl2ZlBcJqsSgES/JRs7/ g33tiNEZ uG5JpTDZSHHepULpuggSuyjtd5mPBZkieq2ItK80CLufTv6YpFi3sM8AmMVBb65mGi3vFbEYu2Nf8P+Nh+8RO/AbXRpECCoiMPPL97UPXnslFYNWVNg45DR0eEQmE4KAtyq685NuK6onSPOZfHRLqLLIULnBXVhbuLkUNFSSxRT+PUOzF8AWrvSbFKRVj+6YbHXj6sInHQUi7Y9e4YSMzucI16amNUYIttV1Rgew35oigl2K6VCRsy99wnMUXuJhK2+2Dm9d/P3ZfLI1uBaqH41pGvf85xIw53rXfhy0rHz1uM+Vo+WORj6Mrzp7IMWk4OX5yISoGl2WaPbY= 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:43PM +0200, Christian Brauner wrote: > 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); Sorry I missed it in the previous review, but nothing guaranties that nobody will call kmem_cache_create_args with args != NULL. I think there should be a check for args != NULL and a substitution of args with defaults if it actually was NULL. > 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 > > -- > 2.45.2 > -- Sincerely yours, Mike.