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 B8DAFC433EF for ; Thu, 7 Apr 2022 03:47:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 808A56B0073; Wed, 6 Apr 2022 23:46:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 791486B0074; Wed, 6 Apr 2022 23:46:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60B036B0075; Wed, 6 Apr 2022 23:46:56 -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 505D76B0073 for ; Wed, 6 Apr 2022 23:46:56 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1C48A289D4 for ; Thu, 7 Apr 2022 03:46:46 +0000 (UTC) X-FDA: 79328696412.10.E2AB3E3 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf30.hostedemail.com (Postfix) with ESMTP id 99CB080005 for ; Thu, 7 Apr 2022 03:46:45 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id y10so4309217pfa.7 for ; Wed, 06 Apr 2022 20:46:45 -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=afe3P8RqNChPkxC3rOsgiNHx8HENBTi8Jfkw7G43ebM=; b=d1JMhD/H3yQw+VDKVizT9O7dnKTJtEGUjWxAsZVvSWWX88idfpSfbtGxnDr/P4LgeU MSaR4wx92K/Dwt151SdmS8ARTGgEIlyYD8Uti2RpEAQmvmkQp5uRr3s/u03Xmi+JCPdR fDaD9L4rD9sPoUyRVE4MHIh5879MW7Uwr8pNOiSAz/yliO/91jmGIC755eKO835uEpTm E/EMRQ5wSWbaRQqXB2NFaKojrDBedxO1WFc7MuspaimbZVksUrzrJ4X8Rk1tVNh2dU0W VWMCXcCHs2SXBgBmoEePa/ZgzI8swxUYboPY0wpg+wD9DF6z7UAS6xiGvv55cZSi2OdW Cwtg== 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=afe3P8RqNChPkxC3rOsgiNHx8HENBTi8Jfkw7G43ebM=; b=VDjIn4twfPYQlFDtQWSouJhZ/3NVDg0XLiyCeHEuT4Oj8v69QOM7wk3H01rTQhCpze 8J5zafvedT0JPsq9pyPK0LS33oF6OgvHwkv1Liliexg+h2I68GX3sxWaA91sMr+P/cMp 6NQJDlikhLPoZvS2Kic/mrTA6RVZ4k679HlpX/K1el2SbZ8Ur2Gc1fDswjFkE6LoI8BB yoq0xYQ7By5ZuWcmqk5SjxPluTTtKnr7rZDoElTuMeBJXulQSTGIk58bRCZCfsy1f9r7 pF91DsjU1PujgJIIBI2XRjfcRwC0wrAmjaUPMwHxZW2Id4CszSE1W0erLjgwpd67U3Ie 6u5g== X-Gm-Message-State: AOAM5302X3QFTxXy8Vv/gl86rP305yxNub3VIrGKoKdM3Cxmo5AMjZJM 8vJohjp0qSzwkyXpyHRJor0= X-Google-Smtp-Source: ABdhPJyAPXTXgV2oaMugw/XVi258KT6BhPySFoGDVPM27Hjv6I1XE4AM7kPPITDYhuOowocmGQ1WhA== X-Received: by 2002:a63:214c:0:b0:381:1a27:fe1 with SMTP id s12-20020a63214c000000b003811a270fe1mr9516290pgm.328.1649303204413; Wed, 06 Apr 2022 20:46:44 -0700 (PDT) Received: from ip-172-31-19-208.ap-northeast-1.compute.internal (ec2-18-181-137-102.ap-northeast-1.compute.amazonaws.com. [18.181.137.102]) by smtp.gmail.com with ESMTPSA id mn22-20020a17090b189600b001ca86a1e41dsm6782727pjb.52.2022.04.06.20.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 20:46:42 -0700 (PDT) Date: Thu, 7 Apr 2022 03:46:37 +0000 From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Catalin Marinas Cc: Will Deacon , Marc Zyngier , Arnd Bergmann , Greg Kroah-Hartman , Andrew Morton , Linus Torvalds , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 08/10] mm/slab: Allow dynamic kmalloc() minimum alignment Message-ID: References: <20220405135758.774016-1-catalin.marinas@arm.com> <20220405135758.774016-9-catalin.marinas@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220405135758.774016-9-catalin.marinas@arm.com> X-Stat-Signature: fo6udxjxmijuypadex1zgd18bigjo7qg Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="d1JMhD/H"; spf=pass (imf30.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.210.177 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 99CB080005 X-HE-Tag: 1649303205-523587 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 Tue, Apr 05, 2022 at 02:57:56PM +0100, Catalin Marinas wrote: > ARCH_KMALLOC_MINALIGN represents the minimum guaranteed kmalloc() > alignment but an architecture may require a larger run-time alignment. > Do not create kmalloc caches smaller than arch_kmalloc_minalign(). > > Signed-off-by: Catalin Marinas > Cc: Andrew Morton > --- > include/linux/slab.h | 2 ++ > mm/slab.c | 6 +----- > mm/slab.h | 2 ++ > mm/slab_common.c | 33 +++++++++++++++++++++++---------- > 4 files changed, 28 insertions(+), 15 deletions(-) > > diff --git a/include/linux/slab.h b/include/linux/slab.h > index d58211bdeceb..2137dba85691 100644 > --- a/include/linux/slab.h > +++ b/include/linux/slab.h > @@ -332,6 +332,8 @@ enum kmalloc_cache_type { > extern struct kmem_cache * > kmalloc_caches[NR_KMALLOC_TYPES][KMALLOC_SHIFT_HIGH + 1]; > > +unsigned int arch_kmalloc_minalign(void); > + > /* > * Define gfp bits that should not be set for KMALLOC_NORMAL. > */ > diff --git a/mm/slab.c b/mm/slab.c > index b04e40078bdf..4aaeeb9c994d 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -1256,11 +1256,7 @@ void __init kmem_cache_init(void) > * Initialize the caches that provide memory for the kmem_cache_node > * structures first. Without this, further allocations will bug. > */ > - kmalloc_caches[KMALLOC_NORMAL][INDEX_NODE] = create_kmalloc_cache( > - kmalloc_info[INDEX_NODE].name[KMALLOC_NORMAL], > - kmalloc_info[INDEX_NODE].size, > - ARCH_KMALLOC_FLAGS, 0, > - kmalloc_info[INDEX_NODE].size); > + new_kmalloc_cache(INDEX_NODE, KMALLOC_NORMAL, ARCH_KMALLOC_FLAGS); > slab_state = PARTIAL_NODE; > setup_kmalloc_cache_index_table(); > > diff --git a/mm/slab.h b/mm/slab.h > index fd7ae2024897..e9238406602a 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -283,6 +283,8 @@ int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags); > struct kmem_cache *create_kmalloc_cache(const char *name, unsigned int size, > slab_flags_t flags, unsigned int useroffset, > unsigned int usersize); > +void __init new_kmalloc_cache(int idx, enum kmalloc_cache_type type, > + slab_flags_t flags); > extern void create_boot_cache(struct kmem_cache *, const char *name, > unsigned int size, slab_flags_t flags, > unsigned int useroffset, unsigned int usersize); > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 6ee64d6208b3..594d8a8a68d0 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -838,9 +838,18 @@ void __init setup_kmalloc_cache_index_table(void) > } > } > > -static void __init > +unsigned int __weak arch_kmalloc_minalign(void) > +{ > + return ARCH_KMALLOC_MINALIGN; > +} > + As ARCH_KMALLOC_ALIGN and arch_kmalloc_minalign() may not be same after patch 10, I think s/ARCH_KMALLOC_ALIGN/arch_kmalloc_minalign/g for every user of it would be more correct? > +void __init > new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) > { > + unsigned int minalign = arch_kmalloc_minalign(); > + unsigned int aligned_size = kmalloc_info[idx].size; > + int aligned_idx = idx; > + > if (type == KMALLOC_RECLAIM) { > flags |= SLAB_RECLAIM_ACCOUNT; > } else if (IS_ENABLED(CONFIG_MEMCG_KMEM) && (type == KMALLOC_CGROUP)) { > @@ -851,10 +860,17 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags) > flags |= SLAB_ACCOUNT; > } > > - kmalloc_caches[type][idx] = create_kmalloc_cache( > - kmalloc_info[idx].name[type], > - kmalloc_info[idx].size, flags, 0, > - kmalloc_info[idx].size); > + if (minalign > ARCH_KMALLOC_MINALIGN) { > + aligned_size = ALIGN(aligned_size, minalign); > + aligned_idx = __kmalloc_index(aligned_size, false); > + } > + > + if (!kmalloc_caches[type][aligned_idx]) > + kmalloc_caches[type][aligned_idx] = create_kmalloc_cache( > + kmalloc_info[aligned_idx].name[type], > + aligned_size, flags, 0, aligned_size); > + if (idx != aligned_idx) > + kmalloc_caches[type][idx] = kmalloc_caches[type][aligned_idx]; I would prefer detecting minimum kmalloc size in create_kmalloc_caches() in runtime instead of changing behavior of new_kmalloc_cache(). > /* > * If CONFIG_MEMCG_KMEM is enabled, disable cache merging for > @@ -904,11 +920,8 @@ void __init create_kmalloc_caches(slab_flags_t flags) > struct kmem_cache *s = kmalloc_caches[KMALLOC_NORMAL][i]; > > if (s) { > - kmalloc_caches[KMALLOC_DMA][i] = create_kmalloc_cache( > - kmalloc_info[i].name[KMALLOC_DMA], > - kmalloc_info[i].size, > - SLAB_CACHE_DMA | flags, 0, > - kmalloc_info[i].size); > + new_kmalloc_cache(i, KMALLOC_DMA, > + SLAB_CACHE_DMA | flags); > } > } > #endif -- Thank you, You are awesome! Hyeonggon :-)