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 0EFEAC001DB for ; Tue, 8 Aug 2023 09:15:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E1506B0074; Tue, 8 Aug 2023 05:15:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 991D46B0078; Tue, 8 Aug 2023 05:15:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 833108D0001; Tue, 8 Aug 2023 05:15:41 -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 722E46B0074 for ; Tue, 8 Aug 2023 05:15:41 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3DEC9140BE8 for ; Tue, 8 Aug 2023 09:15:41 +0000 (UTC) X-FDA: 81100379682.11.5E36EF7 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf29.hostedemail.com (Postfix) with ESMTP id CF361120014 for ; Tue, 8 Aug 2023 09:15:38 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="JVOPm96/"; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf29.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691486139; 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=F4qcZEoTqwkRahHimypWFVri5q7pOMDH/5i6hbY2k60=; b=wnstbDrpEqLx0Sq2BPAEzOW31l182THnicQRTqIoXcqIOSI/VXlMufMkSgZQMpDmKWdgIO Hz0As7qwsS8A93Tonl/Kqu2Ia2vG9zONx6Y7dkTnCcT5dHOi+u0z+LvNrv6xRhBGNAGIt5 /hkjybqsZPnv6Qh9KgrwnZsQRia5gZc= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="JVOPm96/"; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf29.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691486139; a=rsa-sha256; cv=none; b=MQDwlyDAFTz4XoETZttTE3KM0Yu9WHG5F95T1xswD4I6XpruH/xtgCk7CJIgD0pI+kwv8U ubV/4L7SNprrCij8YT7nZjNuAXaCZFWeTKLvbMGeqJGwQN6W5FMO5hcX94akKz8AlpJ9Mg tK+bmf+g8xfQClrHqwd7gDNoHpuBiPY= Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3789Aa6j017580; Tue, 8 Aug 2023 09:15:30 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=F4qcZEoTqwkRahHimypWFVri5q7pOMDH/5i6hbY2k60=; b=JVOPm96/j0X8kFA8apVEdjWMh97uvFOaLSLJ9TpsyK1jFR/uYl5B3SZEdOU+4RGXglkE W0nmhIhddUVIHn/3sxGWzPsGIcUQU09UpBx9L6bSIXAxtT8wVwAG3KLinCmdO5WHBwOT rjXjUHquy0oJsC7ek6KFWctsf67Y4C4gLyNNWUwGaY4JWkWP4loFJLTNyP8glc0SplSv os3LhNEV0vAeZPwia3SjRsXkmCIg1Q2tg2KhOLiR4GlI0+fJrc0ZHFsGG58ses1Pcv7c HsQ5YGHYti/ZWwvm7VBNltNyyvSX01E423AtvddM/+HcMdnnc1AIKet4E4Ad1e+JdcyH ew== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sbjm4gc54-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:30 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3789AWkU017230; Tue, 8 Aug 2023 09:15:29 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sbjm4gc4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:29 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3788vsun030364; Tue, 8 Aug 2023 09:15:28 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3sa1rn55jy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:28 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3789FRtt1770004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 8 Aug 2023 09:15:27 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89EF058056; Tue, 8 Aug 2023 09:15:27 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4CB655803F; Tue, 8 Aug 2023 09:15:24 +0000 (GMT) Received: from skywalker.in.ibm.com (unknown [9.109.212.144]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 8 Aug 2023 09:15:23 +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 , David Hildenbrand , Michal Hocko , Vishal Verma , "Aneesh Kumar K.V" Subject: [PATCH v8 5/6] powerpc/book3s64/memhotplug: Enable memmap on memory for radix Date: Tue, 8 Aug 2023 14:45:00 +0530 Message-ID: <20230808091501.287660-6-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230808091501.287660-1-aneesh.kumar@linux.ibm.com> References: <20230808091501.287660-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: GW9-WWF7_8M275jMTVd-bOv3qUbYfcwM X-Proofpoint-ORIG-GUID: j5-TvMJus9zTK1Uu5m4KouMpY_tNcR1m X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-08_07,2023-08-03_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 spamscore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308080081 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CF361120014 X-Stat-Signature: uzabeu8t5nhnh9bxb6jkjcs7joyh7bq6 X-Rspam-User: X-HE-Tag: 1691486138-26906 X-HE-Meta: U2FsdGVkX1/NSawC8y9TUl9fqIpI2IQ5/ejVVtOS3/DhSCsSviQ8t92L/h0upzwxJf1Z8h86dP1c4e5ptWY4fQR0s+tFbUaxXRd8Ibh81ZaBM0p1O64aps3tP+I8DNs/LKR/nALZUEWVe2AIQ/5aYytTcJGJ+vbhIbCGplRUZ8qXX1l4/8bMWvDexIXaxkdFr020imLcQZ+uf8Zi9QEPIPVQ7lb49s+cwcLgGKdJX6HvDH/2EjI61tDYTI9OsDCa0OxN/O3+cEUYWaxDiqVDxOT2griD52xj7Xkgwg05zi8rKBVzyMimTad3aCgfCurNbU4LLuDmQ5VhGybWarxsmR4G15rDK9e6/gMFJ4Nz5vpPo4LdUs8qGHwibdhEnkH7dMNYuDUAcHp1amhO9hjyx5ifTnamcgEBwWSYuvq0Rr2yffvaGBQvexq+lCDq7hhEbw9ZBsRaCTSG3xCC2OJUg86iZqjyonHpth5MvD/IuVpH5Un7LYdumD299jnLFfGTiNA9kau58v1Tc/uClIXSY6C5ZBUSgWfwIhMHGWb40FhxiGz4wD9kv0XnKo5YUC3udEa7Kp0QkLk5RsAs7S48MN5lb96k9JrTVHNGrWRovUD4g3hx6YmIY7ZgAOgtni6rEbxozL91b3Sgu1Pysuu+LYh/UiAzZ4wKhtwOcote+I1bDt4/FY2s7jl9Lk+wxu1x4KJ93VEGLshgG3LjIlpmRfMtkcH0heKgbaFY3IdKgvsZosLuGMl45HDf960fnc2qXZSbnxjOEX7kogij4C11W+fVWJkbs5FMYgK44GRajPNky0Ywcnnk7ln/2D/Tb6UQqd9fKradeTRN9uJ2PWJdCXSE4gCLrSa5Im3zqovoC/+eB1j2YbeW2l7n4NjN1v47gaP1BzYgN9sIeypiN/IQ7xWhpAcMnLl2TeL37uyjUckisrylvMI4eff/aQSvwmqO0RYdACk/SB3JkR1PiAd z8FG77wn 7ZHrve9cXJ+9S3MS4FIj0FbdCmavW/FQ1syYpH8zWlQ50HhQdS97fQpnw5CgdxPrUWBIR1i+NOkefxuOQDe5uCFZUHqDrXbmqqaufKn9maJ+myZtcEx0w2MMkBZkJTQln7WDt5HlOyuxzaiMNMU/1kthD8Gl0AZr0svO+GyCFEjxsUJk= 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: Radix vmemmap mapping can map things correctly at the PMD level or PTE level based on different device boundary checks. Hence we skip the restrictions w.r.t vmemmap size to be multiple of PMD_SIZE. This also makes the feature widely useful because to use PMD_SIZE vmemmap area we require a memory block size of 2GiB We can also use MHP_RESERVE_PAGES_MEMMAP_ON_MEMORY to that the feature can work with a memory block size of 256MB. Using altmap.reserve feature to align things correctly at pageblock granularity. We can end up losing some pages in memory with this. For ex: with a 256MiB memory block size, we require 4 pages to map vmemmap pages, In order to align things correctly we end up adding a reserve of 28 pages. ie, for every 4096 pages 28 pages get reserved. Reviewed-by: David Hildenbrand Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/pgtable.h | 21 +++++++++++++++++++ .../platforms/pseries/hotplug-memory.c | 2 +- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index d0497d13f5b4..938294c996dc 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -157,6 +157,7 @@ config PPC select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_KEEP_MEMBLOCK + select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if PPC_RADIX_MMU select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index a4893b17705a..33464e6d6431 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -161,6 +161,27 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd) int __meminit vmemmap_populated(unsigned long vmemmap_addr, int vmemmap_map_size); bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long start, unsigned long page_size); +/* + * mm/memory_hotplug.c:mhp_supports_memmap_on_memory goes into details + * some of the restrictions. We don't check for PMD_SIZE because our + * vmemmap allocation code can fallback correctly. The pageblock + * alignment requirement is met using altmap->reserve blocks. + */ +#define arch_supports_memmap_on_memory arch_supports_memmap_on_memory +static inline bool arch_supports_memmap_on_memory(unsigned long vmemmap_size) +{ + if (!radix_enabled()) + return false; + /* + * With 4K page size and 2M PMD_SIZE, we can align + * things better with memory block size value + * starting from 128MB. Hence align things with PMD_SIZE. + */ + if (IS_ENABLED(CONFIG_PPC_4K_PAGES)) + return IS_ALIGNED(vmemmap_size, PMD_SIZE); + return true; +} + #endif /* CONFIG_PPC64 */ #endif /* __ASSEMBLY__ */ diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 9c62c2c3b3d0..4f3d6a2f9065 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -637,7 +637,7 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb) nid = first_online_node; /* Add the memory */ - rc = __add_memory(nid, lmb->base_addr, block_sz, MHP_NONE); + rc = __add_memory(nid, lmb->base_addr, block_sz, MHP_MEMMAP_ON_MEMORY); if (rc) { invalidate_lmb_associativity_index(lmb); return rc; -- 2.41.0