From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baoquan He Date: Tue, 28 Jul 2020 11:02:54 +0000 Subject: Re: [PATCH 14/15] x86/numa: remove redundant iteration over memblock.reserved Message-Id: <20200728110254.GA14854@MiWiFi-R3L-srv> List-Id: References: <20200728051153.1590-1-rppt@kernel.org> <20200728051153.1590-15-rppt@kernel.org> In-Reply-To: <20200728051153.1590-15-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Mike Rapoport Cc: linux-sh@vger.kernel.org, Peter Zijlstra , Benjamin Herrenschmidt , Dave Hansen , linux-mips@vger.kernel.org, Max Filippov , Paul Mackerras , sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org, Will Deacon , Stafford Horne , Marek Szyprowski , linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org, Yoshinori Sato , Michael Ellerman , x86@kernel.org, Russell King , Mike Rapoport , clang-built-linux@googlegroups.com, Ingo Molnar , Catalin Marinas , uclinux-h8-devel@lists.sourceforge.jp, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, Borislav Petkov , Andy Lutomirski , Paul Walmsley , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Palmer Dabbelt , Andrew Morton , Christoph Hellwig On 07/28/20 at 08:11am, Mike Rapoport wrote: > From: Mike Rapoport > > numa_clear_kernel_node_hotplug() function first traverses numa_meminfo > regions to set node ID in memblock.reserved and than traverses > memblock.reserved to update reserved_nodemask to include node IDs that were > set in the first loop. > > Remove redundant traversal over memblock.reserved and update > reserved_nodemask while iterating over numa_meminfo. > > Signed-off-by: Mike Rapoport > --- > arch/x86/mm/numa.c | 26 ++++++++++---------------- > 1 file changed, 10 insertions(+), 16 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 8ee952038c80..4078abd33938 100644 > --- a/arch/x86/mm/numa.c > +++ b/arch/x86/mm/numa.c > @@ -498,31 +498,25 @@ static void __init numa_clear_kernel_node_hotplug(void) > * and use those ranges to set the nid in memblock.reserved. > * This will split up the memblock regions along node > * boundaries and will set the node IDs as well. > + * > + * The nid will also be set in reserved_nodemask which is later > + * used to clear MEMBLOCK_HOTPLUG flag. > + * > + * [ Note, when booting with mem=nn[kMG] or in a kdump kernel, > + * numa_meminfo might not include all memblock.reserved > + * memory ranges, because quirks such as trim_snb_memory() > + * reserve specific pages for Sandy Bridge graphics. > + * These ranges will remain with nid = MAX_NUMNODES. ] > */ > for (i = 0; i < numa_meminfo.nr_blks; i++) { > struct numa_memblk *mb = numa_meminfo.blk + i; > int ret; > > ret = memblock_set_node(mb->start, mb->end - mb->start, &memblock.reserved, mb->nid); > + node_set(mb->nid, reserved_nodemask); Really? This will set all node id into reserved_nodemask. But in the current code, it's setting nid into memblock reserved region which interleaves with numa_memoinfo, then get those nid and set it in reserved_nodemask. This is so different, with my understanding. Please correct me if I am wrong. Thanks Baoquan > WARN_ON_ONCE(ret); > } > > - /* > - * Now go over all reserved memblock regions, to construct a > - * node mask of all kernel reserved memory areas. > - * > - * [ Note, when booting with mem=nn[kMG] or in a kdump kernel, > - * numa_meminfo might not include all memblock.reserved > - * memory ranges, because quirks such as trim_snb_memory() > - * reserve specific pages for Sandy Bridge graphics. ] > - */ > - for_each_memblock(reserved, mb_region) { > - int nid = memblock_get_region_node(mb_region); > - > - if (nid != MAX_NUMNODES) > - node_set(nid, reserved_nodemask); > - } > - > /* > * Finally, clear the MEMBLOCK_HOTPLUG flag for all memory > * belonging to the reserved node mask. > -- > 2.26.2 > >