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 6D5ACC04A68 for ; Thu, 28 Jul 2022 16:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E910E940007; Thu, 28 Jul 2022 12:13:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E40648E0001; Thu, 28 Jul 2022 12:13:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D0920940007; Thu, 28 Jul 2022 12:13:11 -0400 (EDT) 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 C158E8E0001 for ; Thu, 28 Jul 2022 12:13:11 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8381F140BF2 for ; Thu, 28 Jul 2022 16:13:11 +0000 (UTC) X-FDA: 79737002982.08.F803450 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf24.hostedemail.com (Postfix) with ESMTP id DE1851800CE for ; Thu, 28 Jul 2022 16:13:10 +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 D697B1FBAD; Thu, 28 Jul 2022 16:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1659024789; 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=uFNLMsmaiX/KJpwTe1Kl7r0olPyBVX9u4w3byywnZaQ=; b=usHCPZMY4s4WbBkvRuD2vTWO1umj/trRQm5sTbc39MjAG/uLxnnEVAKF9Bim0Z73MR6wjZ /UEfFFonAjwfqvAYBi5JNx47btffkBIfJWtAU1He1/hO3WuKve4QYe30NouUak4TfIBPwB F3rxOAieDIrRLeVYZHDGtD3oLR6PpNw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1659024789; 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=uFNLMsmaiX/KJpwTe1Kl7r0olPyBVX9u4w3byywnZaQ=; b=BamlEN9VBPnmc6zaO2Wyiok82LF254+J3XaWxFoJcCvvsGOldWETK2stJ6hX9DHKrZ6GK/ +7UKQ4UJEU1JeLCA== 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 AA7E913427; Thu, 28 Jul 2022 16:13:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4Ai7KJW14mKZDgAAMHmgww (envelope-from ); Thu, 28 Jul 2022 16:13:09 +0000 Message-ID: <33ae1986-6f92-aa15-1be5-c7ae79320a34@suse.cz> Date: Thu, 28 Jul 2022 18:13:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v3 09/15] mm/slab_common: cleanup kmalloc_large() Content-Language: en-US To: Hyeonggon Yoo <42.hyeyoo@gmail.com>, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Roman Gushchin , Joe Perches , Vasily Averin , Matthew WilCox Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20220712133946.307181-1-42.hyeyoo@gmail.com> <20220712133946.307181-10-42.hyeyoo@gmail.com> From: Vlastimil Babka In-Reply-To: <20220712133946.307181-10-42.hyeyoo@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=usHCPZMY; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=BamlEN9V; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659024791; a=rsa-sha256; cv=none; b=iPYUUXNpDmveMMVBEumzgI1fpRSLPOzgXqxOET3iNhEpng+4Ccz/8PVrhCWBuSTjjY8r9s ISAYGZoKDuESZIz6aGcGm+47sg6anPK4dp0xl9bFV/Wx4lmquK4w5z1wulcL4hO5MCAQPV 3BrjHWlN0GeUnMFZVnED5IKHP9ELz5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659024791; 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=uFNLMsmaiX/KJpwTe1Kl7r0olPyBVX9u4w3byywnZaQ=; b=KqA9u6sIhSfdMkD4dyXCKnknlVJSEcXVsr6RLeIq+Cj9wu2MEjrq1SE+fNVjDHwoKWs0yo soft0STI28MN5bD+4qWUwFhRBemkc13OjbpsIEM/4H1OEjCdFkQ79CFmbf+krAOQX5bACM V82HKAkFp1Y1U0p6NV5CON8ZowUot5M= Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=usHCPZMY; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=BamlEN9V; 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-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: DE1851800CE X-Stat-Signature: ds5xxkar8pumetaancz6exp1fwynu9zw X-HE-Tag: 1659024790-772443 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 7/12/22 15:39, Hyeonggon Yoo wrote: > Now that kmalloc_large() and kmalloc_large_node() do mostly same job, > make kmalloc_large() wrapper of __kmalloc_large_node_notrace(). > > In the meantime, add missing flag fix code in > __kmalloc_large_node_notrace(). > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Vlastimil Babka > --- > mm/slab_common.c | 36 +++++++++++++----------------------- > 1 file changed, 13 insertions(+), 23 deletions(-) > > diff --git a/mm/slab_common.c b/mm/slab_common.c > index dc872e0ef0fc..9c46e2f9589f 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -932,29 +932,6 @@ gfp_t kmalloc_fix_flags(gfp_t flags) > * directly to the page allocator. We use __GFP_COMP, because we will need to > * know the allocation order to free the pages properly in kfree. > */ > -void *kmalloc_large(size_t size, gfp_t flags) > -{ > - void *ret = NULL; > - struct page *page; > - unsigned int order = get_order(size); > - > - if (unlikely(flags & GFP_SLAB_BUG_MASK)) > - flags = kmalloc_fix_flags(flags); > - > - flags |= __GFP_COMP; > - page = alloc_pages(flags, order); > - if (likely(page)) { > - ret = page_address(page); > - mod_lruvec_page_state(page, NR_SLAB_UNRECLAIMABLE_B, > - PAGE_SIZE << order); > - } > - ret = kasan_kmalloc_large(ret, size, flags); > - /* As ret might get tagged, call kmemleak hook after KASAN. */ > - kmemleak_alloc(ret, size, 1, flags); > - trace_kmalloc(_RET_IP_, ret, NULL, size, PAGE_SIZE << order, flags); > - return ret; > -} > -EXPORT_SYMBOL(kmalloc_large); > > static __always_inline > void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) > @@ -963,6 +940,9 @@ void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) > void *ptr = NULL; > unsigned int order = get_order(size); > > + if (unlikely(flags & GFP_SLAB_BUG_MASK)) > + flags = kmalloc_fix_flags(flags); > + > flags |= __GFP_COMP; > page = alloc_pages_node(node, flags, order); > if (page) { > @@ -978,6 +958,16 @@ void *__kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) > return ptr; > } > > +void *kmalloc_large(size_t size, gfp_t flags) > +{ > + void *ret = __kmalloc_large_node_notrace(size, flags, NUMA_NO_NODE); > + > + trace_kmalloc(_RET_IP_, ret, NULL, size, > + PAGE_SIZE << get_order(size), flags); > + return ret; > +} > +EXPORT_SYMBOL(kmalloc_large); > + > void *kmalloc_large_node_notrace(size_t size, gfp_t flags, int node) > { > return __kmalloc_large_node_notrace(size, flags, node);