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 8ADACC433F5 for ; Fri, 29 Apr 2022 14:30:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E2386B0072; Fri, 29 Apr 2022 10:30:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 093406B0073; Fri, 29 Apr 2022 10:30:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9CC46B0074; Fri, 29 Apr 2022 10:30:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id D75156B0072 for ; Fri, 29 Apr 2022 10:30:31 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9ACEC204C1 for ; Fri, 29 Apr 2022 14:30:31 +0000 (UTC) X-FDA: 79410152262.30.5C4CD90 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf08.hostedemail.com (Postfix) with ESMTP id E3972160052 for ; Fri, 29 Apr 2022 14:30:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A18601F892; Fri, 29 Apr 2022 14:30:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1651242629; h=from:from:reply-to: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=IbK2VEqmYvpAFl5tGkzJpb/gXsPJVD0IA8jHw9TPBBk=; b=zb3JmXdLKXZdz1SwxC3xXgYjGHX9p5y+S0k/iQ0ddBWXXwriLGxqFXaAj/HZDqWBpHvtg7 lppkHfqFouL41dY0l05RcDB5FyWCPsccPM1yLlT/1clnOgZgP3M8KKi235D4DPup8pegLP rdsrc36ZcYAHO2xiNFl6g9InqAgBuro= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1651242629; h=from:from:reply-to: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=IbK2VEqmYvpAFl5tGkzJpb/gXsPJVD0IA8jHw9TPBBk=; b=wSCik5wU9movZ6tpuQnC+FTt9dt6fvNtbO5+a2+LMTGXrv2DvT6D+6Piy4299sC+GcxeUk ug8mqwoAP8H1KsBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7887313AE0; Fri, 29 Apr 2022 14:30:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id RKVyHIX2a2JIFwAAMHmgww (envelope-from ); Fri, 29 Apr 2022 14:30:29 +0000 Message-ID: <3a12e66d-58cb-d768-7b2e-4eb239c03ee6@suse.cz> Date: Fri, 29 Apr 2022 16:30:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH v2 18/23] mm/sl[au]b: generalize kmalloc subsystem Content-Language: en-US To: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Marco Elver , Matthew WilCox , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20220414085727.643099-1-42.hyeyoo@gmail.com> <20220414085727.643099-19-42.hyeyoo@gmail.com> From: Vlastimil Babka In-Reply-To: <20220414085727.643099-19-42.hyeyoo@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 4zqnb14apxfz1mw9z1bz5a7pzh4efgqu X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E3972160052 X-Rspam-User: Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=zb3JmXdL; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=wSCik5wU; dmarc=none; spf=pass (imf08.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-HE-Tag: 1651242623-681714 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 4/14/22 10:57, Hyeonggon Yoo wrote: > Now everything in kmalloc subsystem can be generalized. > Let's do it! > > Generalize __kmalloc_node_track_caller(), kfree(), __ksize(), > __kmalloc_node() and move them to slab_common.c. > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > --- > mm/slab.c | 94 ----------------------------------------------- > mm/slab_common.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ > mm/slub.c | 88 -------------------------------------------- > 3 files changed, 95 insertions(+), 182 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index d35873da5572..fc00aca62ae3 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -3527,36 +3527,6 @@ void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, > EXPORT_SYMBOL(kmem_cache_alloc_node_trace); > #endif > > -static __always_inline void * > -__do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller) > -{ > - struct kmem_cache *cachep; > - void *ret; > - > - if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) > - return kmalloc_large_node(size, flags, node); > - cachep = kmalloc_slab(size, flags); > - if (unlikely(ZERO_OR_NULL_PTR(cachep))) > - return cachep; > - ret = kmem_cache_alloc_node_trace(cachep, flags, node, size); > - ret = kasan_kmalloc(cachep, ret, size, flags); SLAB did kasan_kmalloc() when called from __kmalloc_node_track_caller(), and will not do after this patch, until the next patch 19/23. So I would just fold it to this patch. > - > - return ret; > -} > - > -void *__kmalloc_node(size_t size, gfp_t flags, int node) > -{ > - return __do_kmalloc_node(size, flags, node, _RET_IP_); > -} > -EXPORT_SYMBOL(__kmalloc_node); > - > -void *__kmalloc_node_track_caller(size_t size, gfp_t flags, > - int node, unsigned long caller) > -{ > - return __do_kmalloc_node(size, flags, node, caller); > -} > -EXPORT_SYMBOL(__kmalloc_node_track_caller); > - > #ifdef CONFIG_PRINTK > void kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab) > {