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 8DD1CEB64DC for ; Tue, 18 Jul 2023 02:44:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 267B66B007B; Mon, 17 Jul 2023 22:44:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 218736B007D; Mon, 17 Jul 2023 22:44:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E0088D0001; Mon, 17 Jul 2023 22:44:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 021626B007B for ; Mon, 17 Jul 2023 22:44:44 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CB96E406ED for ; Tue, 18 Jul 2023 02:44:43 +0000 (UTC) X-FDA: 81023189646.20.461E8A5 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf14.hostedemail.com (Postfix) with ESMTP id 781DC10001B for ; Tue, 18 Jul 2023 02:44:41 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=M8abzvno; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf14.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=1689648281; 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=LFO5IRzkMKVZdRJ6opEYm5rJX52kJBVizuyBJ43Omn4=; b=ZmWqt5qgHFbEqo61g/sE3SSX4lIL35HqGvrw1qgBwd/FGYjRDqgD2Gt4gLIYTyUul1SiOW heIeumA8Oiz5K940ngGuEcp/CtKaeHu9rfE1R7CHCBKh/dwSv0XXUT8+D/zw2fmU1FbWCM 2vias7xTKqU6p7MBtuxqe5RkVfp+/Bw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=M8abzvno; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf14.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=1689648281; a=rsa-sha256; cv=none; b=G04Ies0h8Br++bZmondJevC4mcBNY/oASeTdxVONGPlNdOi9pncrYe98gOgX/+19qggEaT 03hrKMza6M/3HumGSlAGZ6/G8Bcs/OYxS29sx/cMPORYYgHiPllPiWMtFItsulvOX1qh8d S2iL3b3nncc1wju4FCkClp2XEgydTao= 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 36I2adQP023684; Tue, 18 Jul 2023 02:44: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=LFO5IRzkMKVZdRJ6opEYm5rJX52kJBVizuyBJ43Omn4=; b=M8abzvnot4XuiTVriLSW0P0FZt9gDg68RMHmaCE1cnrA6qi3gNxjhULN+9WFYcM4pV+v ZbjGPZAOKjHCxtdmg2QFlL7u+X6u0xtr3YANRx1iWbGXjDr3uYHTMsX8HerRBHKk+jV+ DkpHCAXRIo966n2GH86f0jyYPOkPUmOMYF3Zd/nqUHttPWqI5a8OXp+QoO2nw2gLZpYj 0lVKZXZ/LcL945YVOELFKJcX+iuaP7+tlcvMt7YUB9HxUFPOHugcz+bVtwxyBu+u68nI /dfm1lHNYHpg6f/3N36kIdozxRaUQhYDFxQCi1izXdobVcNFmCf/jKMzRnxdYr8190Rp 4A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rwhrg8j05-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:44:34 +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 36I2cVsk031373; Tue, 18 Jul 2023 02:44:33 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3rwhrg8hym-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:44:33 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 36HK0R9G009611; Tue, 18 Jul 2023 02:44:32 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3rv80j1hfa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 02:44:32 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 36I2iVgl48693704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 02:44:32 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8F2FB58051; Tue, 18 Jul 2023 02:44:31 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9011D5805C; Tue, 18 Jul 2023 02:44:27 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.62.199]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 18 Jul 2023 02:44:27 +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 v4 3/6] mm/hotplug: Allow architecture to override memmap on memory support check Date: Tue, 18 Jul 2023 08:14:06 +0530 Message-ID: <20230718024409.95742-4-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718024409.95742-1-aneesh.kumar@linux.ibm.com> References: <20230718024409.95742-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: EUZEG1ly-gT1R2iEGt8yo1e8MelK0AqZ X-Proofpoint-ORIG-GUID: V5VzftnUMshQmHsa1P2MLoRyKh125z8f 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 mlxscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 phishscore=0 suspectscore=0 priorityscore=1501 adultscore=0 bulkscore=0 mlxlogscore=999 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307180022 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 781DC10001B X-Stat-Signature: 7oigy6kt9m54jwz7oia4gbhecf6fn96d X-Rspam-User: X-HE-Tag: 1689648281-327530 X-HE-Meta: U2FsdGVkX19U9AnvKkHSL1o68+HvApqaRqQ0NxuxyZygK/RnhgQk3FUrhGGhU9vvIevkzP8fOZ478xT1KJTxQb5KuJpn7lkK61tnJzCShx06odJxCFAiOb0DDumZBpY/oi53/bROgRlq+MD73UegHAikSoFmTFbUfmYnMTvZe1uXN8GUYnSJz92ae8x1yszRY1xk57x4EN3hsvpURx8LvJiK4IYv+N32XYTzH3uyYIWHO7b4dXWK5rlVDWBjZDfy95zWJnjp/WN9vjQBdessqm4CxC8rIEN09jOFfhuGbuTcCHwc5/NPtpN4XJqcKvp0RiZbJlCsnQ+ZVmNeX67lpmOYMnoC3NtGo52z1PvvaUcoRfZAS/L++iM7hkxmbMtOA4dr18g4x68K2TNjfiyI/2JDw2SOcMEMBpBA0Xydl6YvQ9FvIjvWLKgbQHkPn8O/JE2sT0Ek35r2MjVxciEFn43iqaXefD/lyPtA5Jy7Y3pdilI/y/SA5JfVAKy+ABkgDrrRjdHh/Fq3OE/ZpbZLKHJqeGeUzjz/fQoyFlrfg2PtR326HF7xN132aVav8A17VvxNT4nJWdtSs7CIgOTEBrAhHd74ena37VHgv2Q0v+BW2UeNDQCLSfxaNZZZE5CWUNn2XKGEQKIUeIHTyGpENeeLG9axt0sHhTsFAlMeMi/ANkiPV3HwMqClLo3WDOYLwvhRkpjrqaqWOxGEhEcpdfd6GqoulwuUkHEzLfTBXUXZ/NHeTsAoxVZDidMopZerRpPGUmOLYeflsUtNdfSDNe7FaGGG4l6YXI7zmglvbz5+PAC2vW/zlo4gfiF+CNg1E2dGixUj0fhjSxmYaylDNPET357+2TFYFMLedLHrqpHCXeVmgE8iRaJzLV1t5Z7IQeWLpYuyxz1/CazhqdbdNx48Rz36/7k+KU/fV3vr4MRXDaEST09p4rm62PU6r3tEMfVr5XUPiQI/GPrnQDO CpA2twvS g1UrdanA2Olnw/5eSuGuBm5ipr7Cg+o8/Qk4dWeFmx7qmQ6ttvCzxL6nMipDzwgjfNAAQRhAMLxrkdeFH9xcrXWlmm1n6vS1nW1psxnr3jfqeBiTzql0RmnMYN3HpcE0k6+0sSt6ituAYGjPdK7U1kimhzWVfDQ1xQNyCO7nw0prpevavmHgj8QorylNqStiuFuJY+yP2ksVgfzmNMf82dsK/R0jzg9QgTAP/75TqEmoR45I= 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: Some architectures would want different restrictions. Hence add an architecture-specific override. Both the PMD_SIZE check and pageblock alignment check are moved there. Signed-off-by: Aneesh Kumar K.V --- mm/memory_hotplug.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1b19462f4e72..5921c81fcb70 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1247,9 +1247,25 @@ static int online_memory_block(struct memory_block *mem, void *arg) return device_online(&mem->dev); } +#ifndef arch_supports_memmap_on_memory +static inline bool arch_supports_memmap_on_memory(unsigned long size) +{ + unsigned long nr_vmemmap_pages = size >> PAGE_SHIFT; + unsigned long vmemmap_size = nr_vmemmap_pages * sizeof(struct page); + + /* + * As default, we want the vmemmap to span a complete PMD such that we + * can map the vmemmap using a single PMD if supported by the + * architecture. + */ + return IS_ALIGNED(vmemmap_size, PMD_SIZE); +} +#endif + static bool mhp_supports_memmap_on_memory(unsigned long size) { - unsigned long nr_vmemmap_pages = size / PAGE_SIZE; + + unsigned long nr_vmemmap_pages = size >> PAGE_SHIFT; unsigned long vmemmap_size = nr_vmemmap_pages * sizeof(struct page); unsigned long remaining_size = size - vmemmap_size; @@ -1281,8 +1297,8 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) */ return mhp_memmap_on_memory() && size == memory_block_size_bytes() && - IS_ALIGNED(vmemmap_size, PMD_SIZE) && - IS_ALIGNED(remaining_size, (pageblock_nr_pages << PAGE_SHIFT)); + IS_ALIGNED(remaining_size, (pageblock_nr_pages << PAGE_SHIFT)) && + arch_supports_memmap_on_memory(size); } /* -- 2.41.0