From patchwork Wed Oct 25 22:44:34 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: 158322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp285273vqb; Wed, 25 Oct 2023 15:46:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4756duTc68pA94AUwpdTWemjpWn5DhWBUHaglkL4GY8Z3oYFuXsehInSIuLeJMmfQQt3d X-Received: by 2002:a05:6871:528e:b0:1ea:7142:851d with SMTP id hu14-20020a056871528e00b001ea7142851dmr23648131oac.57.1698273990601; Wed, 25 Oct 2023 15:46:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698273990; cv=none; d=google.com; s=arc-20160816; b=HX7EVsxfRWQzOrQ3C7PeeWJkEg9f97A6VVVTHRc7Q1uWBE1fvT8B1hc+7E6aRCMgjc XgP4x7RrbR7f5XtFlRhBRq3qRoHwdFy/WrTC4+nf/qnrMVAoOmJsYO1WO+4Lf6Oa2Tjt VjIAZeGTHHqYUGLXVSnfjFJrhzhqu2BQ2rYo36n3i0lE8oGN6gVxbQzGIgHcIxx117im vIrDanUZFg9jkEVEnYIEhnHyJAZo745If1Vwjk3cSzgHW5JaIWHMi8TGzLSMBs/Yd7ic gu34f7etoUcHTqpVLsB9SVzPnP6rHRyozWMF7BE3+FQBb6S0C/vFKoDY+Bo1OD0AGQXx G3ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=pho2UjNSfDwctiP/LVeQgoP4xsPcM0ban7Xat+sHSSs=; fh=ZJyl7lGIgKsdPRNZ+hASCGqYu4kS00HsOWlg75WSZ6w=; b=FgTD9Krk6WqeUql60sLnkS1d4MPAuMZ1wBCO0RdM3X6jSJ2y6PNxprAEcZNQpms/vk 8P4pJd6Z3x2+MlIgyimz5RC51ajKv/vmreUniMHy7SnBK+adt0j8VY7EZUnvo0XoRo6i dvru5eSsl5mQXF06ZfSqn2zOMDRSmyC8Kg3vruk2WUqMZQS58mDSMf3t/eO4oaUNth6p a5pMTYTlINU1czs8gSJwa2H8j22mCOWjzs80BphQ9Bulbo7AbXFdtCGU36P/ow3Ds1Th nzbhoLuE9hJI/GwsJnb/BUNbj70M8CF8EbvP4A/Y3yXskgP9hUEr8R5GFVi29WGLn6S9 Dpvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=b56TyI49; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id w3-20020a25ac03000000b00d7bac6678absi12276950ybi.668.2023.10.25.15.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 15:46:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=b56TyI49; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 36A59809ABFA; Wed, 25 Oct 2023 15:45:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232000AbjJYWpH (ORCPT + 25 others); Wed, 25 Oct 2023 18:45:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230306AbjJYWpB (ORCPT ); Wed, 25 Oct 2023 18:45:01 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 049C6DC; Wed, 25 Oct 2023 15:44:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698273899; x=1729809899; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=ndMaEWGdwlBZiUCGL9AFKr6E35jyc9m/F17PjjwLe7E=; b=b56TyI49JIbulkQy/9/+llClWo5TkcUvnAfPfA5PEH3sLVlxdfPcpkRH YxdKZ5BaoUKH6a4WqgFOpDRLzQkKfAP7R6fxq/T0Z8+nvBQHmZmCmtxhh +IvmrJWWQJysIpXkHRYkwtKE2Vq8fozhK9kYdtcxJdi0VlVyMpAa8+r5f DqKwkuY64D5UPz4Hws2U+GQ1IGPxvs+NiR9Th+MFthsVak1c9Wlao7wYZ Kwc3LvJZUdQYjqN/o58p2mgBFG0WWcw3+SX/LaQv8VzKUjeB+6mckR91Q kPKsJe4/+jRm5YGLWsEW5oy+cBYPTwUSn7sbgWVPSD0zhILvLjd94fuPc Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="473650457" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="473650457" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="708846731" X-IronPort-AV: E=Sophos;i="6.03,252,1694761200"; d="scan'208";a="708846731" Received: from nmckubrx-mobl.amr.corp.intel.com (HELO [192.168.1.200]) ([10.212.68.190]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 15:44:51 -0700 From: Vishal Verma Date: Wed, 25 Oct 2023 16:44:34 -0600 Subject: [PATCH v7 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks MIME-Version: 1.0 Message-Id: <20231025-vv-kmem_memmap-v7-2-4a76d7652df5@intel.com> References: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@intel.com> In-Reply-To: <20231025-vv-kmem_memmap-v7-0-4a76d7652df5@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.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=9833; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=ndMaEWGdwlBZiUCGL9AFKr6E35jyc9m/F17PjjwLe7E=; b=owGbwMvMwCXGf25diOft7jLG02pJDKmWsxLWHPj5TybkrKyIeqN7o9Hrz15xByfurLrud3X9E /0Lx9Pmd5SyMIhxMciKKbL83fOR8Zjc9nyewARHmDmsTCBDGLg4BWAiXxsZGe7Ef6hS3VIin7Gu +v/N/Y9sWHbZzC55tXGf+OP5niaPZEoZGXbed9175P/nkz4vFk59HatW5WHsEXqCpWVya59FX8V MHR4A X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 15:45:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780769347636538289 X-GMAIL-MSGID: 1780769347636538289 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 Signed-off-by: Vishal Verma --- mm/memory_hotplug.c | 209 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 144 insertions(+), 65 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 6be7de9efa55..b97035193090 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1380,6 +1380,48 @@ static bool mhp_supports_memmap_on_memory(unsigned long size) return arch_supports_memmap_on_memory(vmemmap_size); } +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) + return -ENOMEM; + + /* call arch's memory hotadd */ + ret = arch_add_memory(nid, cur_start, memblock_size, ¶ms); + if (ret < 0) { + kfree(params.altmap); + return ret; + } + + /* 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); + return ret; + } + } + + return 0; +} + /* * NOTE: The caller must call lock_device_hotplug() to serialize hotplug * and online/offline operations (triggered e.g. by sysfs). @@ -1390,10 +1432,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 +1474,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 +1526,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); @@ -2076,6 +2106,16 @@ static int test_has_altmap_cb(struct memory_block *mem, void *arg) return 0; } +static int count_memory_range_altmaps_cb(struct memory_block *mem, void *arg) +{ + u64 *num_altmaps = (u64 *)arg; + + if (mem->altmap) + *num_altmaps += 1; + + return 0; +} + static int check_cpu_on_node(int nid) { int cpu; @@ -2146,11 +2186,69 @@ void try_offline_node(int nid) } EXPORT_SYMBOL(try_offline_node); -static int __ref try_remove_memory(u64 start, u64 size) +static void __ref remove_memory_blocks_and_altmaps(u64 start, u64 size) { - struct memory_block *mem; - int rc = 0, nid = NUMA_NO_NODE; + unsigned long memblock_size = memory_block_size_bytes(); struct vmem_altmap *altmap = NULL; + struct memory_block *mem; + u64 cur_start; + int rc; + + /* + * For memmap_on_memory, the altmaps could have been added on + * a per-memblock basis. Loop through the entire range if so, + * and remove each memblock and its altmap. + */ + for (cur_start = start; cur_start < start + size; + cur_start += memblock_size) { + rc = walk_memory_blocks(cur_start, memblock_size, &mem, + test_has_altmap_cb); + if (rc) { + altmap = mem->altmap; + /* + * Mark altmap NULL so that we can add a debug + * check on memblock free. + */ + 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. */ + if (altmap) { + WARN(altmap->alloc, "Altmap not fully unmapped"); + kfree(altmap); + } + } +} + +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 (num_memblocks != num_altmaps) { + WARN_ONCE(1, "Not all memblocks in range have altmaps"); + return -EINVAL; + } + + return 1; +} + +static int __ref try_remove_memory(u64 start, u64 size) +{ + int rc, nid = NUMA_NO_NODE; BUG_ON(check_hotplug_memory_range(start, size)); @@ -2167,45 +2265,25 @@ 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) { + goto err; + } else if (rc == 0) { + /* + * 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)) { @@ -2218,8 +2296,9 @@ static int __ref try_remove_memory(u64 start, u64 size) if (nid != NUMA_NO_NODE) try_offline_node(nid); +err: mem_hotplug_done(); - return 0; + return (rc < 0 ? rc : 0); } /**