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 91A22C48286 for ; Sun, 4 Feb 2024 07:26:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8E126B0074; Sun, 4 Feb 2024 02:25:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E3E9C6B0075; Sun, 4 Feb 2024 02:25:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2CC26B0078; Sun, 4 Feb 2024 02:25:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C33056B0074 for ; Sun, 4 Feb 2024 02:25:59 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 22A171A0716 for ; Sun, 4 Feb 2024 07:25:59 +0000 (UTC) X-FDA: 81753287238.05.51FB049 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by imf17.hostedemail.com (Postfix) with ESMTP id 41E1340007 for ; Sun, 4 Feb 2024 07:25:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="jTSi/5ss"; spf=pass (imf17.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=gang.li@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707031557; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=XjdCCFvLZWXa+p6w0grRH8helkAbuAcZzUNjMEzv69g=; b=Xec/63E1xfXo4cUnDVHCzM6nPEpCeW2BFN1B9Ieu3d+pqAUDXts2cVCHY/leFwNj9r5NNZ gg8FGkSfvLZybMbjWENrZWHyctiS2LB0Xt/VufiJvkOikqdx2VNQbKC94AFQunO/iVQxgM ssSRf5pANsmU535y0+GfJTpLaYAII2c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707031557; a=rsa-sha256; cv=none; b=3q0fKttvlKOsoiTY+5RX3XoWpAZNP87SY9xyJeOxOTwxWx6Pakuez7mDBD2Z868NzSBWnD UpaZRTHhsbmjs1umvuhwVgNAim4T9HvmY5ry2fAKcHSYD6C3J6FujajBkGH+vxBKoodvjm qeeJhzKJGNXWaykC0atfzEZMQKoRDA8= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="jTSi/5ss"; spf=pass (imf17.hostedemail.com: domain of gang.li@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=gang.li@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1707031555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XjdCCFvLZWXa+p6w0grRH8helkAbuAcZzUNjMEzv69g=; b=jTSi/5ssnW+B2nZEdWTkraj+NF2JCrWuvd7e4JHe7/hl/HGvc17fKTh1a9EEBhUmJ1eZuB IV+7vK5AwGnnzGePtP11nEJeG/oz0XWhA7hfYhzPjMNdi0smuMpmmce88hja0a/2MpU6BR GhRfx1q4MHJCktItjGy6MfTjjsUQkkc= From: Gang Li To: Andrew Morton , Muchun Song , Gang Li , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Randy Dunlap , kernel test robot Cc: Gang Li Subject: [PATCH 1/1] hugetlb: fix CONFIG_PADATA dependency for non-SMP system Date: Sun, 4 Feb 2024 15:25:24 +0800 Message-Id: <20240204072525.1986626-1-gang.li@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Stat-Signature: di7jpx1196t1qungpg8ijb5mipa4585s X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 41E1340007 X-Rspam-User: X-HE-Tag: 1707031557-822752 X-HE-Meta: U2FsdGVkX1/coblkt0QKswxVOCHzUU/QfJOLOkKNS8WXhXuGQNRgNZIBY5hrqXRhQ+3EIQ6QMJiiXCzQW9MfUx3AvN/wWbesjzEe4S8Kl/K23vSdYAZkF8hea82tOSZbarS+d+KDJp9liqnWLol2jF2W2XqU5G7iv4dyxx9nZamC/v8k8wzeKaB1RyQ3TBAAuPbQ45ZH3ok+UIKM1JMCJJ5ShNtA/3Jk/eXcC85U4zdOm+hijh9E7/MvgNV2NlQX8NtD+VK5J9rJEV17x3yPh3uFmTX8FI8odFS81hoX7Zq5+ZA3cDpQnqv8fZGRO5Da40YI0YpmsnBY6cDcwtwLAbIlf21XuXn8GCTSHgjNSSvNI4PKuN6fox9yofd2dIqoNExORkWXsRWKyG2ANy764s6mzgQGZN5DK8JLhfs+1xhIpAfLd5HfjebA1lBZAaVUMM2jWM3yV+yi7QVFyEIJ+HJkyBEUmgtnWLMvq/4n9+G/g7YdZLEzjWHkQMverg1c7MYagp1xEi+nL2hZuUXe5i5nDteAXsMC9eaBBOmQ8PWHRKjkgVGSPfK3PCGPUGl7wGNx4w5YamuYv5IJubadny0SCfoZXywnsW7fGyOuwg84ns0cGJ0T4UbcoARLt+trwfIz8fmqqpZqT7A640Irj1b8wcG2A/xucCjoZa7RDl5aZeBwDctlyrUg2FeCDEB3lmnmm0LMTNI2I01NGk7ncC8PyAbE+kT72/YUBp2Xbj/2HA5H3bLK/VMZUYVBDF7CNKVYuk9mRslLH7WSF3Hlzfiz0lacLsdiKklXrj/RRGzy2oDVBOQsIX0A6SIDCcXkhXS1Cnz9iHbHohXX4mcpaeRKVMT+cRQkfAi8+sEa70SUjJfuEpLB/mSfbSX1OgrvcJJcnbfhywsgSUbWLH4cqAv1yESGjZmjpLpfOaXw/JVws4GAXwAJdrNa8i2n5KkhmzPO6eVROYOQhK+7gCo 7R14qxuh 9J4qdtXSaac672CqeM7R3ucgaHaL3Vrb8thrIEw1taprlAeGD0GGESrKEOOdHqjZWmVJFOHTRsf9pQdhG5W3YK9MJ59yQ0HfcElWRbRNk7u8qHD550F+OjlaCK0ZWhv+JxNv7CeI6X1gTBXWamiFMKqufFwEYV9+ywYPCgybUmRcA6nzt5Plx1BIw0OOoIRXSIz9Tx2JrXSsC0iDGImUKaeQyDRFR80qzP3C1dPSdk0N8ZZD1kXkxN1XnG1uWrFNRlzblAOV9BrmMPKp/T5e0PeJCegura+uLQHOlrfXCA0+Ccr7KNgPVyxoRITzEZUDFHv3J 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: Randy Dunlap and kernel test robot reported a warning: ``` WARNING: unmet direct dependencies detected for PADATA Depends on [n]: SMP [=n] Selected by [y]: - HUGETLBFS [=y] && (X86 [=y] || SPARC64 || ARCH_SUPPORTS_HUGETLBFS [=n] || BROKEN [=n]) && (SYSFS [=y] || SYSCTL [=n]) ``` hugetlb parallelization depends on PADATA, and PADATA depends on SMP, so when the SMP config is disabled, the dependency of hugetlb on padata should be downgraded to single thread. Fixes: f2f635264b98 ("hugetlb: have CONFIG_HUGETLBFS select CONFIG_PADATA") Reported-by: Randy Dunlap Closes: https://lore.kernel.org/lkml/ec5dc528-2c3c-4444-9e88-d2c48395b433@infradead.org/ Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202402020454.6EPkP1hi-lkp@intel.com/ Signed-off-by: Gang Li ``` Hi Andrew, this fix patch is based on mm/mm-unstable. Thanks! ``` --- fs/Kconfig | 2 +- mm/hugetlb.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 3abc107ab2fbd..f2bc73fc0417e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -261,7 +261,7 @@ menuconfig HUGETLBFS depends on X86 || SPARC64 || ARCH_SUPPORTS_HUGETLBFS || BROKEN depends on (SYSFS || SYSCTL) select MEMFD_CREATE - select PADATA + select PADATA if SMP help hugetlbfs is a filesystem backing for HugeTLB pages, based on ramfs. For architectures that support it, say Y here and read diff --git a/mm/hugetlb.c b/mm/hugetlb.c index bf3d5dfb921e6..1b01b244fb50b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3457,6 +3457,7 @@ static void __init gather_bootmem_prealloc_node(unsigned long start, unsigned lo static void __init gather_bootmem_prealloc(void) { +#ifdef CONFIG_PADATA struct padata_mt_job job = { .thread_fn = gather_bootmem_prealloc_node, .fn_arg = NULL, @@ -3469,6 +3470,9 @@ static void __init gather_bootmem_prealloc(void) }; padata_do_multithreaded(&job); +#else + gather_bootmem_prealloc_node(0, 0, NULL); +#endif } static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid) @@ -3568,6 +3572,7 @@ static unsigned long __init hugetlb_gigantic_pages_alloc_boot(struct hstate *h) static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h) { +#ifdef CONFIG_PADATA struct padata_mt_job job = { .fn_arg = h, .align = 1, @@ -3600,7 +3605,9 @@ static unsigned long __init hugetlb_pages_alloc_boot(struct hstate *h) job.max_threads = num_node_state(N_MEMORY) * 2; job.min_chunk = h->max_huge_pages / num_node_state(N_MEMORY) / 2; padata_do_multithreaded(&job); - +#else + hugetlb_pages_alloc_boot_node(0, h->max_huge_pages, h); +#endif return h->nr_huge_pages; } -- 2.20.1