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 4C341C433EF for ; Fri, 29 Apr 2022 14:49:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA5146B0072; Fri, 29 Apr 2022 10:48:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B52C06B0073; Fri, 29 Apr 2022 10:48:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1A406B0074; Fri, 29 Apr 2022 10:48:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.25]) by kanga.kvack.org (Postfix) with ESMTP id 92E856B0072 for ; Fri, 29 Apr 2022 10:48:59 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 64B76208E7 for ; Fri, 29 Apr 2022 14:48:59 +0000 (UTC) X-FDA: 79410198798.12.C97FBC6 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf24.hostedemail.com (Postfix) with ESMTP id F0D3618007D for ; Fri, 29 Apr 2022 14:48:53 +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 21F7D1F892; Fri, 29 Apr 2022 14:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1651243737; 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=jJ3f1N/Kx7PKn1skloQ8FgV1j1hvN5zrUlINdB+GFGY=; b=aF3w5ZLmNsQpLlGrT1jnB+RTlwq+CK4IZ5uHkoiR6aExnWt5e1zWS/RlTlkAiomeWiP2l7 hZX4mptcPLoQ4V9U/wgVyAPZOCXGBSxCT70u3N1zWFHO78yBw7ZV06q5tloucl+kiBgCE5 LG8uJA4VYbOcLEyglqW8ncpMnHYXP3Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1651243737; 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=jJ3f1N/Kx7PKn1skloQ8FgV1j1hvN5zrUlINdB+GFGY=; b=DUZWIGaW/OKRFr3H2RQDlZ6yyzmyKmNo3vsB98UVp0BkKq9v98rBlVaqM9C3/cLHb9hGYU CfZRYRrFzpQ7HVAw== 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 CCCA213AE0; Fri, 29 Apr 2022 14:48:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id e8qPMNj6a2LHHgAAMHmgww (envelope-from ); Fri, 29 Apr 2022 14:48:56 +0000 Message-ID: <76fe118f-0092-83de-7881-0bface4fc283@suse.cz> Date: Fri, 29 Apr 2022 16:48:56 +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 20/23] mm/slab_common: factor out __do_kmalloc_node() 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-21-42.hyeyoo@gmail.com> From: Vlastimil Babka In-Reply-To: <20220414085727.643099-21-42.hyeyoo@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: F0D3618007D X-Stat-Signature: qbbge4y77mfki4y5fa95ic8ij1oi9g4q X-Rspam-User: Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=aF3w5ZLm; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=DUZWIGaW; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-HE-Tag: 1651243733-833195 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: > Factor out common code into __do_kmalloc_node(). > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Looks good but let's see how things look like after changes to previous patches. > --- > mm/slab_common.c | 27 ++++++++++----------------- > 1 file changed, 10 insertions(+), 17 deletions(-) > > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 6abe7f61c197..af563e64e8aa 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -919,7 +919,9 @@ void free_large_kmalloc(struct folio *folio, void *object) > __free_pages(folio_page(folio, 0), order); > } > > -void *__kmalloc_node(size_t size, gfp_t flags, int node) > +static __always_inline > +void *__do_kmalloc_node(size_t size, gfp_t flags, int node, > + unsigned long caller __maybe_unused) > { > struct kmem_cache *s; > void *ret; > @@ -932,31 +934,22 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) > if (unlikely(ZERO_OR_NULL_PTR(s))) > return s; > > - ret = __kmem_cache_alloc_node(s, NULL, flags, node, _RET_IP_); > + ret = __kmem_cache_alloc_node(s, NULL, flags, node, caller); > ret = kasan_kmalloc(s, ret, size, flags); > > 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 gfpflags, > int node, unsigned long caller) > { > - struct kmem_cache *s; > - void *ret; > - > - if (unlikely(size > KMALLOC_MAX_CACHE_SIZE)) > - return kmalloc_large_node(size, gfpflags, node); > - > - s = kmalloc_slab(size, gfpflags); > - > - if (unlikely(ZERO_OR_NULL_PTR(s))) > - return s; > - > - ret = __kmem_cache_alloc_node(s, NULL, gfpflags, node, caller); > - ret = kasan_kmalloc(s, ret, size, gfpflags); > - > - return ret; > + return __do_kmalloc_node(size, flags, node, caller); > } > EXPORT_SYMBOL(__kmalloc_node_track_caller); >