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 3C8CBC433FE for ; Sun, 6 Nov 2022 20:56:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 454DE8E0002; Sun, 6 Nov 2022 15:56:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4057F8E0001; Sun, 6 Nov 2022 15:56:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CCFA8E0002; Sun, 6 Nov 2022 15:56:05 -0500 (EST) 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 183DA8E0001 for ; Sun, 6 Nov 2022 15:56:05 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D448AA02AE for ; Sun, 6 Nov 2022 20:56:04 +0000 (UTC) X-FDA: 80104224648.18.41C10C7 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf16.hostedemail.com (Postfix) with ESMTP id B575F180004 for ; Sun, 6 Nov 2022 20:56:02 +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-out1.suse.de (Postfix) with ESMTPS id 3035E22522; Sun, 6 Nov 2022 20:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1667768161; 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=ZtjHZhTXVaGjQcJVa95fXnoOmRq7kv/Z46oADISZGSU=; b=HAkMG7zHvJxEfRZQcfZaiyCQUnZF0sQ/QvviRRjN25NoY7CJSDKuBxNzNmihz6WLaoCvM0 jyc4wJWWQ8Xszwc7gXwNppmN351gq8BMZ79vMUtOqr2r/XE4LehQQ6QmOuDc2qcapN8vdn QRQ7R6G1YDKkTCkW7Vvd0EByzFdjWBY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1667768161; 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=ZtjHZhTXVaGjQcJVa95fXnoOmRq7kv/Z46oADISZGSU=; b=EpUpFW9X9hU+kQuKMsWg56gKGJ4tA5iKd++PJ3c7LApVcYUZzDZj1b117Ks1wAfrbEVgyd Cgz/3xzQD5ets6AQ== 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 E42B9132E7; Sun, 6 Nov 2022 20:56:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 43rbNmAfaGMOBwAAMHmgww (envelope-from ); Sun, 06 Nov 2022 20:56:00 +0000 Message-ID: Date: Sun, 6 Nov 2022 21:56:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH 8/8] mm/slub, percpu: correct the calculation of early percpu allocation size Content-Language: en-US To: Baoquan He , linux-kernel@vger.kernel.org Cc: Dennis Zhou , Tejun Heo , Christoph Lameter , Andrew Morton , linux-mm@kvack.org, Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> References: <20221024081435.204970-1-bhe@redhat.com> <20221024081435.204970-9-bhe@redhat.com> From: Vlastimil Babka In-Reply-To: <20221024081435.204970-9-bhe@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667768163; a=rsa-sha256; cv=none; b=nj8AmfJosy0M9buugubyQ9p8eaimaS7phf65Wo8iDIKUk0ookj7L677Nn3a4hsNWVBMOtx YZwN1uyYh0keOkCsTrFFabs612iJ0s6WYvScNelYblm8fJHEzpMsdvIbtLwJ1VFaE0Wd9a ahcSlVRSqMenThEC4x4wlbHXus5gqGk= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HAkMG7zH; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=EpUpFW9X; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667768163; 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=ZtjHZhTXVaGjQcJVa95fXnoOmRq7kv/Z46oADISZGSU=; b=bjjv8k+YyremaKjO1z7pk4vD3YeZLBYg9oLCMzibUGsARZl/0jgYO3neZ3zll5MZceNMHs SfF9DYTap4NIjuqjK1pdHDnOoMV/L0yNRIp1leAlLAZzm7G5iqa8J5GFNMvHHiEsDrVGmZ 2uwx3OYwO6K22OCdatc4YvwY6W6zrWY= X-Stat-Signature: 1o73u5zdw44xgpuwr9et6ynfb87zdmnh X-Rspamd-Queue-Id: B575F180004 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HAkMG7zH; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=EpUpFW9X; spf=pass (imf16.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1667768162-775410 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 10/24/22 10:14, Baoquan He wrote: > SLUB allocator relies on percpu allocator to initialize its ->cpu_slab > during early boot. For that, the dynamic chunk of percpu which serves > the early allocation need be large enough to satisfy the kmalloc > creation. > > However, the current BUILD_BUG_ON() in alloc_kmem_cache_cpus() doesn't > consider the kmalloc array with NR_KMALLOC_TYPES length. Fix that > with correct calculation. > > Signed-off-by: Baoquan He > Cc: Christoph Lameter > Cc: Pekka Enberg > Cc: David Rientjes > Cc: Joonsoo Kim > Cc: Andrew Morton > Cc: Vlastimil Babka > Cc: Roman Gushchin > Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> > --- > mm/slub.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) As only slub is touched and there's no prerequsities in the previous patches, I took this to the slab tree, branch slab/for-6.2/cleanups Thanks! > > diff --git a/mm/slub.c b/mm/slub.c > index 157527d7101b..8ac3bb9a122a 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -4017,7 +4017,8 @@ init_kmem_cache_node(struct kmem_cache_node *n) > static inline int alloc_kmem_cache_cpus(struct kmem_cache *s) > { > BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE < > - KMALLOC_SHIFT_HIGH * sizeof(struct kmem_cache_cpu)); > + NR_KMALLOC_TYPES * KMALLOC_SHIFT_HIGH * > + sizeof(struct kmem_cache_cpu)); > > /* > * Must align to double word boundary for the double cmpxchg