From patchwork Wed May 22 20:38:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Chanudet X-Patchwork-Id: 13671084 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 ED38CC25B7A for ; Wed, 22 May 2024 21:10:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7830E6B00A1; Wed, 22 May 2024 17:10:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 732766B00A2; Wed, 22 May 2024 17:10:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FA506B00A3; Wed, 22 May 2024 17:10:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 432B66B00A1 for ; Wed, 22 May 2024 17:10:31 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D8C6EC4CDF for ; Wed, 22 May 2024 21:10:30 +0000 (UTC) X-FDA: 82147275420.14.6A6E743 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id C1E2A40013 for ; Wed, 22 May 2024 21:10:28 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZY7OJvTu; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of echanude@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=echanude@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716412228; 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: references:dkim-signature; bh=BFrd5ebkEcX4DAl9U00OWoi+E1totBiZiszJ1VoHyFU=; b=zvwsTeuhbin4H3+q2zlvv1BKbkos8YtUs0M6b68LUsS1jK7DaFopg53FTyP/G1eoOESs+G lhyo+P3n9vZbbcrN0jXS3bm6kOdkYg94TeKu4OrkenTrdJoyhIPU63IKXgFsAoG+57iQ6c fwNvLtLwScQ+9WCiFHxUIPIZVjurYwo= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ZY7OJvTu; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of echanude@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=echanude@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716412228; a=rsa-sha256; cv=none; b=dx4HXMSZi3E2Nw6d/R/U1I6uX+No3Wf6ml803r83R45r9+JVc4iKp194cKwY3dO4n76u8f XSOnrKRnkwl8Wh9pQ4z6lfZoBw2Q6MFwzLzObTUyqrYFls4GujvkqhYWsO5BD6Z9CmY6qV zHE1YYGOA0uTfKaeLbN6eLzNJnX/vy0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716412226; h=from:from: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; bh=BFrd5ebkEcX4DAl9U00OWoi+E1totBiZiszJ1VoHyFU=; b=ZY7OJvTuNoOAyEqikRtjj6RldyP9iaoZsLbrhylCJfmqrnCRl8D+/BTIoLpSi0pWQW6htb NPtj2QofHiFqrUi2ZAOOAHXisQUHd99Xsw/B1dPKCU+ub4spOgqlQ/UhgXm/ixsrlLnwvE HUIjWq5eH6men1UY4PXSq+hjdqf+SmM= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-ztgJF9A4Mlq7DwMDVp8Q9w-1; Wed, 22 May 2024 17:10:06 -0400 X-MC-Unique: ztgJF9A4Mlq7DwMDVp8Q9w-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6ab906db8e4so57536d6.2 for ; Wed, 22 May 2024 14:10:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716412201; x=1717017001; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BFrd5ebkEcX4DAl9U00OWoi+E1totBiZiszJ1VoHyFU=; b=jQLCAtDbMdnC9HHzUZkYOUCbJ1RA++SmwuwhN3Had/hM5TjdoH0N58yCQ3jGqE2y8L FlmC6cLhpZA8orrp+1Xd/mutRgdcolCrfOOm0jBiXIaGSjKnddI6BpPR9tHdolJzC8+W odNMkoNArbI/9+CjqXODsnRlHwNmlpHZ4bzBASopf/SwOtxx11JoGQelZWjtX7jx0tLX QOFEmnViULYeXgHpTybfA+Ag+vy7FHcdJM429Kjt/2J8O6FqxssLuslz7TdJfzCMj4H1 yi0YstJYZ7wevAkXlpSpdWlddbUwB8HKFwltjOQSZF2NsWwBRMUylkOr2l8Qt5oEHT+S KGHA== X-Forwarded-Encrypted: i=1; AJvYcCVBMFYNVCBTulqLCVd2STFbeZEog6n/PRWFAgBJ9FDQrEusu9iQo2cslneZnvCPRVrUHA0BMa9P/uIFMJ1V8JVOyJ4= X-Gm-Message-State: AOJu0YyrpNAVDNbHz2eSMqKQTZ8zWo22q2viQYdOw7Hs27RAtv0+CKXA 2Gs9fmeM8X1jEbSG4NrCAONM0jMEp+ocdknXGb1IeKVLq/+567p5VsXcPhR3tvrT3GxY16hiBCQ pawLk0MuwcyjaET3k4lNlp6LQFxGuyictmOqkZSX7hV5f4PZv X-Received: by 2002:a05:6214:5b8a:b0:6a3:48af:8e82 with SMTP id 6a1803df08f44-6ab80900d8dmr35624506d6.46.1716412200520; Wed, 22 May 2024 14:10:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFReHW/gidOrXfSOPUsmAujbeGWtlLPFc/p6bBtQ535MfveRlLhqKqI7KsQ5F/jf8a4uc7Dvw== X-Received: by 2002:a05:6214:5b8a:b0:6a3:48af:8e82 with SMTP id 6a1803df08f44-6ab80900d8dmr35624146d6.46.1716412199899; Wed, 22 May 2024 14:09:59 -0700 (PDT) Received: from localhost (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6a35d0bfeabsm73204686d6.2.2024.05.22.14.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 14:09:59 -0700 (PDT) From: Eric Chanudet To: Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Mike Rapoport , Andrew Morton , Baoquan He , Michael Ellerman , Nick Piggin Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Eric Chanudet Subject: [PATCH v2] mm/mm_init: use node's number of cpus in deferred_page_init_max_threads Date: Wed, 22 May 2024 16:38:01 -0400 Message-ID: <20240522203758.626932-4-echanude@redhat.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain X-Rspamd-Queue-Id: C1E2A40013 X-Stat-Signature: wcsf4jfx3hrassxbdw7kmzsuukry9ipx X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1716412228-409474 X-HE-Meta: U2FsdGVkX1/VHOIvucWnwjpac03+JDqulqlxLJJFMFgeP2zmqzy4N5/OUspTkr7+JiCTpoGrUR7bkjNFhNLzOqDE/tkj1qUJwjXxnIVE3k2Kv+9ySQjhGxdXiKCTuyX6+svPsgEwudUutiCXTRsywTFk7TkyFAnSXX+NU6swotbgicrYWAkwPy1x2zJtM4dq9w+O/6V3wcBSamzxmCouTmOpCFPIQI5MLV59Bd53u1K1aD6X9fHpoigD5mI4D40mRjz0UxwFqlW0I0xYN6RlJPieo0eWiD+41wcztZ3b/IQvHjt+he4iORSyXp0inVtMYI8goSgG7tJqOk0Sk/OnX/SFD/5rKZeMPliwF8iJw36VucMksoZNPGW7pMsHqioQx95uQmmJPmJVj2WIBChVFA3CqUp05cWLHpgd5ldYFzDAJNwOBGBL3z/n3boQZfsZT10yvAWLwxmPQdyJUeaIIn/M0H9ArzTdaOfrJQt6ObyYo6hAsgTRqB4SWjaObVFbgb7rScY7Ty6Q1SUgSiI6C9W9FhuvDy4axqOKWhVJFSqrbstz8ivHszkkARcOmlNor+r86WzwbeUQuOnz1eNWedSpM83O8rS88Q2BpP/pROftxwRG/USiJ5Z/LLn7OyGqsaMJ+e5yhbYX6mFwCDnDZszDB5If4p491YBJFt8H42VNBq3JIVwHTs6UcR8m0JWQafFJZx0Q3FKYbqZdGTA3RWICfLgoLhwJFo4w2Yc5VgugwKsFntcK0XXyE3ZlcKPsUq0QvqP6AiZpfcubaHxcsOTvYk62p/DHufX2OesLcMdq0dQ+Shrflp+RltCD84IWY01033yjycOhv/I7av8NIljTDDzI5AO4gwE1gJkibGll2CBuR/WaE1vUe4QIxr/xF8tHpxuiyxwxOYwE8u+CM8ssslax4N1GQHvypm1xjttvhnNBBEZDnq4wtcNlnjWFF6ETRxdnj8GbELjRz6x TaYrqEFw 0lT/Ft6idJzttJIjcA7mgCFf/qK/ysSfXnYOjrfOZ65Fg1xrl/1ICmP9MALTZ6r1TZo4uTE2XZFRpLBazWKtK8aBedW9Xhk3efLRh+ftRZdOGQ5gTbElrVk4Fk2Ljl7e47/aGXlhoNH1bZn8sjzb4YEoljBA8Nw2vOQAOYnLcDVw+POOGil0ceL4KPNDV3vhWyxpvHO1qjdfeLlAYCdaE7C/0w6c68PPtgtrTyoKVoVcsiZTDKwsrcxbPusmydjmSScZlFkDq9kEhZ2UpUjFcNNgqSg0dzrSoXlP/9Qb1HhrVqzTEZwpsIqct3H1z4M7J9RtJP/Kip1c+5s5cwP2yZzsgautIxLF1pNfm/ZyVuGcrzZ/daxQmBigv8MmTO5G29K4HYiw29cZtjcXGojO6Or0782PwXEZhF22S6hkYCeQ/DIcaCTpl0J/QgR7nPZ3ZccxybaFy3S/15QG6SYg7nI+91x7of+jVdEMvOehq9dIHvAW/dFavlVQZTSF3XQBrh17QOGSFiOB9rOK/eC8rBMbF3Q== 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: List-Subscribe: List-Unsubscribe: x86_64 is already using the node's cpu as maximum threads. Make that the default for all archs setting DEFERRED_STRUCT_PAGE_INIT. This returns to the behavior prior making the function arch-specific with commit ecd096506922 ("mm: make deferred init's max threads arch-specific"). Signed-off-by: Eric Chanudet Tested-by: Michael Ellerman (powerpc) --- Setting DEFERRED_STRUCT_PAGE_INIT and testing on a few arm64 platforms shows faster deferred_init_memmap completions: | | x13s | SA8775p-ride | Ampere R137-P31 | Ampere HR330 | | | Metal, 32GB | VM, 36GB | VM, 58GB | Metal, 128GB | | | 8cpus | 8cpus | 8cpus | 32cpus | |---------|-------------|--------------|-----------------|--------------| | threads | ms (%) | ms (%) | ms (%) | ms (%) | |---------|-------------|--------------|-----------------|--------------| | 1 | 108 (0%) | 72 (0%) | 224 (0%) | 324 (0%) | | cpus | 24 (-77%) | 36 (-50%) | 40 (-82%) | 56 (-82%) | - v1: https://lore.kernel.org/linux-arm-kernel/20240520231555.395979-5-echanude@redhat.com - Changes since v1: - Make the generic function return the number of cpus of the node as max threads limit instead overriding it for arm64. - Drop Baoquan He's R-b on v1 since the logic changed. - Add CCs according to patch changes (ppc and s390 set DEFERRED_STRUCT_PAGE_INIT by default). arch/x86/mm/init_64.c | 12 ------------ mm/mm_init.c | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 7e177856ee4f..adec42928ec1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1354,18 +1354,6 @@ void __init mem_init(void) preallocate_vmalloc_pages(); } -#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT -int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask) -{ - /* - * More CPUs always led to greater speedups on tested systems, up to - * all the nodes' CPUs. Use all since the system is otherwise idle - * now. - */ - return max_t(int, cpumask_weight(node_cpumask), 1); -} -#endif - int kernel_set_to_readonly; void mark_rodata_ro(void) diff --git a/mm/mm_init.c b/mm/mm_init.c index f72b852bd5b8..e0023aa68555 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2126,7 +2126,7 @@ deferred_init_memmap_chunk(unsigned long start_pfn, unsigned long end_pfn, __weak int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask) { - return 1; + return max_t(int, cpumask_weight(node_cpumask), 1); } /* Initialise remaining memory on a node */