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 A0A5BC6FD1C for ; Tue, 14 Mar 2023 09:28:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20D398E0003; Tue, 14 Mar 2023 05:28:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 193778E0002; Tue, 14 Mar 2023 05:28:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0337E8E0003; Tue, 14 Mar 2023 05:28:47 -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 E36418E0002 for ; Tue, 14 Mar 2023 05:28:47 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A152F140798 for ; Tue, 14 Mar 2023 09:28:47 +0000 (UTC) X-FDA: 80566979094.11.9D4E657 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf02.hostedemail.com (Postfix) with ESMTP id A994E80005 for ; Tue, 14 Mar 2023 09:28:44 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=R6c16qbt; spf=pass (imf02.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678786124; 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=crwROCxBOaUa8+JL6JDHORfKfledO6zMH94hEtbuslk=; b=4B02PKLlxiO7A/6GSzPY41jHdXLA4WytxTumayn250HsM3qodidB9n5nd3ef9ZEEYdclBq phl7P3WtKDEayO1sxcdhQb15lV7SEdEErEjlDLd1ayX39liMjLn+cLbi4XZlGXKd6tcJvV dbeTYnXUFrXomnP0Vi10b1SVmsMVE8w= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=R6c16qbt; spf=pass (imf02.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678786124; a=rsa-sha256; cv=none; b=EWDPn8V5LxqTTnKN0g+c72Iyx18etgmevbp+wNLHb3W6HZ82a0NQeC1g9dD/7Ha7rZdR8a 3QoBWDppJQQmckoxzNGyldixF9JroxCf6zYGE0RgvFl+dGDD8ByuJnwoJ4Yo+aLqr2tXoA Rpcc4f+gamcEj9Q0FlsU3YO+KFUQB/Q= Received: by mail-pl1-f174.google.com with SMTP id u5so15903858plq.7 for ; Tue, 14 Mar 2023 02:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678786123; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=crwROCxBOaUa8+JL6JDHORfKfledO6zMH94hEtbuslk=; b=R6c16qbtva7KvXwr4i8bF5CoSGAXpP3KN1JB9egw86vvfM0nuMlyxI34wX2RNym0eg ctqr2GfXtAYyGIkFakXELUCQWS1gb23Hix46h5KYbTgGT8Gq55xz/Z7fiSLsFzCZUqAu 8xllqYFr+N853o8SdF0RGvrJ/rDTMmqCP7HMrErr2WnE4DceVmrykG+E/eqTesbnohXE 1YNA7JBIvUl0xGIux6RmxuMNDa37+726jR/6+NXq673mByYtGi2kS84zBFDJ1WO93ZZ/ nCOTb/2v+7G12+C7HjHxQQwdYsBEIKCJdA7F4s6VbuoJUJRdJx1XsUy2MdF6j2eCilrH j/cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678786123; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=crwROCxBOaUa8+JL6JDHORfKfledO6zMH94hEtbuslk=; b=VD0bHx4eXDFJ/ZGRyExRVFNpDpO9FqRowYhEBgitLx4nNCZc9jiN8AEIKTULWuILTT G2uufwSqBs6o46YM0NPjz44cR7aSk2Lgv5x/SFzmaqz9HjQhxttsGkOd6LQlNLEIwDIr fDK8k+mnJuGQoALAsZdg7mojtNlOAs7Bc6zDwHaAbgfN/PrWSVCBg+OPCdO3uxA1J2iA i9nox1EWadTM+VijMpBU4MMGG564PFcSAGhaoSo3cZj+mzs7EGNwCUCnDFu3jTlXOpZ/ h5GfURnZsWsX3qr4j2aAwOiMKGW1MyUETGyZ4A6WBCeFauW8Mur4MFmeePhJyqJ25BGB oarA== X-Gm-Message-State: AO0yUKWnQkP6xZeQDgnX8OXYma9BGslo1H0h7YqWcPOzNso5b1ozWvd8 iOnfp8aupVEDKL+fGruLM5g= X-Google-Smtp-Source: AK7set/lwy9fioWajxZGBdHnUskicgHm63YmewmfC8X/jRaGlRJOrUyTcCIu5K8+/nZ9pIfeZMqNWg== X-Received: by 2002:a17:902:db0e:b0:1a0:6bd4:ea9a with SMTP id m14-20020a170902db0e00b001a06bd4ea9amr1116070plx.16.1678786123412; Tue, 14 Mar 2023 02:28:43 -0700 (PDT) Received: from localhost ([2400:8902::f03c:93ff:fe27:642a]) by smtp.gmail.com with ESMTPSA id kx14-20020a170902f94e00b001a064cff3c5sm1216475plb.43.2023.03.14.02.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 02:28:42 -0700 (PDT) Date: Tue, 14 Mar 2023 09:28:32 +0000 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg , Roman Gushchin , Andrew Morton , linux-mm@kvack.org, rcu@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, netdev@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH 5/7] mm/slab: remove CONFIG_SLOB code from slab common code Message-ID: References: <20230310103210.22372-1-vbabka@suse.cz> <20230310103210.22372-6-vbabka@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230310103210.22372-6-vbabka@suse.cz> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A994E80005 X-Stat-Signature: j3qf47eghuxqghjstmdc7osbn9y8183f X-HE-Tag: 1678786124-368820 X-HE-Meta: U2FsdGVkX18e8BrdkO9jDTrQJBXaL2KPqBAoxfJprILaXUnBfKEqIbBbJ+TW8xmsffShQ2jvA2YU+y8Z/w832JxP7/2x6xaH66yMdF7uSNbtm7lBDdp4GI/qEdAEp3pS3lkR3l3w+GhqXqYKCmfX9pNGdpmNX6Po1CMt1UA5mvzWclYyEpBz0E+iYRNlft5R2S1+uS4SPvT+sGRpxmQsV1A/UmUhY6mPIqGme8CqA3hHSMypP+UZ485QKaWOZebk3h+ioc6jdK2Ydu6svMKPNcT86EQCJ8PdInNryhgipBU1AAnC4CtCHFUTlEvzATttfbUp9UzkmG6kSqrcLNd5kJEA4RDnrnypQ9jIrXcZXuCYovsoM4GuqeSyONW3TvT1xWPk0Wm/8PholknrDIfaY2bMV2c0njxbytsmr+yIN1FCfcygpDxNYWpffKTVe/hgoDAo49LGoOIW+8/VKGI/0tj8nh9ut5kq1kLzi/8z9GdPW8LVSVNBaNDd3H/g4xc/TJNP6KQqtj0c55KhCy2vLgGn3vPf/3ApU2YYVvjz+vbnTFBexpaVniJwZ9m/q0E/HndM5/ZYSTwstS902fScXkNo8DvDUrLW+blETTaZ0kZlV3nIx6TjObnpyP2g4MKs9L5/+fw1SNBFUX5jZc8N+oxC0djooCXwLwn4A9Y2Zj5HvtZcih7+d4ujAnFoJFoR0X/K8jWz3FKl3RehCv5wimdq29syB8WeXxObrZsxLUTpZFhEb9xuDmpDlQaMUqoQ+lvY8Qk/xjPRXfSFstkhKlqfMHp8/mzm9DD6pOqjNgnKma5aBgRERtxwUm11caix5K8rnuMx57uygLZD276KhpD4SoAZY+FfytbALMMPkl3pT2xFAHKHaWRKobFZG1w3hJEgA/Z5SPYCSufOvEuTIWIjPMicJIs2H/nsHv4GFJ6FSBqgmwM3QqUpVNpDLo3Xq8tAuRnOe8cjTyIB38Y gMTde9ZX Tg9ciSAR9GiKj6YJn0wIuhDk2PVHYuYKd+bmFdxj/VbBoUvayewweG1TZTpnIgcFY2KZry3AL1Xp33rRiMjnnvUa8DDmLZSSb6OG5KB4wBXkm5TJYtHNVWpMnOgLSXnvNlM+NVGberSIRBJmdM3iOnl0yDALKJbVPIwUfR+rZZGvpygQHtdnOm62VexQj59t3QZ4gFFAT3I+k734PjAoavkg4RqbZghzrA4Zd7Qb/BlfrFENZ8FKgBf/MwHyCd+bxOQe0W4i5sE9ZN9iN3/bRSWMqO7XHETBt0pMLdZ+hL/4yRi4suNixS9cMcspAIWrZk4DuRGgkaH3EoI9vI8ru7PJuJmm7ra+ixOvIHMf+GDg9eWMmT+VmdU2ElsWYe9tY337Mz0qYT9ZF180sQr6STFgva5mtTANCK4RkyJCWIZCNpo/7XP0O+GAgqb2B9/b+cloe5FsH6Hnjeu7qpadovukJ3gIeczvFAEoO+SREY8YtU9kNoK5xps++6cy3fQP6m7Z2dt6tbF73vEvx5svqyTYPVg== 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: On Fri, Mar 10, 2023 at 11:32:07AM +0100, Vlastimil Babka wrote: > CONFIG_SLOB has been removed from Kconfig. Remove code and #ifdef's > specific to SLOB in the slab headers and common code. > > Signed-off-by: Vlastimil Babka > --- > include/linux/slab.h | 39 ---------------------------- > mm/slab.h | 61 -------------------------------------------- > mm/slab_common.c | 2 -- > 3 files changed, 102 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index 45af70315a94..7f645a4c1298 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -298,19 +298,6 @@ static inline unsigned int arch_slab_minalign(void) > #endif > #endif > > -#ifdef CONFIG_SLOB > -/* > - * SLOB passes all requests larger than one page to the page allocator. > - * No kmalloc array is necessary since objects of different sizes can > - * be allocated from the same page. > - */ > -#define KMALLOC_SHIFT_HIGH PAGE_SHIFT > -#define KMALLOC_SHIFT_MAX (MAX_ORDER + PAGE_SHIFT - 1) > -#ifndef KMALLOC_SHIFT_LOW > -#define KMALLOC_SHIFT_LOW 3 > -#endif > -#endif > - > /* Maximum allocatable size */ > #define KMALLOC_MAX_SIZE (1UL << KMALLOC_SHIFT_MAX) > /* Maximum size for which we actually use a slab cache */ > @@ -366,7 +353,6 @@ enum kmalloc_cache_type { > NR_KMALLOC_TYPES > }; > > -#ifndef CONFIG_SLOB > extern struct kmem_cache * > kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1]; > > @@ -458,7 +444,6 @@ static __always_inline unsigned int __kmalloc_index(size_t size, > } > static_assert(PAGE_SHIFT <= 20); > #define kmalloc_index(s) __kmalloc_index(s, true) > -#endif /* !CONFIG_SLOB */ > > void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __alloc_size(1); > > @@ -487,10 +472,6 @@ void kmem_cache_free(struct kmem_cache *s, void *objp); > void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p); > int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, void **p); > > -/* > - * Caller must not use kfree_bulk() on memory not originally allocated > - * by kmalloc(), because the SLOB allocator cannot handle this. > - */ > static __always_inline void kfree_bulk(size_t size, void **p) > { > kmem_cache_free_bulk(NULL, size, p); > @@ -567,7 +548,6 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align > * Try really hard to succeed the allocation but fail > * eventually. > */ > -#ifndef CONFIG_SLOB > static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > { > if (__builtin_constant_p(size) && size) { > @@ -583,17 +563,7 @@ static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > } > return __kmalloc(size, flags); > } > -#else > -static __always_inline __alloc_size(1) void *kmalloc(size_t size, gfp_t flags) > -{ > - if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE) > - return kmalloc_large(size, flags); > - > - return __kmalloc(size, flags); > -} > -#endif > > -#ifndef CONFIG_SLOB > static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node) > { > if (__builtin_constant_p(size) && size) { > @@ -609,15 +579,6 @@ static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t fla > } > return __kmalloc_node(size, flags, node); > } > -#else > -static __always_inline __alloc_size(1) void *kmalloc_node(size_t size, gfp_t flags, int node) > -{ > - if (__builtin_constant_p(size) && size > KMALLOC_MAX_CACHE_SIZE) > - return kmalloc_large_node(size, flags, node); > - > - return __kmalloc_node(size, flags, node); > -} > -#endif > > /** > * kmalloc_array - allocate memory for an array. > diff --git a/mm/slab.h b/mm/slab.h > index 43966aa5fadf..399966b3ce52 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -51,14 +51,6 @@ struct slab { > }; > unsigned int __unused; > > -#elif defined(CONFIG_SLOB) > - > - struct list_head slab_list; > - void *__unused_1; > - void *freelist; /* first free block */ > - long units; > - unsigned int __unused_2; > - > #else > #error "Unexpected slab allocator configured" > #endif > @@ -72,11 +64,7 @@ struct slab { > #define SLAB_MATCH(pg, sl) \ > static_assert(offsetof(struct page, pg) == offsetof(struct slab, sl)) > SLAB_MATCH(flags, __page_flags); > -#ifndef CONFIG_SLOB > SLAB_MATCH(compound_head, slab_cache); /* Ensure bit 0 is clear */ > -#else > -SLAB_MATCH(compound_head, slab_list); /* Ensure bit 0 is clear */ > -#endif > SLAB_MATCH(_refcount, __page_refcount); > #ifdef CONFIG_MEMCG > SLAB_MATCH(memcg_data, memcg_data); > @@ -200,31 +188,6 @@ static inline size_t slab_size(const struct slab *slab) > return PAGE_SIZE << slab_order(slab); > } > > -#ifdef CONFIG_SLOB > -/* > - * Common fields provided in kmem_cache by all slab allocators > - * This struct is either used directly by the allocator (SLOB) > - * or the allocator must include definitions for all fields > - * provided in kmem_cache_common in their definition of kmem_cache. > - * > - * Once we can do anonymous structs (C11 standard) we could put a > - * anonymous struct definition in these allocators so that the > - * separate allocations in the kmem_cache structure of SLAB and > - * SLUB is no longer needed. > - */ > -struct kmem_cache { > - unsigned int object_size;/* The original size of the object */ > - unsigned int size; /* The aligned/padded/added on size */ > - unsigned int align; /* Alignment as calculated */ > - slab_flags_t flags; /* Active flags on the slab */ > - const char *name; /* Slab name for sysfs */ > - int refcount; /* Use counter */ > - void (*ctor)(void *); /* Called on object slot creation */ > - struct list_head list; /* List of all slab caches on the system */ > -}; > - > -#endif /* CONFIG_SLOB */ > - > #ifdef CONFIG_SLAB > #include > #endif > @@ -274,7 +237,6 @@ extern const struct kmalloc_info_struct { > unsigned int size; > } kmalloc_info[]; > > -#ifndef CONFIG_SLOB > /* Kmalloc array related functions */ > void setup_kmalloc_cache_index_table(void); > void create_kmalloc_caches(slab_flags_t); > @@ -286,7 +248,6 @@ void *__kmem_cache_alloc_node(struct kmem_cache *s, gfp_t gfpflags, > int node, size_t orig_size, > unsigned long caller); > void __kmem_cache_free(struct kmem_cache *s, void *x, unsigned long caller); > -#endif > > gfp_t kmalloc_fix_flags(gfp_t flags); > > @@ -303,33 +264,16 @@ extern void create_boot_cache(struct kmem_cache *, const char *name, > int slab_unmergeable(struct kmem_cache *s); > struct kmem_cache *find_mergeable(unsigned size, unsigned align, > slab_flags_t flags, const char *name, void (*ctor)(void *)); > -#ifndef CONFIG_SLOB > 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); > -#else > -static inline struct kmem_cache * > -__kmem_cache_alias(const char *name, unsigned int size, unsigned int align, > - slab_flags_t flags, void (*ctor)(void *)) > -{ return NULL; } > - > -static inline slab_flags_t kmem_cache_flags(unsigned int object_size, > - slab_flags_t flags, const char *name) > -{ > - return flags; > -} > -#endif > > static inline bool is_kmalloc_cache(struct kmem_cache *s) > { > -#ifndef CONFIG_SLOB > return (s->flags & SLAB_KMALLOC); > -#else > - return false; > -#endif > } > > /* Legal flag mask for kmem_cache_create(), for various configurations */ > @@ -634,7 +578,6 @@ static inline void memcg_slab_free_hook(struct kmem_cache *s, struct slab *slab, > } > #endif /* CONFIG_MEMCG_KMEM */ > > -#ifndef CONFIG_SLOB > static inline struct kmem_cache *virt_to_cache(const void *obj) > { > struct slab *slab; > @@ -684,8 +627,6 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x) > > void free_large_kmalloc(struct folio *folio, void *object); > > -#endif /* CONFIG_SLOB */ > - > size_t __ksize(const void *objp); > > static inline size_t slab_ksize(const struct kmem_cache *s) > @@ -777,7 +718,6 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, > memcg_slab_post_alloc_hook(s, objcg, flags, size, p); > } > > -#ifndef CONFIG_SLOB > /* > * The slab lists for all objects. > */ > @@ -824,7 +764,6 @@ static inline struct kmem_cache_node *get_node(struct kmem_cache *s, int node) > for (__node = 0; __node < nr_node_ids; __node++) \ > if ((__n = get_node(__s, __node))) > > -#endif > > #if defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG) > void dump_unreclaimable_slab(void); > diff --git a/mm/slab_common.c b/mm/slab_common.c > index bf4e777cfe90..1522693295f5 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -625,7 +625,6 @@ void kmem_dump_obj(void *object) > EXPORT_SYMBOL_GPL(kmem_dump_obj); > #endif > > -#ifndef CONFIG_SLOB > /* Create a cache during boot when no slab services are available yet */ > void __init create_boot_cache(struct kmem_cache *s, const char *name, > unsigned int size, slab_flags_t flags, > @@ -1079,7 +1078,6 @@ void *kmalloc_node_trace(struct kmem_cache *s, gfp_t gfpflags, > return ret; > } > EXPORT_SYMBOL(kmalloc_node_trace); > -#endif /* !CONFIG_SLOB */ > > gfp_t kmalloc_fix_flags(gfp_t flags) > { Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > -- > 2.39.2 >