From patchwork Tue Nov 7 07:22:42 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: 13448006 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 2B9CBC4332F for ; Tue, 7 Nov 2023 07:23:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C48C76B025F; Tue, 7 Nov 2023 02:23:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF9676B0260; Tue, 7 Nov 2023 02:23:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9A5D6B0261; Tue, 7 Nov 2023 02:23:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 987A36B025F for ; Tue, 7 Nov 2023 02:23:23 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 73C561A09A0 for ; Tue, 7 Nov 2023 07:23:23 +0000 (UTC) X-FDA: 81430317486.21.E370CAB Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf12.hostedemail.com (Postfix) with ESMTP id 336E840006 for ; Tue, 7 Nov 2023 07:23:20 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=SIcfQs6o; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf12.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699341801; 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=Z93v9XaO7o2I3n8SFS02aZBUxdSCDxEKWDNBVf3f7E4=; b=cugjzG3bCcd8TOFB2pTESz+iL4W5S8SLBDXoPge6rDSz41fD46IAOGlP2SoeLHM8ewdds/ +2UoaJ08Rj44dMk1TbvMKO7MyZbXbfNHRvNCnKVGsljv4clL2COPYKPuQ532oPOwRRDdse CJ4FjQpoLrR15LyfxPmS0JTO/4NQoSo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=SIcfQs6o; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf12.hostedemail.com: domain of vishal.l.verma@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vishal.l.verma@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699341801; a=rsa-sha256; cv=none; b=e8WaaZp3zzMLIuBNm/GnZ9MQwuopHhAOZSjoI5tklBoulEPs2no5Ka65XiGfBTjPzH610n /guXr2u4wAL7HRP8rjJalqTSHZVn8pwS82Qo5lyXZeGlUgDdh7ZLERCiGuoNgUK9vnI5rj Nz8JXoU3eJEWm4BZjI0Bn7DC2FKbUWY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699341801; x=1730877801; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=iJafxoDEShHWybkOtwON9JCHfE70mBFa3uJj6kdyYHc=; b=SIcfQs6oYFuWq8CSpn7HKw8aHLvAoJ7ibxqWL6p2x8kN+0IQ9Bo3ewPC KtzBGlvF8lMQ5rJHRnR+S2OgbyPClHSkIR8PXzl3gRtlQcn896RvJzX/y 5gTiEs9Th6WTqb1j5hOGcWrZ/LJE/resWCxdorTmbp1Tb5B444iSOf9VW w+wsgL+MXsXNg9VfVUFAsEGcwrSI3MVG/zgWZvdJCX+suX6KlD5O7RcCW fttLL9zkkyPwt7NK90NcsMgCtEy3OlATMw2z7ojFzj/OXulYArCtYTT92 mok1HRKyIzYqSw3jCw5bcEwXHPwmm3P0VWvPYtxn/S/Jdrx2VdD4fNCqz g==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="475689656" X-IronPort-AV: E=Sophos;i="6.03,282,1694761200"; d="scan'208";a="475689656" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 23:23:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="712477244" X-IronPort-AV: E=Sophos;i="6.03,282,1694761200"; d="scan'208";a="712477244" Received: from pengmich-mobl1.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.96.119]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2023 23:23:17 -0800 From: Vishal Verma Date: Tue, 07 Nov 2023 00:22:42 -0700 Subject: [PATCH v10 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231107-vv-kmem_memmap-v10-2-1253ec050ed0@intel.com> References: <20231107-vv-kmem_memmap-v10-0-1253ec050ed0@intel.com> In-Reply-To: <20231107-vv-kmem_memmap-v10-0-1253ec050ed0@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=9881; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=iJafxoDEShHWybkOtwON9JCHfE70mBFa3uJj6kdyYHc=; b=owGbwMvMwCXGf25diOft7jLG02pJDKmeTx/eWu/EL86d3xrNX6Gl/s5JqfpdvdxBlje6+3rMb tVZ2Cp2lLIwiHExyIopsvzd85HxmNz2fJ7ABEeYOaxMIEMYuDgFYCLdMQz//bK/Lrr2KaLqB18Y W/7PdF7XjVYNdycqn54zdaZ5oc4reUaGNQc+T30bczRyqbux4Zey1aKM1tWHBRkEuT5v+sSitle DBQA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 336E840006 X-Stat-Signature: f8s8534yjhoew8ksisda14xqmhkkyih6 X-Rspam-User: X-HE-Tag: 1699341800-718840 X-HE-Meta: U2FsdGVkX1+hZYEWfBgQ+eaMOg6yKhg01S88/T7AzTmOvcY+E48xoJ/DvMMx6TebdcvY2nSaEQ1+EBiRjxPpyt8vCwQLLc8MtesFd2ARrHtBbpHEFUUFYGI7nma6kGYXtnP7/OyaHBVhaBfiCsKib14TNA/EHsH6ZqQEkSnWzjVDm5JkoaZtahdnrUTLcVlpGfrmPOAlAv4UEtycYlyvqvS0mCm7MBgHqZKyI+LR/wNSPaStn4bzD+K551iF8jbMU5tqws8SjJ8Xf4VkDhT/uaS1lQiG7iTUE4AdOnJIF98HEC9Aazt9Lu18Jw51e1oNkpTp76oc52S3YWQrQUZ3A/YetThPAOdUCeLtbAICnKdBOF5Se/i1qS99qr18VwOrSzSZOyKKHI8TVh3QfRZmIeds4gGTjb5hxWeHbHmApwVUiMb3c5Vl3nWYuCH43ePfGZXWy/CRwQwQ8G7I4yOLj9PM4pOE0ty/NWUuzaNvESlObupbj7vmLQ6wSQlmdpflm1yKQ/yhzlYVXcMOdxXGi/tZBambCppSPAknJ32L2MsAd6Fy3X0BgcLXuxHpezzxRc19tCL5WeXijsTWSt6qXUzSrVhc+bCgaRo7xmPpeugDXMlT4dbaBKTHHfQwqp3gvLVhmqrcIre4JfnyOiP1HBpxWkhDUUFpKoSTpcqXAVSAEiOVHpnQnud97v4nCcAP29c2Xx1Lt2yl6wV81i0QG4Nfz6Gp4aeugDNIBeXMlxtKZKX0F2szqcy1u49JG9zc7KauLTfDRe8sNsDyP0gSWOv71z4dwdDrRY33uVzRxBT6WZp+2laP1SbkwlwEk59Gksvozd80oyQ+AxhPda1WDSt/9ZvXfYYmRThNwZyJs2REhs4ZFJSWwQ6j7vL3w4orf6ZYavXPxSOwFivo2tqPSFdLRoR4f6mFGTW/HN7Syi+O5c3YrttbrFxK9+AT3t6PuGMkZkkn7MrfNaVFLfk oKBQpwXt lm9OLrykhWglEhObqwEbOeyRGJtcjA5xvxaZ85RusEz73i6bogQW/Ilfye/kUbOy2aP8vG88e1cx1eBz/Y7daqnYr+OqbUdIvXh0BZP+qe1oajjiA3DFR39UjbhiWJbFFFCIN0zM3qIOp0H9zqQ9OF6CQ1e1gSDcOUh4a5ck2yQIA4uWVRGizPctPjYX1Gfputgv3lklcAi9MyavS8EyEwO7X7ZoSCdse8V7T3P7GCDjkxNTfIIlBTiKiR9BB7Tz06zJubV0rznFTPTG/sFkaLrb4wv1olHmGFCMjVtjPKSPwL4geaJqt1GGUobzGFfayEy0bfcRLXCJ8luqj5ubRf++PVBBqfbOTDURSMNe5/UfzYbSjWqohjvYPLtmN/UmSKS/c/PT3gykLR8vuebA/NCb1cTSpUiCAVtpP 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 Reviewed-by: "Huang, Ying" Acked-by: David Hildenbrand Signed-off-by: Vishal Verma --- mm/memory_hotplug.c | 212 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 136 insertions(+), 76 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 3ed48059a780..51d4895850ba 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,30 +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) { - ret = -ENOMEM; - 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) { @@ -1496,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); @@ -2068,17 +2133,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; } @@ -2152,11 +2213,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)); @@ -2173,45 +2252,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)) {