From patchwork Tue Sep 3 14:20:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 13788794 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 DB0C6CD343A for ; Tue, 3 Sep 2024 14:23:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 180898D0182; Tue, 3 Sep 2024 10:22:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 107E58D0151; Tue, 3 Sep 2024 10:22:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9ADF8D0182; Tue, 3 Sep 2024 10:22:53 -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 C72768D0151 for ; Tue, 3 Sep 2024 10:22:53 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7E9E3403A8 for ; Tue, 3 Sep 2024 14:22:53 +0000 (UTC) X-FDA: 82523643426.29.B65D980 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id 9AC8740010 for ; Tue, 3 Sep 2024 14:22:51 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GI5fCg6w; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf12.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=brauner@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725373301; a=rsa-sha256; cv=none; b=JNHa0vtX95CAM7ayPzanyzXixbeZRigEPKLiwgici5NPMPxj3Wc+Tr27Fja/dBkfrf0J3w NRuP5Yw5gMy8IkaBYugw7UvNPRrpRIWt6IprNzQ+Lxmv/bbjVds7b8OeOu+ErhNrKEV4Iz S9EKigW3avxRzJnlapUoJSPeV2hCNgE= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GI5fCg6w; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf12.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 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=1725373301; 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=098223J6o1UJ5gzt2sRXc0SWREJnk526v0CgA06M5FQ=; b=MSmyehGi//mFTjSCmZ06USObGGLmwV//PLbxHHVkmDKJaoegjlWnfRR7W2jPwqxpakp0Xk lODHF+UM7Ynt31IMwoccQzkcn9l639M4ymgO2ZLEQ2XASE2aPc+Iho6lL+KmEiGvaqNAMn zKBJ9GTb7iseWNgPlL0znda178+96FA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 64D625C588F; Tue, 3 Sep 2024 14:22:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E9E3C4CECA; Tue, 3 Sep 2024 14:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725373370; bh=t7al+h/ze5pARsr5Uki/kfE3prWidx+wEHKqUnyvBao=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GI5fCg6wE9JAbDFx38ntWbqoJ4WArMJXqs+IUMdUmibbQuKyzYDFU7hPngI66qys1 84hwKKRC0v19spyU7/Ipnv6ToPmsngH01J4aNuWZq+PqtCMZRclX2BEVtyRnXhuao8 fh95UuYYzzM4XjhZ7C/bRmv+10JsT54xgRGHRplcXiB21sYmQ0IYu/ePK7b3ul9xOC bVE1u96ZUhjkwFEFNiTs9fLMZbW45mYXTlJISeY08zRLxaBOtGu8yk6hXqlyYtCPqE 2vdul7RHzgcegdYpsD1x+41OOCNSIGvPIrjkKRkOYS089YiaU7mGycV1dG4FvFdDfA gLl9qU5veRI+g== From: Christian Brauner Date: Tue, 03 Sep 2024 16:20:53 +0200 Subject: [PATCH v2 12/15] slab: create kmem_cache_create() compatibility layer MIME-Version: 1.0 Message-Id: <20240903-work-kmem_cache_args-v2-12-76f97e9a4560@kernel.org> References: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> In-Reply-To: <20240903-work-kmem_cache_args-v2-0-76f97e9a4560@kernel.org> To: Vlastimil Babka , Jens Axboe , Jann Horn , Linus Torvalds , Mike Rapoport Cc: 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=3268; i=brauner@kernel.org; h=from:subject:message-id; bh=t7al+h/ze5pARsr5Uki/kfE3prWidx+wEHKqUnyvBao=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaRdl57ze9V/3sgcXvbTlm733/ZNcmz8HvPm6rLvVVH3j H8EMYe97ChlYRDjYpAVU2RxaDcJl1vOU7HZKFMDZg4rE8gQBi5OAZiI6muGfyoS11b0Juc8q/Gb ynZ2SvHzuLkblG8F3Fh+ekXt4eVT0sIZ/pfzhm3/rHB5W/Mh18BrNztnn33+9KO/V8eEkCMimUK 68/gA X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Rspamd-Queue-Id: 9AC8740010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: rygktd5b3xkfpcdp3n5hqqqtopufbt7r X-HE-Tag: 1725373371-482275 X-HE-Meta: U2FsdGVkX1/mk1UduKDOa+QoxtBg6EIBbgml88T4Ni4Q3J8auliUOzW8CoCtA/LFebeSjfsdmXJx+ov9pcGPnvK2fjIMuxFgv+H+KxUBqDS5uazKtKZBJp6+rqUYRPW46IwIIp8o19iHdzf3pTNEmUIoUsMbTcd1paK7woOmn5fxe6uIUyFLv9+TgHEvRoVmKKO02uhhdNOysqGGmz6AF2FIcEyPEzMhzDgQMt/A8hD2eo7qdgA+VezIHgaplkY/TmiaxS/Hypyt7V7aeiCoCw+ziix6z3avaZmZufbAj80zkfKAtwE/lExAdFFJY+3xRvQvqVCYgdp4dgLGLvxvWa6oBer5uzBoCytxW6BrWXD/hrtgxmG76zWR7rEGdwSOiK8D5gvGjZY55mOS7FEM3VsjmOUyJyIz0sD3NftvNpe80ZP/AI12XfMZmEcla6qhKZh/PurjKHY28hcCsS+uhfQUwfpjOlqzzmTEuPQQGyhJZbirhu+6ZEd01jb8AzMz5TS6kRNm6EflIys33LTYXQ4LJSPMZEKdpVzeKTJdl6hO0gz57VIcAgWhEN1dbQmEi5IkcwEMv3Tfa1vP6/2gspv/iurUJr3eZ4V/Tbj2gEalyOqvx8rHLlS0I4s6bh9HyIRK3xp22A4znMIPd2SW5PZl6j0fPi5unFhXxJiIrPOevASY3XnnQZN37Dlw6V5YbX0TE1gs6xbcVC8Cn0KTWNRf/rCLPFRG6DmaEVdqyUhVWjUKV3HeuOhbfjrOsYTPrUy3Vq5pu/n8u3Stuzy4L/kcCLS8EzFcMHVyjDMq0LJ2wCheFQOqHAsrpgbX9FirkS9Zq0SCShSkDLyyjVq+WAgkDGc8XvFLYsRhmC6Lh0afQKj9Qjx+F32PDS/A7BnCNSdKFs1Pe79zg+pXk1bF98spr0pGZT3DNDY4zqttJXHs49V2xcuJ3IwfgGJuP8DtM034f+WrmUc4JLp9Fdq 6rvm/lGo eb0XoJsmwON3ZCaOKXnm2Y6XhIjPyz/x8hOnpjaUjsPezYmTk7m8KzUGDiW41YiYXbmI71BlWJBLlaW/Lvy7P3H57JK5Mqq/CS8Zx2/v1TypL8unwmY20M+XILHnPuLq6yXePj4vh9HpaPCQnrOcnZnE4LJeyv1CENoyRBprq3pTS7U0hTWFGXUBppylovwZyU0heyEQVGzD57RVUgFtneKqrAXZT/oxRFLGD3tZ4oukujaf03t5JxN0mWxk2SGMll4S0L8I1TSG91OcEHmmj5QGmhkgPzB9KYstc 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: Use _Generic() to create a compatibility layer that type switches on the third argument to either call __kmem_cache_create() or __kmem_cache_create_args(). This can be kept in place until all callers have been ported to struct kmem_cache_args. Signed-off-by: Christian Brauner Reviewed-by: Mike Rapoport (Microsoft) --- include/linux/slab.h | 13 ++++++++++--- mm/slab_common.c | 10 +++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index aced16a08700..4292d67094c3 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -261,9 +261,10 @@ 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 *)); + +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, @@ -272,6 +273,12 @@ struct kmem_cache *kmem_cache_create_usercopy(const char *name, struct kmem_cache *kmem_cache_create_rcu(const char *name, unsigned int size, unsigned int freeptr_offset, slab_flags_t flags); + +#define kmem_cache_create(__name, __object_size, __args, ...) \ + _Generic((__args), \ + struct kmem_cache_args *: __kmem_cache_create_args, \ + default: __kmem_cache_create)(__name, __object_size, __args, __VA_ARGS__) + void kmem_cache_destroy(struct kmem_cache *s); int kmem_cache_shrink(struct kmem_cache *s); diff --git a/mm/slab_common.c b/mm/slab_common.c index 19ae3dd6e36f..418459927670 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -383,7 +383,7 @@ kmem_cache_create_usercopy(const char *name, unsigned int size, EXPORT_SYMBOL(kmem_cache_create_usercopy); /** - * kmem_cache_create - Create a cache. + * __kmem_cache_create - Create a cache. * @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. @@ -407,9 +407,9 @@ EXPORT_SYMBOL(kmem_cache_create_usercopy); * * Return: a pointer to the cache on success, NULL on failure. */ -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(const char *name, unsigned int size, + unsigned int align, slab_flags_t flags, + void (*ctor)(void *)) { struct kmem_cache_args kmem_args = { .align = align, @@ -418,7 +418,7 @@ kmem_cache_create(const char *name, unsigned int size, unsigned int align, return __kmem_cache_create_args(name, size, &kmem_args, flags); } -EXPORT_SYMBOL(kmem_cache_create); +EXPORT_SYMBOL(__kmem_cache_create); /** * kmem_cache_create_rcu - Create a SLAB_TYPESAFE_BY_RCU cache.