From patchwork Tue Aug 8 09:14:57 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: 13345895 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 3ACEFC001B0 for ; Tue, 8 Aug 2023 09:34:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CFC946B0074; Tue, 8 Aug 2023 05:34:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAC776B0075; Tue, 8 Aug 2023 05:34:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B75BC8D0001; Tue, 8 Aug 2023 05:34:08 -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 A7DD46B0074 for ; Tue, 8 Aug 2023 05:34:08 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 77238B163A for ; Tue, 8 Aug 2023 09:34:08 +0000 (UTC) X-FDA: 81100426176.01.2148D14 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf09.hostedemail.com (Postfix) with ESMTP id 1EEBF140019 for ; Tue, 8 Aug 2023 09:34:05 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=bCYQvryZ; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf09.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 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=1691487246; 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=tyTQZF8WZbk6E9JH+rrRWf58Awf2yhaBpYeGQE6gY3g=; b=BM7DyNxMTPC+rCxGOGTKHvo5nqrkvI5vTYci+6yx3N8SgH+CST9ixR5ktfEvDQ3boT0WGb Xwl+C2eqLBj3zGbkeQSijZWLAiVFCe08vt7a32YtUj3u8XWtIF8cwfQVWV2FhmiVC1evR8 vlDdn5Ag1kN1VA8BI+0PSkN9Gpm16VM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=bCYQvryZ; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf09.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691487246; a=rsa-sha256; cv=none; b=insfhzh9OiHlckJkKXtizTcwfY7/FiBjnx/TGICBwV0Y+WtgI0AZDsRQX5cbbW5He7PyPo HThVjVHZ7ANctuW2tfxuI6IIAkv6uqNbellIVUlbGEpz4/IRbDODJebLW69TyopkYlKS7j /cF2KwOQ47yw9mHCXtnsngFaHmqxyfs= Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37898kfe010793; Tue, 8 Aug 2023 09:15:19 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=tyTQZF8WZbk6E9JH+rrRWf58Awf2yhaBpYeGQE6gY3g=; b=bCYQvryZ7MGCsbVaq04id0wXwVt0TLPdwfeoyi1DrtGcSWpypZiHwzvTcxrCNIxal2AT cQN0kre1yD9b91y1NB5tyVW4/+kYPDVRzQCDt0lvutXlTubvP8D9jHcPlKZEctbiRjXk 24N55T+6EDqH5JT1cXjAcCpgzHe53G2xXDz887aINWbwugD3R24SdzhmsDblFF/IIbNz i1jCK6yuNraCp0jWktCO+EVMAoC/esc9clTGWn9kKvZnMuwYWCDjeGyL9vjFVStRnsWG 3Vj7gSAcPz9wf8VMFkV018zisYLmV0Ze63VYuxTTJ2pizdxCNLfjTY60TtYoMOwNnG1J Eg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sbjpt8ftg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:18 +0000 Received: from m0353725.ppops.net (m0353725.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 37898r3Q011546; Tue, 8 Aug 2023 09:15:18 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3sbjpt8ft3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:17 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3788KpXt007573; Tue, 8 Aug 2023 09:15:17 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3sa14y5f9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 08 Aug 2023 09:15:17 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3789FGuu34996768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 8 Aug 2023 09:15:16 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A8295805A; Tue, 8 Aug 2023 09:15:16 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 251465803F; Tue, 8 Aug 2023 09:15:13 +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:12 +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 2/6] mm/memory_hotplug: Allow memmap on memory hotplug request to fallback Date: Tue, 8 Aug 2023 14:44:57 +0530 Message-ID: <20230808091501.287660-3-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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 3LR2yuBc6OHoWk6QbaVAeEqDNYKc2CH4 X-Proofpoint-ORIG-GUID: OlOahb-5vcLFQmoPwH1n99cOoHU90Qhn 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 suspectscore=0 mlxlogscore=934 adultscore=0 impostorscore=0 mlxscore=0 spamscore=0 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308080081 X-Rspamd-Queue-Id: 1EEBF140019 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: zsa7946co985dp6wp6mbmq6x4rgywxdt X-HE-Tag: 1691487245-489572 X-HE-Meta: U2FsdGVkX18Hqf3tw4gKoMsqenod4JOsBswix9pt/ZyvhLMUP1yAs4KIuX42S61RwA1vldGHepI+yxHMA2N9LgWrZL3CaMY7yvIQEOe42Zh7lpvWBbcGQG0LZPhzWJc1QbR+jV/MV2KTlsJLVbxE6h+W2WrFeqlNedRsH6JnUKqdq3e1kz7PFOrvdy0Chpo9PpIAYKURlP1kQ7DyFt0L2EJtb6GQqskGcGPzMKwzEoMY9pvbkFUeIkEAk3VNiISMPQbf5iiphiJG1zddt+2Ni8GJEonnhIoDSKlG6m5ELY27w22r54B96gzNwEJV98CHjpqt7QSw9oW4xi0bav+0GXqeZyt7xe+D1go6PpP1c+7Cmb85oPNDyviwlFLIwkFGKTeUlCav9+RvhIaT4ZD+x7+SnqMxAJTQHtftwEFUH4QoYlPd64urmKwJw6NzsoK41MV0eBxpdV27aipT6fj4txSRogWrhfT13p4T4wmbYziMI+8rO7sZE8e8e1Zt1RK3uSzK0dtZ/56vUYr9nRjYjDNERqy0E/roCQFOujOchhrWoLxLrSUdoXomKSfRGI7xRSijuuQJAF843gn0ubySjhd5GZi8cExkLNHqZFolnrhKs/QPOHUmDLxzmKzmO3zP/17Od56o8iWCRflSSDF507HJsMyrW+Y8ECPQzTvlR8lz7Lrw6htdNRzdr6pdVVH0FJfJ+7sAIJTLCoIJfyfkFBaLXohyCo8Q8UrUlb1QJxO7f2aGqAfdAT2W4riic9nyd8tF1nylIp+WFUdpib2VtzavesC+0sOCFA/S4/qvFLNHR34+s/shiCJC4p2gpFQ0o0d2dG2DfiO7knkI1npB82RvtUWhyarYztY15NeAFmIsAjyjNAaZQzGFhTobFGWVe2DhPt++nWHw/9pdgG4H1iNgalV31k4FofFTZYOVwEvBGsKikg+g9AoC8TYXZbW4aw3BADvLxPtuxpEJ3Fx hHBtLMa1 /5AYmniYO4Wxlg1QxtgqvDD1/eo0RiLQO+Qmmzr0ja4gARkk0DDgDyExquZXf/r6fTEF9k+VW7xeUfQ0HWcyhV7fWqduFTJWL1yc4wFmwZjhKMS3TisViEUG9PBEVOIfU1IXeKstbi4owyte6QCYxWUEGlz2i2eh+T9FbKPX/HOpQCcrLeIx67VCMpbqJEnTqbzJR3F9PLQacOaoCrxKDIvNxVQotDCAJWIxb61mIkwF5YPo8iYIJ5jgaTiKU3FJJS3ZKyDUYVmRzyrs= 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: If not supported, fallback to not using memap on memmory. This avoids the need for callers to do the fallback. Acked-by: Michal Hocko Acked-by: David Hildenbrand Signed-off-by: Aneesh Kumar K.V --- drivers/acpi/acpi_memhotplug.c | 3 +-- include/linux/memory_hotplug.h | 3 ++- mm/memory_hotplug.c | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 24f662d8bd39..d0c1a71007d0 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -211,8 +211,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device) if (!info->length) continue; - if (mhp_supports_memmap_on_memory(info->length)) - mhp_flags |= MHP_MEMMAP_ON_MEMORY; + mhp_flags |= MHP_MEMMAP_ON_MEMORY; result = __add_memory(mgid, info->start_addr, info->length, mhp_flags); diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 013c69753c91..7d2076583494 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -97,6 +97,8 @@ typedef int __bitwise mhp_t; * To do so, we will use the beginning of the hot-added range to build * the page tables for the memmap array that describes the entire range. * Only selected architectures support it with SPARSE_VMEMMAP. + * This is only a hint, the core kernel can decide to not do this based on + * different alignment checks. */ #define MHP_MEMMAP_ON_MEMORY ((__force mhp_t)BIT(1)) /* @@ -354,7 +356,6 @@ extern struct zone *zone_for_pfn_range(int online_type, int nid, extern int arch_create_linear_mapping(int nid, u64 start, u64 size, struct mhp_params *params); void arch_remove_linear_mapping(u64 start, u64 size); -extern bool mhp_supports_memmap_on_memory(unsigned long size); #endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* __LINUX_MEMORY_HOTPLUG_H */ diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7cfd13c91568..eca32ccd45cc 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1247,7 +1247,7 @@ static int online_memory_block(struct memory_block *mem, void *arg) return device_online(&mem->dev); } -bool mhp_supports_memmap_on_memory(unsigned long size) +static bool mhp_supports_memmap_on_memory(unsigned long size) { unsigned long nr_vmemmap_pages = size / PAGE_SIZE; unsigned long vmemmap_size = nr_vmemmap_pages * sizeof(struct page); @@ -1339,13 +1339,12 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) * Self hosted memmap array */ if (mhp_flags & MHP_MEMMAP_ON_MEMORY) { - if (!mhp_supports_memmap_on_memory(size)) { - ret = -EINVAL; - goto error; + if (mhp_supports_memmap_on_memory(size)) { + mhp_altmap.free = PHYS_PFN(size); + mhp_altmap.base_pfn = PHYS_PFN(start); + params.altmap = &mhp_altmap; } - mhp_altmap.free = PHYS_PFN(size); - mhp_altmap.base_pfn = PHYS_PFN(start); - params.altmap = &mhp_altmap; + /* fallback to not using altmap */ } /* call arch's memory hotadd */