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 5235EC6FD1C for ; Wed, 22 Mar 2023 14:49:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BA4856B0071; Wed, 22 Mar 2023 10:49:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B2E6F6B0072; Wed, 22 Mar 2023 10:49:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CF476B0075; Wed, 22 Mar 2023 10:49:29 -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 8B30D6B0071 for ; Wed, 22 Mar 2023 10:49:29 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 673F9A01BB for ; Wed, 22 Mar 2023 14:49:29 +0000 (UTC) X-FDA: 80596817658.04.54E5AD9 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf15.hostedemail.com (Postfix) with ESMTP id 4D860A0003 for ; Wed, 22 Mar 2023 14:49:26 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=keua6vrz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=XDCCaVhw; spf=pass (imf15.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 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=1679496566; 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=WStsIEd2k7RdaTJPjgss3dQsnOiCKbIVzQh6g0XMjJw=; b=DSbrj7+J5unD1qNFN1VYhsibR1eoGENFG52pq95cJXJ2bawXW3Y9cF7DS2pa088K3n5G+J vW4XjO42Fcthw8W0laqANx+5B9cS/cfmPPUySulKuOuFzc20ey1ggoOCZ2ndlUMmAsbG8Y RqUHotJQYGcj2yplepCszFsIBTbrPIU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=keua6vrz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=XDCCaVhw; spf=pass (imf15.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=1679496566; a=rsa-sha256; cv=none; b=DaO8+1hsiNWCRrJHgOXEv7EGcU+tqZrqhxlY8Dy3O5loEzd4Av+ThtSfsFNLjiYAc3fS14 KE6nBiLg2/LFwdXp5MJ4cDXF4vQd2ZidR20kyTDeiXAAbyiGu5ZEGhj1rIuCFMYJ5YBnn8 xdSRrIz+vt2fyFnehVd7V7z5nnlZfZc= 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 B0F8B20EDA; Wed, 22 Mar 2023 14:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1679496564; 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=WStsIEd2k7RdaTJPjgss3dQsnOiCKbIVzQh6g0XMjJw=; b=keua6vrzqFvD9d24VxKeN+P/9uXoYODOqtrErIG/mFeIbZVehzKEskAJmBFCi0Y8xj7WKJ pmcGiXtk38EgR4HUZMpxbVMjRpbT/7Vrs/+Ks0XGUOUlTjb50+aaMtBeacMHGQzY1kN1mf FM6J86xeBjnsaz6TLcApLK3UK5S0+us= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1679496564; 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=WStsIEd2k7RdaTJPjgss3dQsnOiCKbIVzQh6g0XMjJw=; b=XDCCaVhwYzaOWYZn/gP36NSxpReGq7etaOQhGQ5VLmoob+pUe/n+MnmvWWMlCIgQIM3z77 KSRc22i5edVyCsBQ== 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 806FB138E9; Wed, 22 Mar 2023 14:49:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id OzqNHnQVG2RpNQAAMHmgww (envelope-from ); Wed, 22 Mar 2023 14:49:24 +0000 Message-ID: Date: Wed, 22 Mar 2023 15:49:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [PATCH v2 04/14] mm: handle hashdist initialization in mm/mm_init.c Content-Language: en-US To: Mike Rapoport , Andrew Morton Cc: David Hildenbrand , Doug Berger , Matthew Wilcox , Mel Gorman , Michal Hocko , Thomas Bogendoerfer , linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org References: <20230321170513.2401534-1-rppt@kernel.org> <20230321170513.2401534-5-rppt@kernel.org> From: Vlastimil Babka In-Reply-To: <20230321170513.2401534-5-rppt@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D860A0003 X-Stat-Signature: ae5opc9urmkk37p53g9xjh34e4ri9nqj X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1679496566-120343 X-HE-Meta: U2FsdGVkX1/NEEYnTI44fjBJXxRK9yt0ERzTppW99N65zAd56FuOxFsUutqOaiEe5/trqJRhe06/3c10rs9LdIxYw0yEi7ZQhtjn5Alonng5UBc7QpoR5dS6st6UL7eBf7LXQERboO9qHCsycYIZSkZ3iX6qISgB0n4QSs9C+j2Zu1rQc22YCo23v5GekIoMZuuBuh//Scb25bzjPy2PecTwtSxDZmc2aX+BB52ex0Ns2eWHPFVYw7hDyEJfmLR4smlPxTQTjJnb5MtVE1NOWYcetSq2bSj0cc9/Mg/T1VrIn8C+4MEyQQrL5VVv0biIu4rK4avRAp1Ms3chUKOafWEjPJBUWr2/hw1FvgJC5qbU0CBfvEYShBKmQs5a6o9yvTUjJ2OumxnASLPc72vWa0B9cOKEgd4Cgn6j04huLGrjD+dC7uG2ro6N1sb9RCQ+BAy+L5WFCyDwtfoMVLl0jwTEkpLRPigCn06xx2AsSWshiKZYObLv83onIvtBA4qZf9clFiCE8kQaefNcPnslPce7ejGd2a/4dhY3Yl5yxWq41ywENVb1xsxKz/vR7AZib4ca50zxTe2sUuiEm2DQFCX6aG7XSKg/41k965irKUeVlCM+fxwbnNh7JnV9urBBAfyyx4z0ATPUlUr04E5Y23pwtXYv23oTlyVZOedEXB/vSMsEDtdoRT++aeFDyXRlMin8dkwwVPnqSZGQfIt2fsymhR3GQbt0BebQHiSjmickLcwbrJLb2naef1ptgucP7TvULkN06ykbWeVY0KhjiBtpZ7LAMORr2ozTci4R/OdwILWhckXVTEwyE+3tlVneenrQOqSERiEXopel0oaIIGrQgL/ob6x4NwU9CIpzaG28T/Sc9ldcybOCqcA40wwl32sJXqd4BP8kocZTt+0JJxY2vmDglE3K7VlpCT/7/RR66jreejJ4gL7a5g/laaKOlEhDEF17t7V1EPKwhjZ LuCjYOO0 o/Vu7j7/K4BJkD3aoTEKKIhqCJ3sNckumU/CkK6Ppizo06FMv0fZ9zJEvBalpeBRPmO0P3iJLy8WC2xBPeXkDyw2nODrtqkn0JdWB60C5g+Dm7Je16RNJ2Hq0UZVEMQ4dl9lo/TgXHENUMZJOOq/N/HEBsGkcw7f8VC149SKdHRAqAGL7CU+bc9rRXSM1tb2HH5z2YoH9tJN4dVC80nVqg8jdeiTJpvWfFspo3bLjuTfwmVCzTMcQEemvodlpaUpYBEYX8nRMh+AMbcTjKYI133U1VW8hcF1tAdorb9n54c5gNbl8cajfQOiE5MmDw7yXXJJccx0pdqRKAk9f16SSXgRwZA== 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 3/21/23 18:05, Mike Rapoport wrote: > From: "Mike Rapoport (IBM)" > > The hashdist variable must be initialized before the first call to > alloc_large_system_hash() and free_area_init() looks like a better place > for it than page_alloc_init(). > > Move hashdist handling to mm/mm_init.c > > Signed-off-by: Mike Rapoport (IBM) > Acked-by: David Hildenbrand Reviewed-by: Vlastimil Babka Looks like this will move the fixup_hashdist() call earlier, but can't result in seeing less N_MEMORY nodes than before, right? I wonder if the whole thing lacks hotplug support anyway, what if system boots with one node and more are added later? Hmm. > --- > mm/mm_init.c | 22 ++++++++++++++++++++++ > mm/page_alloc.c | 18 ------------------ > 2 files changed, 22 insertions(+), 18 deletions(-) > > diff --git a/mm/mm_init.c b/mm/mm_init.c > index 68d0187c7886..2e60c7186132 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -607,6 +607,25 @@ int __meminit early_pfn_to_nid(unsigned long pfn) > > return nid; > } > + > +int hashdist = HASHDIST_DEFAULT; > + > +static int __init set_hashdist(char *str) > +{ > + if (!str) > + return 0; > + hashdist = simple_strtoul(str, &str, 0); > + return 1; > +} > +__setup("hashdist=", set_hashdist); > + > +static inline void fixup_hashdist(void) > +{ > + if (num_node_state(N_MEMORY) == 1) > + hashdist = 0; > +} > +#else > +static inline void fixup_hashdist(void) {} > #endif /* CONFIG_NUMA */ > > #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT > @@ -1855,6 +1874,9 @@ void __init free_area_init(unsigned long *max_zone_pfn) > } > > memmap_init(); > + > + /* disable hash distribution for systems with a single node */ > + fixup_hashdist(); > } > > /** > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index c56c147bdf27..ff6a2fff2880 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -6383,28 +6383,10 @@ static int page_alloc_cpu_online(unsigned int cpu) > return 0; > } > > -#ifdef CONFIG_NUMA > -int hashdist = HASHDIST_DEFAULT; > - > -static int __init set_hashdist(char *str) > -{ > - if (!str) > - return 0; > - hashdist = simple_strtoul(str, &str, 0); > - return 1; > -} > -__setup("hashdist=", set_hashdist); > -#endif > - > void __init page_alloc_init(void) > { > int ret; > > -#ifdef CONFIG_NUMA > - if (num_node_state(N_MEMORY) == 1) > - hashdist = 0; > -#endif > - > ret = cpuhp_setup_state_nocalls(CPUHP_PAGE_ALLOC, > "mm/page_alloc:pcp", > page_alloc_cpu_online,