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 0403CC433EF for ; Fri, 22 Apr 2022 12:46:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 752B96B0074; Fri, 22 Apr 2022 08:46:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 700FF6B0075; Fri, 22 Apr 2022 08:46:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C9366B0078; Fri, 22 Apr 2022 08:46:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id 4CE7F6B0074 for ; Fri, 22 Apr 2022 08:46:20 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 19F43240A7 for ; Fri, 22 Apr 2022 12:46:20 +0000 (UTC) X-FDA: 79384488120.14.BA97A15 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf28.hostedemail.com (Postfix) with ESMTP id 34E99C0031 for ; Fri, 22 Apr 2022 12:46:16 +0000 (UTC) Received: by mail-pl1-f181.google.com with SMTP id n8so10645267plh.1 for ; Fri, 22 Apr 2022 05:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=TssqWSCUtM99yB2weekRLelNZn0id75Zrkx5XljmNCI=; b=eVpFjhxnWCXhGc3aru33nXNQWFa6GTAqYVyc6IL5o/roTdkaNcRWwywMzg0sU+Xqvv MtfvBoi02hXEOAxFTLa03aWu2H+EgKWcIi03Ag4IHYkNB5LMJlSVVm7IfezA2ghumVNu 4jNkfTWQ0gcv/Tuk8/PljVFEuRRanMh66N18ff9HYFxeO3MhuG2oc5vZW2AwsODGW4hc 0KM+tuF0Qiuuysh8VlwQo/3eYQJUoZYLf5QY/b6TV4wKfuSJJBaE5NAIG+5ZrtHuZaNY wj9dLa4+q/PvFSwWvollKWUBn1JFgAkvsrroMdLmoWQrirGlH3tspFUxK0vF1m555U4H Uu6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=TssqWSCUtM99yB2weekRLelNZn0id75Zrkx5XljmNCI=; b=O+vS2weSQPIE6GLobkd6X//Y4YGSILB9BtlCj22sIeBjndULGNjhLZy5FH0w6pOUmp itfvqo2x2skJqafNmbMQfTuc8YGo9F79pL7KWWXhG9odEsAJYm47Gfew0EnF75AoLZhI QRU23z6LGliRsR1AJBFGQKZ30IwdL2S2pCaovNYYG7ojUA8G2nWrDaFAFB374944prEZ Y/pMhUJjikr5XeE4yVTmvQYxQj+F9JIRyzWbE/6LRWRTbxlhGDUXdtPXcx+adwlks9gc s/4e5N/T6/u75vO2lU+haHs00djUqyk9pKCC2Q8ZJwNY6mniCtfBwaUaHw+U+E7Pvdl0 a+xw== X-Gm-Message-State: AOAM5313soVX06xNkuowDh5x3zC5oeEHCopMFEOo3TtyQ0OHEkXopxRZ NE/PRhK1CL6TH9ezI0gLQm4= X-Google-Smtp-Source: ABdhPJwnD1YpVhikvRlyFh1pkAgpkFdAnSUzqAOuVn9vieZ74AFaTxJAMMVlsE5U9ZgsCb+pIdYt4w== X-Received: by 2002:a17:902:9041:b0:159:e08:5f4b with SMTP id w1-20020a170902904100b001590e085f4bmr4395515plz.33.1650631578618; Fri, 22 Apr 2022 05:46:18 -0700 (PDT) Received: from hyeyoo ([114.29.24.243]) by smtp.gmail.com with ESMTPSA id v16-20020a62a510000000b0050759c9a891sm2538866pfm.6.2022.04.22.05.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 05:46:16 -0700 (PDT) Date: Fri, 22 Apr 2022 21:46:09 +0900 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Vlastimil Babka Cc: linux-mm@kvack.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Marco Elver , Matthew WilCox , Roman Gushchin , linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH v1 08/15] mm/sl[auo]b: cleanup kmalloc() Message-ID: References: <20220308114142.1744229-1-42.hyeyoo@gmail.com> <20220308114142.1744229-9-42.hyeyoo@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 34E99C0031 X-Stat-Signature: e1b7ai9h1r3qfnk4ydd3iedrcrnu4hac Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=eVpFjhxn; spf=pass (imf28.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-HE-Tag: 1650631576-147901 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 Thu, Mar 24, 2022 at 06:46:34PM +0100, Vlastimil Babka wrote: > On 3/8/22 12:41, Hyeonggon Yoo wrote: > > Now that kmalloc() and kmalloc_node() do same job, make kmalloc() > > wrapper of kmalloc_node(). > > > > Remove kmalloc_trace() that is now unused. This patch makes slab > > allocator use kmalloc_node tracepoints in kmalloc(). > > > > Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > > Actually there are more things to fix than the commit log. > > > +#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)) { > > + unsigned int index; > > + > > + if (size > KMALLOC_MAX_CACHE_SIZE) > > + return kmalloc_large(size, flags); > > Should use kmalloc_large_node(). > > > + > > + index = kmalloc_index(size); > > + > > + if (!index) > > + return ZERO_SIZE_PTR; > > + > > + return kmem_cache_alloc_node_trace( > > + kmalloc_caches[kmalloc_type(flags)][index], > > + flags, node, size); > > + } > > + 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(size, flags); > > And here. > Sorry for the mistake. did it in v2. thanks! > > + > > + return __kmalloc_node(size, flags, node); > > +} > > +#endif -- Thanks, Hyeonggon