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 30BBAC369D5 for ; Mon, 28 Apr 2025 21:19:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8EBE66B0025; Mon, 28 Apr 2025 17:19:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8727B6B002A; Mon, 28 Apr 2025 17:19:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69BD46B0028; Mon, 28 Apr 2025 17:19:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4517E6B0025 for ; Mon, 28 Apr 2025 17:19:39 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EB062C163A for ; Mon, 28 Apr 2025 21:19:39 +0000 (UTC) X-FDA: 83384719278.02.B086A9A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 7960E100008 for ; Mon, 28 Apr 2025 21:19:37 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HE98fF3p; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745875177; a=rsa-sha256; cv=none; b=6sA+JKPVcuori/04PHjJbXRqXyNMaoAG+udYYCny5yRPX+yYdBGQi5vBwPfOoaJ0JjNAFU t68X6ba/FTR+oPNlPe+PlUMizRalAHDi+gAv0MueKiHMhOG2taDagQEcYPcgifgCI4dlGq jAL5WjL9vXlIeKtuO83BuqPjFCDpg14= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HE98fF3p; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745875177; 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=holDY0Gs1L49s/vEerhi6Olgi48zndWL011WQGLEs9g=; b=Ssw6Y6lyEBtFrqwnOspa6UKEN7io6JIk+KruN3aLwZo/2u0lF5WTsX4Vr9bGzn+XPPDaOl e1VEBIIp5l1VGVZYNmgyq2MN/J88xsY4BhP9iQuCvpXO/Ha25tBt00NQrpjKZvK2Z0LkEL rCor1UEF+Kjfzf5hsQtxBMGMy40lkKs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745875176; h=from:from: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:autocrypt:autocrypt; bh=holDY0Gs1L49s/vEerhi6Olgi48zndWL011WQGLEs9g=; b=HE98fF3p9W9E6fV3VgC8opn3ivxO9OtNqOmIrbBZOi7DrMW6Vj2XVzdFNOPmTF1PNaxLmn 9EktyP5ea7pkhctSBOAOfuiyWXFCe4yrOssLCm1JKW4ICi6tqRT5M1+ckDPrXYtsW6CTBB oLEnaX/tEjZp6KmfBnDzIOOWz8m5MZI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-353-5InNFhQIN1yUYARAvC-pHQ-1; Mon, 28 Apr 2025 17:19:35 -0400 X-MC-Unique: 5InNFhQIN1yUYARAvC-pHQ-1 X-Mimecast-MFC-AGG-ID: 5InNFhQIN1yUYARAvC-pHQ_1745875174 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3912fe32b08so2181559f8f.3 for ; Mon, 28 Apr 2025 14:19:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745875174; x=1746479974; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=holDY0Gs1L49s/vEerhi6Olgi48zndWL011WQGLEs9g=; b=QzCWY68OSjnQwenEQydDpr2aALozmMxvF3SnwDsXYV2ueKGxE/gJTBK0qfKL/3AZ// jTOCXZxyA2iyrqrOYUC439aE0wHhzlTUHh+BRbtFX4FluastL4mCtnZx/fGaICDeYGwi qvHGYLKHsBVs/F9llAmbZfQhplBME2XKnwtBNP+3/3dbirxyi+cRPPerG0TUDW8L8XZM SAruPd0jno40VXFJAaOjNHijWI1MS6fVkasgZmcl5xjqLLwiWqtGPqO7ZWkJvVJ0fQQx 1/2xH2im0iuw+i3bKlRTJQQ9rIw4/p7knFr8zr62yAqWhzlQhnO2FK4q5kW2/hJ/1H+H TFiQ== X-Forwarded-Encrypted: i=1; AJvYcCXRpXWQxiGrjvoKOs/m2MKvVBqdEfSjcBh/7/vNM0/PwWnEhn5lUyUmRomFp5BLsqQ2piQmdY57YA==@kvack.org X-Gm-Message-State: AOJu0YySaWkfMArQ4RyQp05yYb/Lg7h9u6T7EZ2F3bs+93X40xpIBQze xxhc166EW6izUIwHWT1R0lgBteqG4R5zj+IO+pKIveR8bqycSiWhEhs9e9lFe/F9KGnd4W9PIXA XB6zuUt0LR1rgz2JFoQ8WdnkdwOloZYGoJx+zfrxgxdi7RJ3z X-Gm-Gg: ASbGncsYDTU+VZSJ5H9SZz0OJ7NtBIhCjcjwLUV7en+K/7B3PyzPXf2vIhEYKw/fF8f ZlHzd8s4K0sTwNjvG67ebUxkrovwt1MfrFOFQYWL4DKf2aA3W55ufA8aASCKK/ZBbZ4CGcsM1JG MHte8KJoKx2tPC68dBMv0mzFPkGOVxsmAt8czqniTLV98GX1STFY4JkPVm6VnWzeXVGOc7dia59 hv9AQO8dOGCcmzVu4sqRR17nXM34VvgOyxdU3RPmE9LjLuKMCjP1jDuxABgXuusOqZuXMb2cJ6U aRoNIffjW+c9AsEyNxJmQuXrimsBE1xY/OlAbeXsYg== X-Received: by 2002:a05:6000:22c5:b0:3a0:8a1c:ef0 with SMTP id ffacd0b85a97d-3a08ad3be40mr188586f8f.24.1745875174371; Mon, 28 Apr 2025 14:19:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGX95i6nnVvl2x38H1rjq/DYXCJ9md3+GDJ/8L0xaeGk4KtoplJJwLhLdSRAgr0zZlncIWOiw== X-Received: by 2002:a05:6000:22c5:b0:3a0:8a1c:ef0 with SMTP id ffacd0b85a97d-3a08ad3be40mr188569f8f.24.1745875173919; Mon, 28 Apr 2025 14:19:33 -0700 (PDT) Received: from [192.168.3.141] (p4ff23ddd.dip0.t-ipconnect.de. [79.242.61.221]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2a2ac0sm168280885e9.15.2025.04.28.14.19.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 28 Apr 2025 14:19:33 -0700 (PDT) Message-ID: Date: Mon, 28 Apr 2025 23:19:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/2] driver/base: Optimize memory block registration to reduce boot time To: Donet Tom , Mike Rapoport , Oscar Salvador , Greg Kroah-Hartman , Andrew Morton , rafael@kernel.org, Danilo Krummrich Cc: Ritesh Harjani , Jonathan Cameron , Alison Schofield , Yury Norov , Dave Jiang , linux-mm@kvack.org, linux-kernel@vger.kernel.org References: From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NpqCGU4DnLnLXigj0BiSf7dnjRcWolIYVXH_sDJedS0_1745875174 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7960E100008 X-Stat-Signature: ooidmi4u5yj7ps19gz7mj1nucb1ggz5x X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1745875177-389346 X-HE-Meta: U2FsdGVkX1/drDBVCnNbS74p2yJARhWj+pN7BQ7ybfJLp5imx1t4GqUcDAsKph5/fhHV15wvCbYBqnQDtCtCNLfU+yGR++MeYmykTNAfbwYLdnyiI26fyqoeQwpeR94hBz1JCS2F2q5sOdq5nETRhaP97jRBwa1sir6VCo/jMdZ0W3A5S1Pf8fEeo5miZcxiff6jRjzeCYk0XNs+rBy2H7f2Bf+sv6QYXD5rcnVvmt2pdPucd+F8jAjXycVPkvY7/MQRHs/vQEFpiNX05BloeiQZ5M5sqSKYD5ucN31n+WC8nxNmzk/mavif+H+Jq4r3LuPLjEkgh7EbZYxuHeJNgcrWHW4cb5rzV8Tw5UhhznSVsKs7PrKR04u7paCbhVH0iatOUBB9VOs/aEWYXWNOI3WvnPlo6QySMboq1XNc1er9k46ZjdqaF55toOhZc8d4C/YAQwIuXttTPzQagqD9ykYsbbvBB8YKMWhEKAwgx4mjxSmQD+2GjWyGHS4DI15MUkuH+kRbfOxuElrv7qsFKJu+REnSWzlFpGkX68yjN8nWc7GkMDVc8hnsglwm5LGIzsD8dbGXzpDKOQtEMKlMXmU+LHz/iovWR+8Fc9JK/AKECPfGPcJw7Lh9YDj62bJNK5XBmRzMupHDHnnq8EFnfbdjhT1r7lEh+epvDX9HsyGbMHXTwmkdIjAmdEaSPJWj/yASq80LOIKXvzrQSMCkwBSfAraPf3yxDxTWMxpH7vxzFDCldC8t9edvtcRnaF2aiukFg/PA/IBg4BBea7DUAtgdMPTyIjVLGvqNE1FJolSMgorTeT/LA+b+gENDSu2dM5pW/X5G4OVVfNDa2jAXxA7+zadPFJRqKY1gKzPJYvATqZsDVIYxHLgDabdWE2HyXIKXp4R/Bjw84W7SDrKA6XmW/vJB4+bW5nt1+om6vJYjg7tTXzep2iyXIU5YsKuCz5ECWIF2IiMRuajvEYb A8u8Qfdd UqEAzhUm8CvhzMp18cqIsBmY6SQDvUJcINrNMsiiQP7v55audjavoF9vYzy9ReEbXBySDapLOutG6LoR+9QRZ96THdbo5H6DlLqZKXS53XXW3m3U+0cRw8DYnu6uskaNjKeDMEaV7Rx1DA8OUMfqvKcrqFQ== 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: On 28.04.25 19:03, Donet Tom wrote: > During node device initialization, `memory blocks` are registered under > each NUMA node. The `memory blocks` to be registered are identified using > the node’s start and end PFNs, which are obtained from the node's pg_data > > However, not all PFNs within this range necessarily belong to the same > node—some may belong to other nodes. Additionally, due to the > discontiguous nature of physical memory, certain sections within a > `memory block` may be absent.> > As a result, `memory blocks` that fall between a node’s start and end > PFNs may span across multiple nodes, and some sections within those blocks > may be missing. `Memory blocks` have a fixed size, which is architecture > dependent. > > Due to these considerations, the memory block registration is currently > performed as follows: > > for_each_online_node(nid): > start_pfn = pgdat->node_start_pfn; > end_pfn = pgdat->node_start_pfn + node_spanned_pages; > for_each_memory_block_between(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn)) > mem_blk = memory_block_id(pfn_to_section_nr(pfn)); > pfn_mb_start=section_nr_to_pfn(mem_blk->start_section_nr) > pfn_mb_end = pfn_start + memory_block_pfns - 1 > for (pfn = pfn_mb_start; pfn < pfn_mb_end; pfn++): > if (get_nid_for_pfn(pfn) != nid): > continue; > else > do_register_memory_block_under_node(nid, mem_blk, > MEMINIT_EARLY); > > Here, we derive the start and end PFNs from the node's pg_data, then > determine the memory blocks that may belong to the node. For each > `memory block` in this range, we inspect all PFNs it contains and check > their associated NUMA node ID. If a PFN within the block matches the > current node, the memory block is registered under that node. > > If CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, get_nid_for_pfn() performs > a binary search in the `memblock regions` to determine the NUMA node ID > for a given PFN. If it is not enabled, the node ID is retrieved directly > from the struct page. > > On large systems, this process can become time-consuming, especially since > we iterate over each `memory block` and all PFNs within it until a match is > found. When CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, the additional > overhead of the binary search increases the execution time significantly, > potentially leading to soft lockups during boot. > > In this patch, we iterate over `memblock region` to identify the > `memory blocks` that belong to the current NUMA node. `memblock regions` > are contiguous memory ranges, each associated with a single NUMA node, and > they do not span across multiple nodes. > > for_each_online_node(nid): > for_each_memory_region(r): // r => region > if (r->nid != nid): > continue; > else > for_each_memory_block_between(r->base, r->base + r->size - 1): > do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY); > > We iterate over all `memblock regions` and identify those that belong to > the current NUMA node. For each `memblock region` associated with the > current node, we calculate the start and end `memory blocks` based on the > region's start and end PFNs. We then register all `memory blocks` within > that range under the current node. Yes, makes sense. > > Test Results on My system with 32TB RAM > ======================================= > 1. Boot time with CONFIG_DEFERRED_STRUCT_PAGE_INIT enabled. > > Without this patch > ------------------ > Startup finished in 1min 16.528s (kernel) > > With this patch > --------------- > Startup finished in 17.236s (kernel) - 78% Improvement Wow! > > 2. Boot time with CONFIG_DEFERRED_STRUCT_PAGE_INIT disabled. > > Without this patch > ------------------ > Startup finished in 28.320s (kernel) > > With this patch > --------------- > Startup finished in 15.621s (kernel) - 46% Improvement > Also very nice! > Signed-off-by: Donet Tom > --- > > v1->v2 > > Reworked the implementation according to suggestions from > Mike Rapoport[1] > > [1] - https://lore.kernel.org/all/Z_j2Gv9n4DOj6LSs@kernel.org/ > > v1 - https://lore.kernel.org/all/50142a29010463f436dc5c4feb540e5de3bb09df.1744175097.git.donettom@linux.ibm.com/ > --- > drivers/base/memory.c | 4 ++-- > drivers/base/node.c | 39 +++++++++++++++++++++++++++++++++++++++ > include/linux/memory.h | 2 ++ > include/linux/node.h | 11 +++++------ > 4 files changed, 48 insertions(+), 8 deletions(-) > > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index 19469e7f88c2..7f1d266ae593 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -60,7 +60,7 @@ static inline unsigned long pfn_to_block_id(unsigned long pfn) > return memory_block_id(pfn_to_section_nr(pfn)); > } > > -static inline unsigned long phys_to_block_id(unsigned long phys) > +unsigned long phys_to_block_id(unsigned long phys) > { > return pfn_to_block_id(PFN_DOWN(phys)); > } > @@ -632,7 +632,7 @@ int __weak arch_get_memory_phys_device(unsigned long start_pfn) > * > * Called under device_hotplug_lock. > */ > -static struct memory_block *find_memory_block_by_id(unsigned long block_id) > +struct memory_block *find_memory_block_by_id(unsigned long block_id) > { > struct memory_block *mem; > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index cd13ef287011..4869333d366d 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > static const struct bus_type node_subsys = { > .name = "node", > @@ -850,6 +851,44 @@ void unregister_memory_block_under_nodes(struct memory_block *mem_blk) > kobject_name(&node_devices[mem_blk->nid]->dev.kobj)); > } > > +/* > + * register_memory_blocks_under_node_early : Register the memory > + * blocks under the current node. > + * @nid : Current node under registration > + * > + * This function iterates over all memblock regions and identifies the regions > + * that belong to the current node. For each region which belongs to current > + * node, it calculates the start and end memory blocks based on the region's > + * start and end PFNs. It then registers all memory blocks within that range > + * under the current node. > + * > + */ > +void register_memory_blocks_under_node_early(int nid) > +{ > + struct memblock_region *r; You almost achieved a reverse x-mas tree :) > + unsigned long start_block_id; > + unsigned long end_block_id; > + struct memory_block *mem; > + unsigned long block_id; > + > + for_each_mem_region(r) { > + if (r->nid == nid) { To reduce indentation if (r->nid != nid) continue; > + start_block_id = phys_to_block_id(r->base); > + end_block_id = phys_to_block_id(r->base + r->size - 1); Probably you could make them const in the for loop const unsigned long start_block_id = phys_to_block_id(r->base); const unsigned long end_block_id = phys_to_block_id(r->base + r->size - 1); Okay, so end is inclusive as well. > + > + for (block_id = start_block_id; block_id <= end_block_id; block_id++) { > + mem = find_memory_block_by_id(block_id); > + if (!mem) > + continue; > + > + do_register_memory_block_under_node(nid, mem, MEMINIT_EARLY); -- Cheers, David / dhildenb