From patchwork Wed Feb 21 12:12:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 13565483 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 739A1C54787 for ; Wed, 21 Feb 2024 12:13:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BAAA6B0074; Wed, 21 Feb 2024 07:13:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0682B6B0078; Wed, 21 Feb 2024 07:13:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E23836B007E; Wed, 21 Feb 2024 07:13:14 -0500 (EST) 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 D7C556B0074 for ; Wed, 21 Feb 2024 07:13:14 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9D45E1A0A11 for ; Wed, 21 Feb 2024 12:13:14 +0000 (UTC) X-FDA: 81815700708.14.98A1BFE Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) by imf19.hostedemail.com (Postfix) with ESMTP id D47B91A000F for ; Wed, 21 Feb 2024 12:13:12 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CpeiNZrZ; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708517593; a=rsa-sha256; cv=none; b=RNSx581AAPyaEoFGX7csiNs7ZGhvBuav70Jo4w+Z9KUeMvhGD6LGzgtWjOi7+SHG5a/DdB YkYTouU+nMnpZdrWUtlKXMOELm2Mag20PTvAti6WGXb20tuIVqPtTWmsKBvsH6o7lkAvwd dAeKiZ6qO1GiJgsYcP2BFJHwtwLlWC4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=CpeiNZrZ; spf=pass (imf19.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.183 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708517593; 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=Bz0cGVE6WLA7e0c4EkbAqLj7Vrv2Vyq9GZ8uOCbwj1A=; b=UDNK//IwBxoF1U0zml4kVIvofcQ4fAE3stea5dY386Hojr0lsP/v5PUZOoCuaShIRe5VlM qsDhYppYoLEFQpdFH9cFbIS7q0i6QemBy6ToaeX21Xfkyk+q4JtL8i4nzrFygX463oL+q9 ZD3GkEOVZ7rlvmKclKSb0sKDVcaG0So= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708517591; h=from:from: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; bh=Bz0cGVE6WLA7e0c4EkbAqLj7Vrv2Vyq9GZ8uOCbwj1A=; b=CpeiNZrZjiLtxn4Z3YUU5MaXkCDTRZld89DR18NlWJCzgwcmoiU5JeeHp9r8ObETMn3otk eTpYeU1WSTuDozM9Idjqi+S6QnWvwPCXGrumeo8uKgQ0IugTfladj4nkro5cnq7Q/xO9x7 UMTqigC7MoVqBL7Auc87Oul3z9zJuxI= From: Chengming Zhou Date: Wed, 21 Feb 2024 12:12:53 +0000 Subject: [PATCH 1/2] mm, slab: remove unused object_size parameter in kmem_cache_flags() MIME-Version: 1.0 Message-Id: <20240221-slab-cleanup-v1-1-63382f41d699@linux.dev> References: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> In-Reply-To: <20240221-slab-cleanup-v1-0-63382f41d699@linux.dev> To: Pekka Enberg , Joonsoo Kim , Andrew Morton , David Rientjes , Christoph Lameter , Hyeonggon Yoo <42.hyeyoo@gmail.com>, Vlastimil Babka , Roman Gushchin Cc: Chengming Zhou , linux-mm@kvack.org, linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708517585; l=2862; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=nk9RpluGr0tF6v2tluYj3gtiA6vjGhoHRasqnmMVpqo=; b=Vxbg1J2RwEx3Y/a5Ivg5HMPbt0xZi3xKziMxqbb5re7o+KxAFmvs+ke8YVeB6B6zuUoMssnAF D4gzuY3tfmrA8fYBTtMNySrGukRjESuSPIx1SroYlU+GZ9XiSc7H28A X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D47B91A000F X-Stat-Signature: 4988x8epwc999ycd3zpnj6cs6a47yejw X-Rspam-User: X-HE-Tag: 1708517592-692638 X-HE-Meta: U2FsdGVkX19yqPuSA+N7ZSsLgNTigT0JXR5Y811rrhvG1ju2oApk5P1f+hsKRRSv5qEMuQcz0tA7y1scSwtzLocMXLLbDZH4PE4EOe44ufE1H650Ts+xc/FjLJgoL/gmBTY7wxEuJ1tNbgRrbcaJdDwfxKUiEQf8d0LpdDrY3gUFQ0sLgr7vwanoqvjJYDrqg1gEuRe77Hs4FBzBUB1JTcSF6zugotA3PcVywc3f/foppis1uYv2+U1JE+hdl84AxZgrzb/VdbviR4fgGYsrGoQhFyAwE+BMafZpbWVeyoQJK9MiyZmAd0GvVvCq4xfK4mtvLV3m/aP6l1PqeklklQNyXIyqDf0tM73QYky+/BQ5StpAHpmgl2OjQ7H/o8e06ZRjaMUpr7JTGJqoDz5Ah1xRPrjUfkTwO/GqgHR3PLa3aW4oHzhm24VpUHXqyiaBNCFal0jkF8uRZO+Se8tHJHHmzhlH+VP+cbJeWlbXK0tZ4YuHbjDNHHsVGXZBIghu+2ffxrebNEOPWCom4xnnaEKHhx3jkug4UyZyH+5WhtovWre8H05RIoEZOtbS2ACDMR13Ep5Hv8smj33YdJ6CvLOfpkjOMhPEaZtRpxi1UBxK5NWX8XJmRkljA9Bk/42VJHzhk30HTb7VWp5vAIPwzTFcayWRSp6mvl/erkLJr72VZr7PuUJG4ogleeIUkuHE57w/cMk9gpZ5fCOObBauuHEK4uq5/AbBjeRta/fYeAGIOTqrxhp2N4G+Da6ICEEj48I0bQ4zHKa3YQVwx2mxH7N0qOUdhNZTUbZczHm2dWJtx1mJL3nIc2S7a/vyPp7/4TG4gPOMSPGpdFGw5dzP0tlN3ZkSXgR9t77Wn1e6TWJZ1p9QdabQAsVP5Jl++64QKYGymNIm/uUnYC5mtrmBmhu+epVm4Ga/rIq0RIwJLW0= 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: We don't need the object_size parameter in kmem_cache_flags(), so just remove it. Signed-off-by: Chengming Zhou --- mm/slab.h | 3 +-- mm/slab_common.c | 2 +- mm/slub.c | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 54deeb0428c6..161a3fe5d573 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -435,8 +435,7 @@ struct kmem_cache * __kmem_cache_alias(const char *name, unsigned int size, unsigned int align, slab_flags_t flags, void (*ctor)(void *)); -slab_flags_t kmem_cache_flags(unsigned int object_size, - slab_flags_t flags, const char *name); +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name); static inline bool is_kmalloc_cache(struct kmem_cache *s) { diff --git a/mm/slab_common.c b/mm/slab_common.c index 238293b1dbe1..e86557397a61 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c @@ -172,7 +172,7 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, size = ALIGN(size, sizeof(void *)); align = calculate_alignment(flags, align, size); size = ALIGN(size, align); - flags = kmem_cache_flags(size, flags, name); + flags = kmem_cache_flags(flags, name); if (flags & SLAB_NEVER_MERGE) return NULL; diff --git a/mm/slub.c b/mm/slub.c index 2ef88bbf56a3..95700f2b17ae 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1764,7 +1764,6 @@ __setup("slub_debug", setup_slub_debug); /* * kmem_cache_flags - apply debugging options to the cache - * @object_size: the size of an object without meta data * @flags: flags to set * @name: name of the cache * @@ -1773,8 +1772,7 @@ __setup("slub_debug", setup_slub_debug); * slub_debug=,, ... * then only the select slabs will receive the debug option(s). */ -slab_flags_t kmem_cache_flags(unsigned int object_size, - slab_flags_t flags, const char *name) +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name) { char *iter; size_t len; @@ -1850,8 +1848,7 @@ static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n, struct slab *slab) {} static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, struct slab *slab) {} -slab_flags_t kmem_cache_flags(unsigned int object_size, - slab_flags_t flags, const char *name) +slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name) { return flags; } @@ -5104,7 +5101,7 @@ static int calculate_sizes(struct kmem_cache *s) static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) { - s->flags = kmem_cache_flags(s->size, flags, s->name); + s->flags = kmem_cache_flags(flags, s->name); #ifdef CONFIG_SLAB_FREELIST_HARDENED s->random = get_random_long(); #endif