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 56081C0015E for ; Tue, 18 Jul 2023 02:30:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7BCB6B0074; Mon, 17 Jul 2023 22:30:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2C4A8D0006; Mon, 17 Jul 2023 22:30:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCD308D0005; Mon, 17 Jul 2023 22:30:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BD9E56B0074 for ; Mon, 17 Jul 2023 22:30:38 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9B3E11606C9 for ; Tue, 18 Jul 2023 02:30:38 +0000 (UTC) X-FDA: 81023154156.14.CEE87E0 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf10.hostedemail.com (Postfix) with ESMTP id 58B6BC0006 for ; Tue, 18 Jul 2023 02:30:36 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="VbWaxo7/"; spf=pass (imf10.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 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=1689647436; 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=P+AZIqnopT1dy9laW4Ph6z8M3DAEFIp4FvwjX5DVsDo=; b=NPAxsfTQ1I4Fmx5Rxjz+C92VTAo+S66P5M89Anxwu891Ho7LoR78FaVS3VsSsfQ8EBtuIF XuUhjZ7myRt/FTF24Rib7Pml5wsKExuXvL1rK4PHXbrjLfaP7GBWdjw+GOREvFk9TxFpJD 6pCEcHpHQU2nT+mc1t2mMZ3+6BqIsvA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689647436; a=rsa-sha256; cv=none; b=RhIOWNikFJJUlS5L+Re0xDA5JHajp5L1hCd83NLZGhHHkt2K9dGhjU/LYYdeI8jFSIUlXq 1w4Nuqtx4aFK2s7TDIbcj8G5MYi0204u6hYJrzER/SVKcmoYXCD96LHbFAWNgqDwOeeG0s 3lUTYaOC1hvLZs9WuGgYYeB/RnyL2PU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="VbWaxo7/"; spf=pass (imf10.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36I2I2pJ004253; Tue, 18 Jul 2023 02:30:25 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=P+AZIqnopT1dy9laW4Ph6z8M3DAEFIp4FvwjX5DVsDo=; b=VbWaxo7/V4KprK7Xd9lMoV0bcXMlOBv03gMlUweWcmJKQIJpyBEA5snPSYiDlWTGgz9x Wy1LceYnUho7OdalrtAfkPAV57Im9Q/5XAKGewJ4/dOWcSy1hDqOSIvS75vjEvlzkKZ5 AzxoL8tX/TM1cH9va3lmuL9NqelTY9UlrROf2jrt74/BhfZIrFmhA8JZFvgaqs7F2mXY G0SFqA6SQqSVAQvQdCAz4OVEBIXVtqOYbNw5qiKR4o6rh/vqAfKvrq+FKB8hirAyJOIx NVWiPSLpGcNfyKnDSFsRx2DTU0KDvZ/puwxugNZXWHeuImu2+WcILhdPBVJava2ZZrXg YA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rwhu0g6kd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:30:25 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 36I2LTqR011154; Tue, 18 Jul 2023 02:30:25 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rwhu0g6k7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:30:24 +0000 Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36HK7mEd030687; Tue, 18 Jul 2023 02:30:24 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3rv79jhgx7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:30:24 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36I2UNPe1114682 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 02:30:23 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 73CCC58058; Tue, 18 Jul 2023 02:30:23 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8D3DD5805D; Tue, 18 Jul 2023 02:30:18 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.62.199]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 18 Jul 2023 02:30:18 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: Oscar Salvador , Mike Kravetz , Dan Williams , Joao Martins , Catalin Marinas , Muchun Song , Will Deacon , "Aneesh Kumar K.V" Subject: [PATCH v5 07/13] mm/vmemmap optimization: Split hugetlb and devdax vmemmap optimization Date: Tue, 18 Jul 2023 07:59:27 +0530 Message-ID: <20230718022934.90447-8-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718022934.90447-1-aneesh.kumar@linux.ibm.com> References: <20230718022934.90447-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: FN_p57B2jx5fv8-foimsawKdrFemcTJh X-Proofpoint-ORIG-GUID: S24HR4olDwjEJqfR13_vt3hK028Bwmx4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-17_15,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 spamscore=0 clxscore=1015 mlxlogscore=999 malwarescore=0 suspectscore=0 mlxscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307180017 X-Stat-Signature: xzzft4afhrfsu8hkoffptizhr9tgbqyz X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 58B6BC0006 X-Rspam-User: X-HE-Tag: 1689647436-264927 X-HE-Meta: U2FsdGVkX1+0KAatsDykD7XRv+3ruLSyLFk+sfewtPAUwMRptZv+XJ68ICCTGqvhCeo+PlopjfJkcqgyEtp/Seu9NP8hTGpmV7EOtJDGYgHnFTiHcwkGfNSs39gCUlkhizpD7arR0/L4rU3Bwomtql/XsgqXOCyOWailC9lCn+LxulDJtDDj9doa0OcibhSScGf1r0jzePHPsJqLLDgvOUBFzhZk1kOVLnFsAFZGboMDzfvAF6MR90GpFIL3HcHWoGvvHc4Ulk64tTa4FES8Dg4vrc8FRKz5a0/1TXm/bzNmso5a6lZOR1q/m1kYAlC63tKf41Dr6nBLShvpvDudnXN/Ga7dF1vHaL26dP2YnxYrh3FcBO+LpeIlHucYRr+Bl35WxwCXaaZsZmWFB6WgjueJp/WRw0qhhgOG3lAEU6y5f4tv4qV80261r8c6BdqoQKUDwTSbICJeOY3cRIZU+VX6+X4oq7gC1yIrTzdYqd683OdsJaw9lLr4PdUUWtrIuuFH3J6Fj6qpYF/lwgsN/QLPlJP2oPhF+0D3clrOWJM0flkLEikipXlwqHN8EbGWV++ZLQsOxYzW3n0DKYaaink56wfPX6ejJ7O/ej9nLKrSlDdcoOiz8wcMFa3UCMNWlPPO6OfywwFlmpt0I9lXs4VYTV3jGYx2kXITCOD4BX6nxOQfCSMbWbvaQ9inrqLvIdOIIz1NoTuTgIwFkeGd6Q3B0Chw2onEFBPovn5tkpKQ+WXPuXlvlXpxYHq6kc0+XjV8dEg9LBEIFWYO2SZ3YnbYYZmVu92ikGsxr5qIS2X2yJexf1ametbyrpe95Ylg4OdWm1rhEKJgS5X0JvsYFfI5SCAHgSspHc8AohHBzMH2pQkr3+5rfVRQjj+uPltUiqrOXL+MfsgqcNg8yOycFfKJ+jSazAx7lqwIfRXwT/H83+kKpSCOQFWOuc2cw8i1YGZbgql3ovaLEPHuvNn Fi1Hb/On x7eZ8zvkA7jwHCCgNRjL+VxlVvvf+d+/glHCBIiFBPurKEpd9JB9oizVTsx01Z5b9+ITua7DE2voM2d+ZxqCgJO6EpphCxarRyQAj15I00RbPlEoInZRwtYBcEIr0doYEpOu8jPupwUcne+n5xr8T7A3ENQlXTCTh7w+48QdspgcMtwQ= 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: Arm disabled hugetlb vmemmap optimization [1] because hugetlb vmemmap optimization includes an update of both the permissions (writeable to read-only) and the output address (pfn) of the vmemmap ptes. That is not supported without unmapping of pte(marking it invalid) by some architectures. With DAX vmemmap optimization we don't require such pte updates and architectures can enable DAX vmemmap optimization while having hugetlb vmemmap optimization disabled. Hence split DAX optimization support into a different config. s390, loongarch and riscv don't have devdax support. So the DAX config is not enabled for them. With this change, arm64 should be able to select DAX optimization [1] commit 060a2c92d1b6 ("arm64: mm: hugetlb: Disable HUGETLB_PAGE_OPTIMIZE_VMEMMAP") Signed-off-by: Aneesh Kumar K.V --- arch/loongarch/Kconfig | 2 +- arch/riscv/Kconfig | 2 +- arch/s390/Kconfig | 2 +- arch/x86/Kconfig | 3 ++- fs/Kconfig | 2 +- include/linux/mm.h | 2 +- mm/Kconfig | 5 ++++- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index e55511af4c77..537ca2a4005a 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -59,7 +59,7 @@ config LOONGARCH select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select ARCH_WANT_LD_ORPHAN_WARN - select ARCH_WANT_OPTIMIZE_VMEMMAP + select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP select ARCH_WANTS_NO_INSTR select BUILDTIME_TABLE_SORT select COMMON_CLK diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 4c07b9189c86..6943d34c1ec1 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -53,7 +53,7 @@ config RISCV select ARCH_WANT_GENERAL_HUGETLB if !RISCV_ISA_SVNAPOT select ARCH_WANT_HUGE_PMD_SHARE if 64BIT select ARCH_WANT_LD_ORPHAN_WARN if !XIP_KERNEL - select ARCH_WANT_OPTIMIZE_VMEMMAP + select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU select BUILDTIME_TABLE_SORT if MMU diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 5b39918b7042..975fd06e4f4d 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -127,7 +127,7 @@ config S390 select ARCH_WANTS_NO_INSTR select ARCH_WANT_DEFAULT_BPF_JIT select ARCH_WANT_IPC_PARSE_VERSION - select ARCH_WANT_OPTIMIZE_VMEMMAP + select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP select BUILDTIME_TABLE_SORT select CLONE_BACKWARDS2 select DMA_OPS if PCI diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7422db409770..78224aa76409 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -128,7 +128,8 @@ config X86 select ARCH_WANT_GENERAL_HUGETLB select ARCH_WANT_HUGE_PMD_SHARE select ARCH_WANT_LD_ORPHAN_WARN - select ARCH_WANT_OPTIMIZE_VMEMMAP if X86_64 + select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP if X86_64 + select ARCH_WANT_OPTIMIZE_HUGETLB_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 18d034ec7953..9c104c130a6e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -252,7 +252,7 @@ config HUGETLB_PAGE config HUGETLB_PAGE_OPTIMIZE_VMEMMAP def_bool HUGETLB_PAGE - depends on ARCH_WANT_OPTIMIZE_VMEMMAP + depends on ARCH_WANT_OPTIMIZE_HUGETLB_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 1a2234ee14d2..83f51ec0897d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3640,7 +3640,7 @@ void vmemmap_free(unsigned long start, unsigned long end, #endif #define VMEMMAP_RESERVE_NR 2 -#ifdef CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP +#ifdef CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP static inline bool __vmemmap_can_optimize(struct vmem_altmap *altmap, struct dev_pagemap *pgmap) { diff --git a/mm/Kconfig b/mm/Kconfig index 09130434e30d..923bd35f81f2 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -487,7 +487,10 @@ config SPARSEMEM_VMEMMAP # 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 +config ARCH_WANT_OPTIMIZE_DAX_VMEMMAP + bool + +config ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP bool config HAVE_MEMBLOCK_PHYS_MAP -- 2.41.0