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 6980BC4332F for ; Thu, 2 Nov 2023 01:18:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C668B80011; Wed, 1 Nov 2023 21:18:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C17F980009; Wed, 1 Nov 2023 21:18:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB78A80011; Wed, 1 Nov 2023 21:18:45 -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 9AAC780009 for ; Wed, 1 Nov 2023 21:18:45 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 66449C0DCA for ; Thu, 2 Nov 2023 01:18:45 +0000 (UTC) X-FDA: 81411254610.07.CB8F143 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by imf10.hostedemail.com (Postfix) with ESMTP id 2255EC0004 for ; Thu, 2 Nov 2023 01:18:41 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=GfgKRqBG; spf=pass (imf10.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.10 as permitted sender) smtp.mailfrom=ying.huang@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=1698887923; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2pit9sSHBSSHJKBpk5VTYHAeO/NUioroyeAAnNpa/t4=; b=sVtSavxMHhsPFzMBTcAMruwFVSLARhoWrrJgXhcQIqd1K60GqD8OibJs/hgyWslPZE27zu TWPB8nFkaNK1jqyNzLahv1NP8kxI5YvderRvyp4ATB4ttM8CWWr24423fysZL9hT7qk6Vn peCca88W8bgEdjOM9HEz+9AdqyjtSdI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698887923; a=rsa-sha256; cv=none; b=jw8Gzq9Koq/g4DioFIig4bJYsjrlaiZEURsHVAnADU3cl6zv3WDCxExJtVBeNFKjz5sP/d UVlUltnTex0MrhGYp1ruNWfjwu5lBdeS+cF8pbHcCWEKZfxa/wjPYTVUmb2T5JXO1g2UPs piVI/U0Yvu6HyFKJLyu1SH0+gCJzYh0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=GfgKRqBG; spf=pass (imf10.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.10 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698887922; x=1730423922; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=w5QvYhQUm/Yol4oko8AhL7voOb2RQaezwjaupPx38bg=; b=GfgKRqBGJqEalZVpV9t7yV5XT1rmcMl1vN+5P7jkw6+1Raqfe3YfYPMl hT/GHfeysg78wFsKCYuWPBpy+5M3yr79urxyDtESSugbq4sbU4MiTD/Qe Cq+lQ9NoYNYxYTioLBF6PbBDLwyyHNw0B2bOukHphxxwXcNRjlQSJLiYW uWIpmZtbMR/W//oALNict4qujs2Y481VZpvlnF7mY9YqJ35+7XhRIkA2A urJLmz1pXX23qwweOYZthJlkpOnvjh1uhjHw4PqdvjkuYogLgMgFB8PP1 PgOpYY0vwX1pyDB9SI50s2OLCIS9rjF+dY11ZcyrkFTK5xzoMQQrQ4+53 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="1531624" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="1531624" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 18:18:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="826949234" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="826949234" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 18:18:33 -0700 From: "Huang, Ying" To: Vishal Verma Cc: Andrew Morton , David Hildenbrand , Oscar Salvador , Dan Williams , Dave Jiang , , , , , Dave Hansen , "Aneesh Kumar K.V" , Michal Hocko , Jonathan Cameron , Jeff Moyer Subject: Re: [PATCH v8 2/3] mm/memory_hotplug: split memmap_on_memory requests across memblocks In-Reply-To: <20231101-vv-kmem_memmap-v8-2-5e4a83331388@intel.com> (Vishal Verma's message of "Wed, 1 Nov 2023 16:51:52 -0600") References: <20231101-vv-kmem_memmap-v8-0-5e4a83331388@intel.com> <20231101-vv-kmem_memmap-v8-2-5e4a83331388@intel.com> Date: Thu, 02 Nov 2023 09:16:32 +0800 Message-ID: <87edh93qfj.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Stat-Signature: tb3ij19zy5dtc5s63tmypqqg6xopggxq X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 2255EC0004 X-Rspam-User: X-HE-Tag: 1698887921-282141 X-HE-Meta: U2FsdGVkX186/Bl1ZSQeG6RsA35DfZ8/Dq/iVeksZwMrtesDjHLyiZazNzuihR+SWCwoMRLMDZSxlew1cyU8n+5oaHjT+r/bZC4qx/MR+H5TQ8XzDbyWl/PYOVILEOYn7BXInGuZYYlxLf0QcZaeqNaAhLiyo7gyi1xco8s3k7XZB+5NJgOR3/UocKSUITsRulP5njhqukll7gvHLS+aDAzGwLqkRMh2NoihWSdNvhCtQ5UuCBTpfSC6GGypEXg9LlMT7Vnvw8TD/1pbmVTkUw53v6ktV2hQeQAtSCX/PcYqk/5xna3haaHs4DFEFqNbmE4vIvt4YQobNtdxGPQeR9TgvgxFh4G3Jj+Nfi4mSjHPAh5P2ZQCgSbUgIMHKrWnbPew8rXmoRvwjJ78Q2F1iKGzM4cMzw+35US0T2ufG75tD2LGI2MjAp9bLqtajkWorzeO4K1HLVOXb290QR/kVJCx9rJ8kH4NUfpoA9jOY1O6AGrPAFCnaBZpyo7vZq3Y6Rwl0g4nSNFdCKF15T/8k1yGaR3/Sg+fiIJNm566a13xPjAGG7e/LPzYRbEu8i/NlwHu50O3vifWHPHbzc2lVNBA4R/PFiTVWeCbTtCEl7F/RA8FvslmQhHC2EgvUNHOz9ecAkvNQk6EDcF/ZJcGVLX/i7XHZyM2kHdw0C9mRbG8E49XQw+VAXWx4tl/cXSWJdaknXeF5VAAHnz4vw1u6uRCZvLWaZkdnBPcGIvLySJgc7Ho5ulNUSVCFF1RV+dAQnjJZj0T+0eYnCJnQg6GivglAiNl76QwegxgVHcEbKQzvGY5ddsRCi+R5Jlj0KgLneYTqEGK63MIBj7cOy9aAgUQUpN0w/xAViyBKxPbo06F6R03/3P77R14Xk1isd4H6ZqagR007cxthanDafdgwBTXPPiQ9JRr7CrALLagsQZ7J3RKSDsN+LxC9aQ7JvMwVzJYTbLi2U4jFEvFw5f ko4ZjRAR 3iDepqaR4+PmSmDlA8ijfT3UhCk3HEb5hFgvmrf1GqHRWHTEmzAsVqTENbpOjNMy0REu2gYg/J8gaSHF4QdGoBLT4dNJ3NDBqzABvZzxz6t0WkZdNzmUd/LyW0DRGV0m9QOinTz/VySzg95+cCv9pS5lHd9NeT9grCfgTZocqiy4YSpr1gLtBvjGanK9juP79qta1kQLyamue44TfRjckxJdR5Xdz8hz9RyMBX1QWNYutbUdvx2zSe+P8whzeu+NMSgcXnmQK4OVNMsgTcKs2Ra5OSttn5/imeTUlPYRyIs8B+vqOOA5P3m8HZP8M7kZQY+JeWKVyg63KmBUdqmLu+3rRVG+ANe4GsZNe4c48IrQF9ZeO074HZXJVlPM8sDzWU88pnYhey5o4DdCh7KgtgVn2GQy2+OBtnqMn89rv3C8Dh4M= 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: Vishal Verma writes: > 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 | 213 ++++++++++++++++++++++++++++++++++------------------ > 1 file changed, 138 insertions(+), 75 deletions(-) > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 6be7de9efa55..d242e49d7f7b 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1380,6 +1380,84 @@ 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))); > + WARN_ON_ONCE(!mem); > + if (!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) > + return -ENOMEM; Use "goto out" here too? > + > + /* 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); How about move arch_remove_memory() and kree() to error path and use different label? -- Best Regards, Huang, Ying > + 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 +1468,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 +1510,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 +1562,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 +2128,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 +2208,31 @@ 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 (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) > { > - 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 +2249,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 +2280,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); > } > > /**