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 X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA4BC1B0D8 for ; Mon, 14 Dec 2020 10:13:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14142225A9 for ; Mon, 14 Dec 2020 10:13:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436604AbgLNKNN (ORCPT ); Mon, 14 Dec 2020 05:13:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:40691 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729802AbgLNKNM (ORCPT ); Mon, 14 Dec 2020 05:13:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607940706; 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; bh=707h+0X97qSXU9YyiMZs36jnPgGreBPrjTB3UVLUTiM=; b=MOK9pLNr94GVQxWnh1lpaCb7B9A9fs3HeTIXSGSmFnBTFJiwdXeBfHSCTqsCpHdWM3eNym 3BSQJY3eVkwgaGzA0c4hasy5Ew43QnICyeJ/fcmq4asUto63btvMV3fG2mBd8Bhn3LkuLw cf1WqSsgDT1SCpMV8dqUI4AdJy+Q+Hg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-EoskWq0BPNu8QwkNCKR_BA-1; Mon, 14 Dec 2020 05:11:42 -0500 X-MC-Unique: EoskWq0BPNu8QwkNCKR_BA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33E61190B2BF; Mon, 14 Dec 2020 10:11:40 +0000 (UTC) Received: from [10.36.114.184] (ovpn-114-184.ams2.redhat.com [10.36.114.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FA6B709AD; Mon, 14 Dec 2020 10:11:36 +0000 (UTC) Subject: Re: [PATCH v2 1/2] mm: memblock: enforce overlap of memory.memblock and memory.reserved To: Mike Rapoport , Andrew Morton Cc: Andrea Arcangeli , Baoquan He , Mel Gorman , Michal Hocko , Mike Rapoport , Qian Cai , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org, Dan Williams References: <20201209214304.6812-1-rppt@kernel.org> <20201209214304.6812-2-rppt@kernel.org> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <522640a5-32ab-2247-4c2a-f248c2528f97@redhat.com> Date: Mon, 14 Dec 2020 11:11:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201209214304.6812-2-rppt@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09.12.20 22:43, Mike Rapoport wrote: > From: Mike Rapoport > > memblock does not require that the reserved memory ranges will be a subset > of memblock.memory. > > As the result there maybe reserved pages that are not in the range of any > zone or node because zone and node boundaries are detected based on > memblock.memory and pages that only present in memblock.reserved are not > taken into account during zone/node size detection. > > Make sure that all ranges in memblock.reserved are added to memblock.memory > before calculating node and zone boundaries. > > Fixes: 73a6e474cb37 ("mm: memmap_init: iterate over memblock regions rather that check each PFN") > Reported-by: Andrea Arcangeli > Signed-off-by: Mike Rapoport > --- > include/linux/memblock.h | 1 + > mm/memblock.c | 24 ++++++++++++++++++++++++ > mm/page_alloc.c | 7 +++++++ > 3 files changed, 32 insertions(+) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index ef131255cedc..e64dae2dd1ce 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -120,6 +120,7 @@ int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); > unsigned long memblock_free_all(void); > void reset_node_managed_pages(pg_data_t *pgdat); > void reset_all_zones_managed_pages(void); > +void memblock_enforce_memory_reserved_overlap(void); > > /* Low level functions */ > void __next_mem_range(u64 *idx, int nid, enum memblock_flags flags, > diff --git a/mm/memblock.c b/mm/memblock.c > index b68ee86788af..9277aca642b2 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -1857,6 +1857,30 @@ void __init_memblock memblock_trim_memory(phys_addr_t align) > } > } > > +/** > + * memblock_enforce_memory_reserved_overlap - make sure every range in > + * @memblock.reserved is covered by @memblock.memory > + * > + * The data in @memblock.memory is used to detect zone and node boundaries > + * during initialization of the memory map and the page allocator. Make > + * sure that every memory range present in @memblock.reserved is also added > + * to @memblock.memory even if the architecture specific memory > + * initialization failed to do so > + */ > +void __init memblock_enforce_memory_reserved_overlap(void) > +{ > + phys_addr_t start, end; > + int nid; > + u64 i; > + > + __for_each_mem_range(i, &memblock.reserved, &memblock.memory, > + NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end, &nid) { > + pr_warn("memblock: reserved range [%pa-%pa] is not in memory\n", > + &start, &end); > + memblock_add_node(start, (end - start), nid); > + } > +} > + > void __init_memblock memblock_set_current_limit(phys_addr_t limit) > { > memblock.current_limit = limit; > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index eaa227a479e4..dbc57dbbacd8 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -7436,6 +7436,13 @@ void __init free_area_init(unsigned long *max_zone_pfn) > memset(arch_zone_highest_possible_pfn, 0, > sizeof(arch_zone_highest_possible_pfn)); > > + /* > + * Some architectures (e.g. x86) have reserved pages outside of > + * memblock.memory. Make sure these pages are taken into account > + * when detecting zone and node boundaries > + */ > + memblock_enforce_memory_reserved_overlap(); > + > start_pfn = find_min_pfn_with_active_regions(); > descending = arch_has_descending_max_zone_pfns(); > > CCing Dan. This implies that any memory that is E820_TYPE_SOFT_RESERVED that was reserved via memblock_reserve() will be added via memblock_add_node() as well, resulting in all such memory getting a memmap allocated right when booting up, right? IIRC, there are use cases where that is absolutely not desired. Am I missing something? (@Dan?) -- Thanks, David / dhildenb