From patchwork Thu Nov 2 18:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13444120 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 1D947C4332F for ; Thu, 2 Nov 2023 18:28:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 447E38D00A5; Thu, 2 Nov 2023 14:28:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D1F28D000F; Thu, 2 Nov 2023 14:28:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 271488D00A5; Thu, 2 Nov 2023 14:28:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 12F2B8D000F for ; Thu, 2 Nov 2023 14:28:08 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DC2971402A9 for ; Thu, 2 Nov 2023 18:28:07 +0000 (UTC) X-FDA: 81413848614.07.C7E080A Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by imf25.hostedemail.com (Postfix) with ESMTP id 94741A0011 for ; Thu, 2 Nov 2023 18:28:04 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=CaFMcPAJ; spf=pass (imf25.hostedemail.com: domain of vishal.l.verma@intel.com designates 198.175.65.9 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698949684; a=rsa-sha256; cv=none; b=ut8zDu/R7yG57HlzCQbL7+QdUw3iTaOQ1Qrs1xeOUoZ1+YTO6ItUSNntkD+CrE6iI9Pcky FC6ZeImGWORQs5Clz5m+RzhXUvzJbKbQjvp9TujUEHi61zZM6RinOztLGxLJSPCnZkBoIA yFriEYbipmGnL++dZN195TbWfJWjhNM= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=CaFMcPAJ; spf=pass (imf25.hostedemail.com: domain of vishal.l.verma@intel.com designates 198.175.65.9 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698949684; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gPufV0u5N4ebCOa+7jNypFtamm8VKCCPP5XQWDgP3uc=; b=rUQfx1Eol2jPjY4sRPbovmzGKQQZ3H1w7V8L7keiv+gr62I1DaPxwfK2FY/KGba0ygX/LQ dcgQSIdY4/X2l1BYMwYBh2FmemtWfj2R+j7BFlur8lvchdicumiWy+fTRm8ahHfua6qczy kFNdAkeQPKQCOlpxD2R5xvY7X4VEdKc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698949684; x=1730485684; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=A9se+H7f5wHeZVaBeEeaT4RahL2y4DkPtSrr0ZRchz0=; b=CaFMcPAJUIz2MhgYus2Z7ccXdtrCXJ6rcSyN7pwZhBWkda5zMrHOa/9w KC5g03ZDUAcsavzyx5zmpx3t8noulvuijBPiwwVTV/2IPZXf1KxR8V9OC evWV2VQ/NOLLfnzLSHsnf0RIkDcyCNOYTbdWFa5mmeqT0Kc77PE9sC0LS RsR0+NsbbI1CvJoQ8zHjSVjuBdiZtNlErtidsJBhIUmh5HjFI5+sQh9ez 1L8hnLMhv0nL2zIaTuoE4O/xqYBefEldSAsCd5eWaTW8S959OQ3swRnUT 67/L++mUA3Om0vqI17Hs6SbFWufvAZJvOE4zk7dLuoLoO2LM8jOluTWDR w==; X-IronPort-AV: E=McAfee;i="6600,9927,10882"; a="7421179" X-IronPort-AV: E=Sophos;i="6.03,272,1694761200"; d="scan'208";a="7421179" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2023 11:28:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10882"; a="761359769" X-IronPort-AV: E=Sophos;i="6.03,272,1694761200"; d="scan'208";a="761359769" Received: from fmahinh-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.91.244]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2023 11:28:00 -0700 From: Vishal Verma Date: Thu, 02 Nov 2023 12:27:14 -0600 Subject: [PATCH v9 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231102-vv-kmem_memmap-v9-2-973d6b3a8f1a@intel.com> References: <20231102-vv-kmem_memmap-v9-0-973d6b3a8f1a@intel.com> In-Reply-To: <20231102-vv-kmem_memmap-v9-0-973d6b3a8f1a@intel.com> To: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, Huang Ying , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer , Vishal Verma X-Mailer: b4 0.13-dev-26615 X-Developer-Signature: v=1; a=openpgp-sha256; l=9800; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=A9se+H7f5wHeZVaBeEeaT4RahL2y4DkPtSrr0ZRchz0=; b=owGbwMvMwCXGf25diOft7jLG02pJDKnOr/RCOoLsp+xzeWJodcboX+Ji7tDoopSr7O83aV879 /3kNBHljlIWBjEuBlkxRZa/ez4yHpPbns8TmOAIM4eVCWQIAxenAEwk1o7hn45d4pT1coef2S46 wfDz+dwpp5a7XGN4r+a3rc3uH/OqKk6Gf1p+bxl5/nudNq336PdUmSPjnf9P9/VN5gu+IX3XVb7 YcwIA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 94741A0011 X-Stat-Signature: 13s9rgosgi848b1edmrochgxqr7uis63 X-Rspam-User: X-HE-Tag: 1698949684-643535 X-HE-Meta: U2FsdGVkX19X1hF1Fcj24xjIsGbqBKjqubelaQp/cbLTS7mnlSKvQSo1MB0XV6lv7JejQXETNeVEAvdSImaWkI1SOPtZSsgUkrYMG7YgAWiPz1yAeZGDXaZU/5REzoIF/t7RyVtdoqcx79nCnG4LqeESulXgJcFu3u88YunAuFY5B/untLRbRS/6rV+xAZPmpMgaDtyaJ6utBDwmOB9XriiEq0mAzJBRMC5YIWP5Mrq4d+4VProVkJEgZVp9Ho35tUgX3jGyWV++l515DTD1aeHjuD+xJA3S6LFraPyp93S0QzOHzWQdz2bYkodtrLD/kGqaWjQo0lbMkVG/AT4W4vDr0n/ets3ivzM1nWzz7+2CokCuZs3zx7/jY/ccITNSm5xlo+SeQhB4n7D04Q2bGEgcyoFMnC/p+0xnWrjL+TYWFPPm1qz2bFyjV1Pph/5KKNgfUNEceUeLFK3k0mWrWeAjNmonQ+EbNWGaOGOvRVLz+f4UKC74SwtZ1FzOxde+VSmQe3v/fMsscyI1zTdka5WdptbTsrxTaCPa3CVQEQaYWEYNn/ZMh/cGOhAv7bTELUNzY9eym1gU5ZJyvmkY0B1DVDhv0LomkIZtEZnRsp4uZwPb5lxdoE2iHGZ+RibJfGiRcbtOl+E0GIlFeHL1gw+BvvtFhttLJ1vkuaj3uO6CXvXHsl1bxHUmvpA258jH20wQnwOEzx6CMFnJXaJONbvAa+h4n9SBKqBFyKxfqJMurTStZdDqGMIhj2JLLN5VH2aj+7KR/gFPc6xsVOuVJwuL5VVsaoss2+VWkWDjISwEm+k5lkvruGuR6eO+CJyG/v3ZkQ9U1AjqqIX1cGiRugiteacLAtARm/BYT+2RyZxDGXm6vbIUXpAJbnxdndWejo8Q0LXxeuMH8S+dqJ1GH1Lwzw1tCmtKsuqiCstSb8pCZJnb9FJm0rkCbUlygD65icXP0adQBSY6TOF7AjT K8vFtWi+ FC+uvVRmYxlaiB5iB/pFusKTFxPFRPnVXOEo+8BXmkglh2afVmR/1bTaYzD1SsZ577Zx9v6wYsrrjyje9z12KsbB03kXBmxLIam4dIA94jj0pQqyvQs4KCeVqMKvJ19Yb6o/UsBOJyNzlvnNuCyVXY8dRP18x7MBvtxgBzLoCrHf8iqEe38DIur1aUA/4kD2RMTO5ShW98lupaKwX2NlHFmKGQAE2V6gFHrsdN+48R7tRs5Kqj0GUWDuBGUA0MPz3884F98NznDveKRGtAw3kR756b/ggLK0q4ZiRX2ZARyqSIPKQrztrUYTOFH6G3b40MUImNNAUFtH/SvR9sSRr1ps941aXQrpBpS7AnL0w5D/Uj2ZeWewenC2LuG5CGqaQgY0WI0Oo9Fb93cv1d3TWK+anvEWmpszL8B/y 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: List-Subscribe: List-Unsubscribe: The MHP_MEMMAP_ON_MEMORY flag for hotplugged memory is restricted to 'memblock_size' chunks of memory being added. Adding a larger span of memory precludes memmap_on_memory semantics. For users of hotplug such as kmem, large amounts of memory might get added from the CXL subsystem. In some cases, this amount may exceed the available 'main memory' to store the memmap for the memory being added. In this case, it is useful to have a way to place the memmap on the memory being added, even if it means splitting the addition into memblock-sized chunks. Change add_memory_resource() to loop over memblock-sized chunks of memory if caller requested memmap_on_memory, and if other conditions for it are met. Teach try_remove_memory() to also expect that a memory range being removed might have been split up into memblock sized chunks, and to loop through those as needed. This does preclude being able to use PUD mappings in the direct map; a proposal to how this could be optimized in the future is laid out here[1]. [1]: https://lore.kernel.org/linux-mm/b6753402-2de9-25b2-36e9-eacd49752b19@redhat.com/ Cc: Andrew Morton Cc: David Hildenbrand Cc: Michal Hocko Cc: Oscar Salvador Cc: Dan Williams Cc: Dave Jiang Cc: Dave Hansen Cc: Huang Ying Suggested-by: David Hildenbrand Reviewed-by: Dan Williams Acked-by: David Hildenbrand Signed-off-by: Vishal Verma Reviewed-by: "Huang, Ying" --- mm/memory_hotplug.c | 210 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 136 insertions(+), 74 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6be7de9efa55..b380675ab932 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1380,6 +1380,85 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) return arch_supports_memmap_on_memory(vmemmap_size); } +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) +{ + unsigned long memblock_size = memory_block_size_bytes(); + u64 cur_start; + + /* + * For memmap_on_memory, the altmaps were added on a per-memblock + * basis; we have to process each individual memory block. + */ + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + struct vmem_altmap *altmap = NULL; + struct memory_block *mem; + + mem = find_memory_block(pfn_to_section_nr(PFN_DOWN(cur_start))); + if (WARN_ON_ONCE(!mem)) + continue; + + altmap = mem->altmap; + mem->altmap = NULL; + + remove_memory_block_devices(cur_start, memblock_size); + + arch_remove_memory(cur_start, memblock_size, altmap); + + /* Verify that all vmemmap pages have actually been freed. */ + WARN(altmap->alloc, "Altmap not fully unmapped"); + kfree(altmap); + } +} + +static int create_altmaps_and_memory_blocks(int nid, struct memory_group *group, + u64 start, u64 size) +{ + unsigned long memblock_size = memory_block_size_bytes(); + u64 cur_start; + int ret; + + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + struct mhp_params params = { .pgprot = + pgprot_mhp(PAGE_KERNEL) }; + struct vmem_altmap mhp_altmap = { + .base_pfn = PHYS_PFN(cur_start), + .end_pfn = PHYS_PFN(cur_start + memblock_size - 1), + }; + + mhp_altmap.free = memory_block_memmap_on_memory_pages(); + params.altmap = kmemdup(&mhp_altmap, sizeof(struct vmem_altmap), + GFP_KERNEL); + if (!params.altmap) { + ret = -ENOMEM; + goto out; + } + + /* call arch's memory hotadd */ + ret = arch_add_memory(nid, cur_start, memblock_size, ¶ms); + if (ret < 0) { + kfree(params.altmap); + goto out; + } + + /* create memory block devices after memory was added */ + ret = create_memory_block_devices(cur_start, memblock_size, + params.altmap, group); + if (ret) { + arch_remove_memory(cur_start, memblock_size, NULL); + kfree(params.altmap); + goto out; + } + } + + return 0; +out: + if (ret && cur_start != start) + remove_memory_blocks_and_altmaps(start, cur_start - start); + return ret; +} + /* * NOTE: The caller must call lock_device_hotplug() to serialize hotplug * and online/offline operations (triggered e.g. by sysfs). @@ -1390,10 +1469,6 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) { struct mhp_params params = { .pgprot = pgprot_mhp(PAGE_KERNEL) }; enum memblock_flags memblock_flags = MEMBLOCK_NONE; - struct vmem_altmap mhp_altmap = { - .base_pfn = PHYS_PFN(res->start), - .end_pfn = PHYS_PFN(res->end), - }; struct memory_group *group = NULL; u64 start, size; bool new_node = false; @@ -1436,28 +1511,22 @@ 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)) { - mhp_altmap.free = memory_block_memmap_on_memory_pages(); - params.altmap = kmemdup(&mhp_altmap, - sizeof(struct vmem_altmap), - GFP_KERNEL); - if (!params.altmap) - goto error; + if ((mhp_flags & MHP_MEMMAP_ON_MEMORY) && + mhp_supports_memmap_on_memory(memory_block_size_bytes())) { + ret = create_altmaps_and_memory_blocks(nid, group, start, size); + if (ret) + goto error; + } else { + ret = arch_add_memory(nid, start, size, ¶ms); + if (ret < 0) + goto error; + + /* create memory block devices after memory was added */ + ret = create_memory_block_devices(start, size, NULL, group); + if (ret) { + arch_remove_memory(start, size, NULL); + goto error; } - /* fallback to not using altmap */ - } - - /* call arch's memory hotadd */ - ret = arch_add_memory(nid, start, size, ¶ms); - if (ret < 0) - goto error_free; - - /* create memory block devices after memory was added */ - ret = create_memory_block_devices(start, size, params.altmap, group); - if (ret) { - arch_remove_memory(start, size, NULL); - goto error_free; } if (new_node) { @@ -1494,8 +1563,6 @@ int __ref add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags) walk_memory_blocks(start, size, NULL, online_memory_block); return ret; -error_free: - kfree(params.altmap); error: if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) memblock_remove(start, size); @@ -2062,17 +2129,13 @@ static int check_memblock_offlined_cb(struct memory_block *mem, void *arg) return 0; } -static int test_has_altmap_cb(struct memory_block *mem, void *arg) +static int count_memory_range_altmaps_cb(struct memory_block *mem, void *arg) { - struct memory_block **mem_ptr = (struct memory_block **)arg; - /* - * return the memblock if we have altmap - * and break callback. - */ - if (mem->altmap) { - *mem_ptr = mem; - return 1; - } + u64 *num_altmaps = (u64 *)arg; + + if (mem->altmap) + *num_altmaps += 1; + return 0; } @@ -2146,11 +2209,29 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); +static int memory_blocks_have_altmaps(u64 start, u64 size) +{ + u64 num_memblocks = size / memory_block_size_bytes(); + u64 num_altmaps = 0; + + if (!mhp_memmap_on_memory()) + return 0; + + walk_memory_blocks(start, size, &num_altmaps, + count_memory_range_altmaps_cb); + + if (num_altmaps == 0) + return 0; + + if (WARN_ON_ONCE(num_memblocks != num_altmaps)) + return -EINVAL; + + return 1; +} + static int __ref try_remove_memory(u64 start, u64 size) { - struct memory_block *mem; - int rc = 0, nid = NUMA_NO_NODE; - struct vmem_altmap *altmap = NULL; + int rc, nid = NUMA_NO_NODE; BUG_ON(check_hotplug_memory_range(start, size)); @@ -2167,45 +2248,26 @@ static int __ref try_remove_memory(u64 start, u64 size) if (rc) return rc; - /* - * We only support removing memory added with MHP_MEMMAP_ON_MEMORY in - * the same granularity it was added - a single memory block. - */ - if (mhp_memmap_on_memory()) { - rc = walk_memory_blocks(start, size, &mem, test_has_altmap_cb); - if (rc) { - if (size != memory_block_size_bytes()) { - pr_warn("Refuse to remove %#llx - %#llx," - "wrong granularity\n", - start, start + size); - return -EINVAL; - } - altmap = mem->altmap; - /* - * Mark altmap NULL so that we can add a debug - * check on memblock free. - */ - mem->altmap = NULL; - } - } - /* remove memmap entry */ firmware_map_remove(start, start + size, "System RAM"); - /* - * Memory block device removal under the device_hotplug_lock is - * a barrier against racing online attempts. - */ - remove_memory_block_devices(start, size); - mem_hotplug_begin(); - arch_remove_memory(start, size, altmap); - - /* Verify that all vmemmap pages have actually been freed. */ - if (altmap) { - WARN(altmap->alloc, "Altmap not fully unmapped"); - kfree(altmap); + rc = memory_blocks_have_altmaps(start, size); + if (rc < 0) { + mem_hotplug_done(); + return rc; + } else if (!rc) { + /* + * Memory block device removal under the device_hotplug_lock is + * a barrier against racing online attempts. + * No altmaps present, do the removal directly + */ + remove_memory_block_devices(start, size); + arch_remove_memory(start, size, NULL); + } else { + /* all memblocks in the range have altmaps */ + remove_memory_blocks_and_altmaps(start, size); } if (IS_ENABLED(CONFIG_ARCH_KEEP_MEMBLOCK)) {