From patchwork Wed Apr 12 05:00:25 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: 13208481 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 C7CF3C7619A for ; Wed, 12 Apr 2023 05:01:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F0B0900005; Wed, 12 Apr 2023 01:01:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 879BD900003; Wed, 12 Apr 2023 01:01:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F316900005; Wed, 12 Apr 2023 01:01:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5A748900003 for ; Wed, 12 Apr 2023 01:01:01 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 17C07160E48 for ; Wed, 12 Apr 2023 05:01:01 +0000 (UTC) X-FDA: 80671539522.08.97C2DBC Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf18.hostedemail.com (Postfix) with ESMTP id C14231C001F for ; Wed, 12 Apr 2023 05:00:58 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=c61xf8t5; spf=pass (imf18.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=1681275659; a=rsa-sha256; cv=none; b=M9cS1ldA4+GxPXNnHsA0r9CcYkWY9ddidueyGOgPMtVa4l7NK3DRuX9zaFQkG4Jz00uJEl e98+x+o5MVhLyLC8Ef+HTPguO09kSZHfLuwuKXWqJMERT37BgAx2F74fyWSi830IQ39LFf I2XVuAf25t8UuC2Mbxp8n2k5OI1uBAE= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=c61xf8t5; spf=pass (imf18.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=1681275659; 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=UbYFqEKdElu3IP5Lo92jqJFYZdQ9WMdY6iUagB5CSZA=; b=sU8r66My0zRhhA7GL12t0yGV60+yDPQm4apiBUVe95quDcQdIjFhKBIb/QMJwBhhiS43ak OmjQ9xcSaa6gm6w3krxGXtXH/sD6Bj3spTP/sR6i23gzNYKFeWdV4WO09rjkd44vbiyucW p6MgzI5fl0msI+UHoWF00hpfiwMH9WM= Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33C4sTNU008656; Wed, 12 Apr 2023 05:00:44 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=UbYFqEKdElu3IP5Lo92jqJFYZdQ9WMdY6iUagB5CSZA=; b=c61xf8t5Io7M6+mO5ITP2F8YawJHo/8p8HTIbcdLkiBg8Ed2jhBc9I38GUBcUm+GwWg0 jOzdgYB10jcXar8IJpRT3vOpmUcZdsgGzTCeV7H5Y9AybbgePaY6RfijT+JvfVoAG+q4 QcbPyAaYoGQehnyezVw2QEbXm0elC/WaxDBoYsZX327Q8X2A3dIcQ2QE0d4a/4zv/rLE NOGAKXUTiLYFEuDQSHQVDdng4n1BVehU+aPXJulOCNNqgdA7uhyzXQzPffeu615BaKq1 LkEPIgD2U9hehFFYBH0M5i2pS/m5zf+IONVLmska5d1GqQeZjRhnuWjrJwa3vz3QlVjO yA== Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pwp1gg4tq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 05:00:43 +0000 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33C3KUe3022696; Wed, 12 Apr 2023 05:00:42 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([9.208.130.99]) by ppma02wdc.us.ibm.com (PPS) with ESMTPS id 3pu0f9v1vr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Apr 2023 05:00:42 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33C50gt041419172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Apr 2023 05:00:42 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F330B58060; Wed, 12 Apr 2023 05:00:41 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B37B5805A; Wed, 12 Apr 2023 05:00:39 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.80.153]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 12 Apr 2023 05:00:38 +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 , Mike Kravetz Subject: [PATCH v3 2/2] mm/hugetlb_vmemmap: Rename ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP Date: Wed, 12 Apr 2023 10:30:25 +0530 Message-Id: <20230412050025.84346-2-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230412050025.84346-1-aneesh.kumar@linux.ibm.com> References: <20230412050025.84346-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ZTlcuALQoVpE-jMpspdTNRfUW2xgp9rU X-Proofpoint-ORIG-GUID: ZTlcuALQoVpE-jMpspdTNRfUW2xgp9rU 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_16,2023-04-11_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 phishscore=0 malwarescore=0 clxscore=1015 spamscore=0 adultscore=0 lowpriorityscore=0 mlxlogscore=946 bulkscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304120039 X-Rspam-User: X-Rspamd-Queue-Id: C14231C001F X-Rspamd-Server: rspam01 X-Stat-Signature: ma5u5r5nb81hy3ao6done43ozwypboge X-HE-Tag: 1681275658-615795 X-HE-Meta: U2FsdGVkX18HZIzMUEgs5qiB0BEVhARQbup5HFvgL6ZyuDfDNtjC48UWayIofg5aIOYIrTae0iRvy9FBgOvauc0J7S3kFvIFESJUcAEsdHi4sbZCDutf1AjMnfTIsUqjV3jus8FlXKWrsvefCUdNI+pRndtKIRmlAD83tb7TGBR4+YdpdAFXPazfucdQvcwYDQDfHSPf9duFhvu70N/gNYLNCuNKglW/IvITPFp93lqO/VHeOX99KAroCRnMydzxmJcI0Dy+VxtrLtUbIZXCtdOB0LNilQnxBXqpcZKfDPLYCxrjKv8iVaqxMfWhwN4qR01W5MLyV8F8GzNVpRlSGTvO/p5QasfiN084/neH4cMn22KGS45Fh6Kw59TWICgGhl9y1rcC/sFaZomIEBe4yWV6RITLCjPN5uliZksVNMOymCtxijmObyjoVc/QH0q2pZ952EmW/+pI0Mcsf5vJx+yD6+Vs/wb39UGjuOjhjIyvVfDPfq+BytRouI+sguy2xOr3Rs1tBMEFEo/BHEh8P/cLwsXSIAxkiNXHE6D9kH9NQ5VqEGi2Sbbu3HoB11iGtCPAEAAsP7X7Q7mhXHlZjenMfQs2qFaw3KlzGUKYrdkztk3Mxz+Eee2mj65ExMkHIBLQsfOEime/9kFUVS5rzKhiQvHWumaJu+YkB/tWJiyBcT2MvaE0ZtMZagxk1Nkfu9fX1MSCGztMBfDP2R18SqVK8GQKR8C4t4XXeTAqOcOlmBl7wtNLMQJXcUHll/2O50zsHxfUdTQqzf0/9qefS4+KEkzf5nzB3kw7N99Rm0tLHwKNgRKlUc8aZJNr04yBFYYvLbwvsaq+BEd3c6Ck6UyBGLEBbu361qzccNDqfl7ZP94FtVUnXNg5J0aHHKRTMgPxcPMRCMb0O6UjRThTVsqfeBEU9wra4EIZXlXhsxe2XUau9xx3HKYmVlQUU0bBhhRPYolnFyY2ObVdUna cqHQYLVE byRO5RjuaXjeDd48HICvD7unebVXkPxpl7DT2GHBYkS1UOgAZAQ3cS9xe6aJ84GQ731Jc2n4NLjCmo1TeqyXfGEqOYmJ192Aiajz0CNy3EPFtkZuG0hERiC/CUSJ+fNmFM7l4hJCJn6AnZTiCSpj8HzmQM9p5vXYVOFhD7rBov4Da9ivlmfy8rBHKLRzltLweBo6qR3GrYaEFngTmnsWg8db0zY8H0VvN5CHGSj6xiRIBFP9dYbcEs0Z5mJa+L9kfNcAT83GpYjx5DckXd4QtFkypNTAFS/0lCqCBvIWSBSW2MzzXL7PqJQAupoSy6Tsy358YdVibccI8qHHzlGJNZbOzFQ== 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 Cc: Mike Kravetz Reviewed-by: Muchun Song Signed-off-by: Aneesh Kumar K.V --- arch/loongarch/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 2 +- fs/Kconfig | 9 +-------- include/linux/mm.h | 2 +- mm/Kconfig | 6 ++++++ 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 7fd51257e0ed..f46baa3f3ea8 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -53,8 +53,8 @@ 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_WANT_OPTIMIZE_VMEMMAP select ARCH_WANTS_NO_INSTR select BUILDTIME_TABLE_SORT select COMMON_CLK diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 9809c74e1240..f06d7927b8b7 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -125,8 +125,8 @@ config S390 select ARCH_WANTS_DYNAMIC_TASK_STRUCT select ARCH_WANTS_NO_INSTR select ARCH_WANT_DEFAULT_BPF_JIT - select ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP select ARCH_WANT_IPC_PARSE_VERSION + 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 ced82b9c18e5..cd30c279003c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3426,7 +3426,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 4751031f3f05..8a3dfc8bc3a3 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -479,6 +479,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