From patchwork Wed Sep 4 10:21:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13790368 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 2FD6DCD4847 for ; Wed, 4 Sep 2024 10:22:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BAD498D024D; Wed, 4 Sep 2024 06:22:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B5B6A8D0242; Wed, 4 Sep 2024 06:22:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F9548D024D; Wed, 4 Sep 2024 06:22:53 -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 7F8C08D0242 for ; Wed, 4 Sep 2024 06:22:53 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2750380FE3 for ; Wed, 4 Sep 2024 10:22:53 +0000 (UTC) X-FDA: 82526667426.23.918FD96 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf11.hostedemail.com (Postfix) with ESMTP id 6182E40014 for ; Wed, 4 Sep 2024 10:22:51 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="bDGa/Ivc"; spf=pass (imf11.hostedemail.com: domain of brauner@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=brauner@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725445322; a=rsa-sha256; cv=none; b=yrzbt3T8ba5WZIkr63W4qymBVKrBEUQzkEaxc+l0MobrVBKb02/qQ3UUA8yrruHsXwrGrk 70ml9LnW0E3PuQpwCdefot1HGO58++r3nkZcrBxNpLchCzBapPwg7/c3jtC9rtcdHIBwDW Wc5eQqozAwPpA7+hWGMPhfoJDr/qGsw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="bDGa/Ivc"; spf=pass (imf11.hostedemail.com: domain of brauner@kernel.org designates 147.75.193.91 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=1725445322; 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=L0N8A0tBKgQmVt0CVqwsaSQxPKg/rQFNBZMwUi59MNE=; b=1p3MdH4VwhRU7yQ8MF8ugWypVceUSuEpCRibFroxR/uVG2ubAQ+3hk6OEugVVqouhNFcru DSmfi8MF5khaUWL//pfEK8R9HhtOmzeSyF7DxQJ0WJryYRtg4U+6DRKZ/BhIy7foDCmVzI ndEbW05sT6baHdCzXxpN6W6AngTSzJ8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 80FACA41050; Wed, 4 Sep 2024 10:22:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4F27C4CEC6; Wed, 4 Sep 2024 10:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725445370; bh=otBPVDb5wSFqFX+emtlwUyqyvPQGIcX7yx9PMQsOqjw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bDGa/IvcMSu4GQ4Irqb6p7xSlqntR0jiy/9X9+lLUcAnsYW4ttuniVZERzqaXh1Ud L5gf8yBN5UrenlR2eXCqo6BbRFAIaCB3HS3bV6FfMmD5e7Hqls1vAKAXTJzFrET2yd FmjH6Vci+98N//pLFtJiUJbDjmPzo5QXksmnLpMHV54wVjSgAK49ZZ81Te553Me8IL 62zOQ5vI8sERsbwrxVrAcjY02sCf/wPLkcUo0KNao3wJxWXMxsgvvXxx4uSN+6XxeB f+bf1rb1OTj7j3A3Yy4zzHM7G2px1cBaa4TlMgvyO5h4+KNnEJ34t/hrIibFJufYrC GFx5Z2ilhYzFA== From: Christian Brauner Date: Wed, 04 Sep 2024 12:21:20 +0200 Subject: [PATCH v3 15/17] slab: make kmem_cache_create_usercopy() static inline MIME-Version: 1.0 Message-Id: <20240904-work-kmem_cache_args-v3-15-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=4638; i=brauner@kernel.org; h=from:subject:message-id; bh=otBPVDb5wSFqFX+emtlwUyqyvPQGIcX7yx9PMQsOqjw=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaTdMNm97Phk78obioayNwPatj1TMDp+ZF9VYkVXH/O+B /Jt7LurOkpZGMS4GGTFFFkc2k3C5ZbzVGw2ytSAmcPKBDKEgYtTACby05ORYcKJiwsts2xFFzUX ugcwrBC8HHNuub3Sn9Q1jwL0kzvnP2X4n9DQlrdkZt8qM0XHb44egXPmcayWS+TjN9y5yis1Zgc zFwA= X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Stat-Signature: k83tm8kguas8wankd1j318u871d1rtxc X-Rspamd-Queue-Id: 6182E40014 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1725445371-951829 X-HE-Meta: U2FsdGVkX1/uSKGRX6WCGpiN17gOv61QQ/c14Rq96EiSPgjpsQK4MKdbfsDXEVDfiTGIWl3udgMyPE3pQMoCr75xBcGpMRNxmw5F7gCaB53jsAlam4dAiuUNaunrhkJWd6Okh+viLMco9eEU07ma+pSdpCNJCZWsvgavvw9DlVZQKYdwOsm3jdkr6vf4plVFkHWoiuOg1xc56+RYsbsja9egHjn7fy2ODIpiE0AjCZ08pizjnljAF8PFw+pV6ucow4//Il6I32GED1p3FkZuIILEYiA/OFk7T598I3ibgscq8OfwiZNROn10Zl5wyyZlK0Sw39zq/tiMmFS0oOJahJ+GdH0pnyZELF8Isj+IlkiZ7ocvvw+61NNGVJLpEPoteVAqvBdavixbKSGGnSq8ah6vblezXqtbcBWxM3gYOa/D8M69Lv8m7wCOrkj2M58RGJdoFxiLHDZFUSf+r5BYioEgowjEAS8RIFJVpo7Qq4cBALg9TMSxl6Ob6jxWOTnm83yQozcG0CCJuSKKsDn2N03X8EQ2xOxSHgswTuLAMVDkrEJCZkNF6goo5s2gGmtUYsGAwET6rE11g83R8pTdG+EDpxUi03KnXtbWJfSYzwygNPdK0gyvdd4sqsz+k4uWHjG80CNK0BqJnCSac8kN03Tc/+6/ddSjo/WwKGsIoswqDfwYKdTsaRnvC7eBESzJrjX9dsE5wLG3yYp++t/SXnqVQ3bRfCEvgTfg6ePNxRsTCqDf0z4VvptHmIRn8AgUzpohoa4E+Ur7Sjc1DbUeT3XKSx+amsYuBSMOro03d2njvjIEYUa2aBK1pzc7m2KI9Cu+mFXYipFUAxrtDa8o/UaViDnxVGwEtWARnGjBLxNksqvS5624EON073/jgydOdPs6Q3Ey7LMyTDZqrvetdtqr8fbGGUU760HuXRJosWng444TXCn5ePLTmaq+tsdnqtN0egKPox4NpUrli+r hyOjZ++c ODARDHj3wIvR2L11u616cTo7ZGAMpiFkP3Y1udhsZiQ3tbSf2/GHZS+aoy+gs5ffiPJ9tlWYF30lSTHyt7l5Q3/rYu9I6VwhjanEXIiA0wOITC/0wGNlw0JaZwbJV250cjqqF3C4zzOlD4iWOADb77pmaA3mMlQI6kItr2eeIhIMVB9AJG8Uf+zpNSv81W/j5czZXruSWF/VmSv9letIUPVMOzAeKIqTNcvref/OOOcenCPn2oa3qsvY49WUpLbeNQG0s+WYEU3EFiPAL3c8fTa6y3INQ8IITn0KZtSw+9eRdwPCngBF9UOKg4ohCZ4eiOvXUAcXS4X6Zku+9Jk9QfLTdnK7RwOjnPetAcKqJJYW+59ZeEWvlU9gS/g== 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: Make kmem_cache_create_usercopy() a static inline function. Signed-off-by: Christian Brauner --- include/linux/slab.h | 49 ++++++++++++++++++++++++++++++++++++++++++++----- mm/slab_common.c | 45 --------------------------------------------- 2 files changed, 44 insertions(+), 50 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 1176b30cd4b2..e224a1a9bcbc 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -265,11 +265,50 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size, unsigned int align, slab_flags_t flags, void (*ctor)(void *)); -struct kmem_cache *kmem_cache_create_usercopy(const char *name, - unsigned int size, unsigned int align, - slab_flags_t flags, - unsigned int useroffset, unsigned int usersize, - void (*ctor)(void *)); + +/** + * kmem_cache_create_usercopy - Create a cache with a region suitable + * for copying to userspace + * @name: A string which is used in /proc/slabinfo to identify this cache. + * @size: The size of objects to be created in this cache. + * @align: The required alignment for the objects. + * @flags: SLAB flags + * @useroffset: Usercopy region offset + * @usersize: Usercopy region size + * @ctor: A constructor for the objects. + * + * Cannot be called within a interrupt, but can be interrupted. + * The @ctor is run when new pages are allocated by the cache. + * + * The flags are + * + * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5) + * to catch references to uninitialised memory. + * + * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check + * for buffer overruns. + * + * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware + * cacheline. This can be beneficial if you're counting cycles as closely + * as davem. + * + * Return: a pointer to the cache on success, NULL on failure. + */ +static inline struct kmem_cache * +kmem_cache_create_usercopy(const char *name, unsigned int size, + unsigned int align, slab_flags_t flags, + unsigned int useroffset, unsigned int usersize, + void (*ctor)(void *)) +{ + struct kmem_cache_args kmem_args = { + .align = align, + .ctor = ctor, + .useroffset = useroffset, + .usersize = usersize, + }; + + return __kmem_cache_create_args(name, size, &kmem_args, flags); +} #define kmem_cache_create(__name, __object_size, __args, ...) \ _Generic((__args), \ diff --git a/mm/slab_common.c b/mm/slab_common.c index 9133b9fafcb1..3477a3918afd 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -337,51 +337,6 @@ struct kmem_cache *__kmem_cache_create_args(const char *name, } EXPORT_SYMBOL(__kmem_cache_create_args); -/** - * kmem_cache_create_usercopy - Create a cache with a region suitable - * for copying to userspace - * @name: A string which is used in /proc/slabinfo to identify this cache. - * @size: The size of objects to be created in this cache. - * @align: The required alignment for the objects. - * @flags: SLAB flags - * @useroffset: Usercopy region offset - * @usersize: Usercopy region size - * @ctor: A constructor for the objects. - * - * Cannot be called within a interrupt, but can be interrupted. - * The @ctor is run when new pages are allocated by the cache. - * - * The flags are - * - * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5) - * to catch references to uninitialised memory. - * - * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check - * for buffer overruns. - * - * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware - * cacheline. This can be beneficial if you're counting cycles as closely - * as davem. - * - * Return: a pointer to the cache on success, NULL on failure. - */ -struct kmem_cache * -kmem_cache_create_usercopy(const char *name, unsigned int size, - unsigned int align, slab_flags_t flags, - unsigned int useroffset, unsigned int usersize, - void (*ctor)(void *)) -{ - struct kmem_cache_args kmem_args = { - .align = align, - .ctor = ctor, - .useroffset = useroffset, - .usersize = usersize, - }; - - return __kmem_cache_create_args(name, size, &kmem_args, flags); -} -EXPORT_SYMBOL(kmem_cache_create_usercopy); - /** * __kmem_cache_create - Create a cache. * @name: A string which is used in /proc/slabinfo to identify this cache.