From patchwork Tue Apr 11 14:22:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 13207652 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 DA937C77B6F for ; Tue, 11 Apr 2023 14:22:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B2F328000A; Tue, 11 Apr 2023 10:22:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 66447280001; Tue, 11 Apr 2023 10:22:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B63328000A; Tue, 11 Apr 2023 10:22:48 -0400 (EDT) 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 3DD4E280001 for ; Tue, 11 Apr 2023 10:22:48 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E5EB980C47 for ; Tue, 11 Apr 2023 14:22:47 +0000 (UTC) X-FDA: 80669326374.16.1837F8D Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf01.hostedemail.com (Postfix) with ESMTP id 4963B40017 for ; Tue, 11 Apr 2023 14:22:45 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=qrPutgPv; spf=pass (imf01.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681222965; 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:in-reply-to:references:references:dkim-signature; bh=bpcDVKRbjh046nF6xJSLKBqunwukv69Cc+/9UeZ6Z0s=; b=nLKw5Kp25r0Bf+Y74cnXGeNlqsLb2lHWI7vjaOWkCq5hyTAnry6N4tiZf4tekGNNlNONYr ULG3OuvvkI3plWuYASZt/wRo0BA+8XVqDsGUkaGpccp7sIacm94cVqjq6r0GmgS65+1o70 ng97SqdEbm14PNFykn7r7XbKRKRT19o= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=qrPutgPv; spf=pass (imf01.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681222965; a=rsa-sha256; cv=none; b=bBdH6wba11wOO5vD4Cqqu9r3LPy5o9HRFFsrreE86jWeror+hM5YaeUfXykqSgycxcyxib qm5iNYjgzBUEmxyWlcfZWrTiToNz0tLTPQbv+vmenHCrfq59UHzGrgcsCaSWgEUTQKymFd gUTdBwQEgrlZZM/evmsqq7KGn7GfcDo= Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33BDxl9F001211; Tue, 11 Apr 2023 14:22:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=bpcDVKRbjh046nF6xJSLKBqunwukv69Cc+/9UeZ6Z0s=; b=qrPutgPvTdbulWS5zQOSmFOA5KGgxN6Ezx/iqDwbGHSJuP8wc2DhSt3iCrXa1PQpfIJP UeZzuQ+oTrEWi6LcOupJgoyA9kJ5VlPRp+qND6cG3NV4wC0CQKQP5PxdxEgcp0yl8sRo tqKWkOnjnrNjzKDsAFSoqQe7tthL1m3LFueFcJVr21kOcLC8KYkueY+KKVuQ9IH6kK8/ 34a9yABjTmTEZnJDWDhXHHCWhFUZVNVqbBgtcKM1xA7GopSxHek1mn5mjJVEqVpt4MNY Cd+RxlOi8cTn4737L6A9GvLywAX0lY2fLgQPvJpRzsnh+hDEGMFrcMqIbgL9i2pnyTVA rQ== Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pw8x1ruey-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 14:22:33 +0000 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33BBjaAA020734; Tue, 11 Apr 2023 14:22:32 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([9.208.130.102]) by ppma04wdc.us.ibm.com (PPS) with ESMTPS id 3pu0jh0rnu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 14:22:32 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33BEMVt13736280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Apr 2023 14:22:31 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5052358059; Tue, 11 Apr 2023 14:22:31 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A2ACD5805E; Tue, 11 Apr 2023 14:22:28 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.75.136]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Apr 2023 14:22:28 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: "Aneesh Kumar K.V" , Joao Martins , Muchun Song , Dan Williams Subject: [PATCH v2-updated 2/2] m/hugetlb: Rename ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP Date: Tue, 11 Apr 2023 19:52:14 +0530 Message-Id: <20230411142214.64464-2-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411142214.64464-1-aneesh.kumar@linux.ibm.com> References: <20230411142214.64464-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: aKLXH2OX_d4hkCO0kcqhoBFWmwhahi9O X-Proofpoint-GUID: aKLXH2OX_d4hkCO0kcqhoBFWmwhahi9O X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-11_09,2023-04-11_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 adultscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 suspectscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304110131 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: x6neeceesrqdgbp1pi6g194tayu4g8jp X-Rspamd-Queue-Id: 4963B40017 X-HE-Tag: 1681222965-270924 X-HE-Meta: U2FsdGVkX19CTxS4vU7Qrcm0KXKnsN5oojD98ymmQd3XWR6igJlpeNlAH3+M/RRKyKzDSfddLHhIDuNcDVwE8KFZd+bUUCz8YKHDb6VLtu38d4ZY/GLDeSAmibJtdgrhM/tfjbqOUhqmzvYmT2WOT4sJ0ueEOW9TvEhQiAksXEtBNB4GptnnPqIVQfisuBlTqMVkv0UhbNDYnNWTy/UcVjlS2FTkNAOxlw3yNDo7HMpXpNqJFdTW375W6U9NFYuKwmpMXRYC5YpYmDqunL4Nqfna0e9wmLDZCpsd8bTclv80SHQ5ofUTrydsep0grb66K777MzviSK4tm3h/fFCssPnaJ+s9GhLJ6T6Q3ke+VFmAMfjzYxDFVDQXHnycMcIxh8necRMNo/reMI7Pe3zmqQyoZci0d+gO8/v8f3vdvNyM7WyH972ynL+n0jJi+xaa4VNsoojB7ftWT2vp035/yTAlOmwhAjryPc8nAU5l/NL77B/LDlDd0NMaBAPBwl5uq4kBGhtLlgOSXusWm/ALNFbeqaKuYiOeZ+Yj0pN7rRyhWhUe7wLJWXm2dy5DARoh2e5G3FbzyJMJ4dqhfbLGLtP2WeDKeQ6lqrN/qlKk78eAMAlNQciRHJsrxMOcUftgZxLrZVglYkGIXTIclJBqFRdrLSelDlEAnaKylk78GpW7ve1smclrflWKlsPftND1yn0lYUqsnopRdq/+0+OaiOnoJbkX9wRpXmAkQAhVo7fO+zwqShu2nccVxm9c1spz0hdZVWe1HSWq0CNHp4dNATjeHEEQfvs3VYeTxQaeY4TkjNG8Naah9F64d0zzueI20+uGXyjph7+nobu0J02Zur/BeMAEx8sSLwyuHNG38jWN/HWxFx2iF9pq7V7gTPFcqarm9U/ITFn+Ssz7UW6B6ASPV/agMicaefRl6TJTUmJBQ2iq7P4g+Jz14g4H7nJZUJubjeVhAyPIog7UBpT O7VuTD2N 0VrXHwGGxpY9MEGTSaqlag+Wt875aAjVxhtSURQGDYo97JfMdu7D7qGh10lak5BJgWm325EnNGm38gABoYWLVQcJ43wOwZICcqHu2RrWUJ4bwn+0pfQqR147REF1Uq8zBlSv5JagsEhe3FwLHHQDaLQ+GZDxYF/mJ7WoxulZ8339eZ6qONiw88hgZ8ReB057kpdPm+XdG8/U/pEGe6Pv6B3cH+LiEWGQAOr6y9d8PC29Q2G/mvk0G0TEvB2X6wCnqa/2R91+Bs5fZpRonrTB6VizF5T4yjkuMFhXGBQtoDFP/sYs0gNCBTHZCXaQavipMcud/Grph2gTyfqfn9mjtSHqhLA== 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: Now we use ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP config option to indicate devdax and hugetlb vmemmap optimization support. Hence rename that to a generic ARCH_WANT_OPTIMIZE_VMEMMAP Cc: Joao Martins Cc: Muchun Song Cc: Dan Williams Signed-off-by: Aneesh Kumar K.V --- arch/arm64/Kconfig | 2 +- arch/loongarch/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 2 +- fs/Kconfig | 9 +-------- include/linux/mm.h | 2 +- mm/Kconfig | 6 ++++++ 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 27b2592698b0..77d9713dcd9c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -100,9 +100,9 @@ config ARM64 select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select ARCH_WANT_FRAME_POINTERS select ARCH_WANT_HUGE_PMD_SHARE if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36) - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_NO_INSTR + select ARCH_WANT_OPTIMIZE_VMEMMAP select ARCH_WANTS_THP_SWAP if ARM64_4K_PAGES select ARCH_HAS_UBSAN_SANITIZE_ALL select ARM_AMBA diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 9cc8b84f7eb0..9cb00f962de1 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -53,9 +53,9 @@ config LOONGARCH select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANT_LD_ORPHAN_WARN select ARCH_WANTS_NO_INSTR + select ARCH_WANT_OPTIMIZE_VMEMMAP select BUILDTIME_TABLE_SORT select COMMON_CLK select CPU_PM diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 933771b0b07a..df2cd510480a 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -126,7 +126,7 @@ config S390 select ARCH_WANTS_NO_INSTR select ARCH_WANT_DEFAULT_BPF_JIT select ARCH_WANT_IPC_PARSE_VERSION - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP + select ARCH_WANT_OPTIMIZE_VMEMMAP select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS2 select DMA_OPS if PCI diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a825bf031f49..5269131cc248 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -125,8 +125,8 @@ config X86 select ARCH_WANTS_NO_INSTR select ARCH_WANT_GENERAL_HUGETLB select ARCH_WANT_HUGE_PMD_SHARE - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP if X86_64 select ARCH_WANT_LD_ORPHAN_WARN + select ARCH_WANT_OPTIMIZE_VMEMMAP if X86_64 select ARCH_WANTS_THP_SWAP if X86_64 select ARCH_HAS_PARANOID_L1D_FLUSH select BUILDTIME_TABLE_SORT diff --git a/fs/Kconfig b/fs/Kconfig index e99830c65033..cc07a0cd3172 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -250,16 +250,9 @@ config HUGETLBFS config HUGETLB_PAGE def_bool HUGETLBFS -# -# Select this config option from the architecture Kconfig, if it is preferred -# to enable the feature of HugeTLB Vmemmap Optimization (HVO). -# -config ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP - bool - config HUGETLB_PAGE_OPTIMIZE_VMEMMAP def_bool HUGETLB_PAGE - depends on ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP + depends on ARCH_WANT_OPTIMIZE_VMEMMAP depends on SPARSEMEM_VMEMMAP config HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON diff --git a/include/linux/mm.h b/include/linux/mm.h index 08799ad0cf0f..fb71e21df23d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3443,7 +3443,7 @@ void vmemmap_free(unsigned long start, unsigned long end, struct vmem_altmap *altmap); #endif -#ifdef CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP +#ifdef CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP static inline bool vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { diff --git a/mm/Kconfig b/mm/Kconfig index ff7b209dec05..492919cf62a4 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -460,6 +460,12 @@ config SPARSEMEM_VMEMMAP SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise pfn_to_page and page_to_pfn operations. This is the most efficient option when sufficient kernel resources are available. +# +# Select this config option from the architecture Kconfig, if it is preferred +# to enable the feature of HugeTLB/dev_dax vmemmap optimization. +# +config ARCH_WANT_OPTIMIZE_VMEMMAP + bool config HAVE_MEMBLOCK_PHYS_MAP bool