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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB7EAC43217 for ; Wed, 6 Oct 2021 00:35:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 61D0861211 for ; Wed, 6 Oct 2021 00:35:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 61D0861211 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 871F06B006C; Tue, 5 Oct 2021 20:35:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82180900002; Tue, 5 Oct 2021 20:35:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7374B6B0073; Tue, 5 Oct 2021 20:35:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 606A26B006C for ; Tue, 5 Oct 2021 20:35:34 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2682E2C5A0 for ; Wed, 6 Oct 2021 00:35:34 +0000 (UTC) X-FDA: 78664144188.11.BBAD96F Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf20.hostedemail.com (Postfix) with ESMTP id A2B08D001B9D for ; Wed, 6 Oct 2021 00:35:33 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id A47B46120C; Wed, 6 Oct 2021 00:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633480532; bh=X+zuIEzgi4BJRPliLjv9iRYOHwZRPc7zUl+fNXFGj9o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JHEmt663Hm1u48LCqrFlkrtGcV9ux30e+mppC54cYcoazB1AyaoZk3aLY7CaL1qJ8 EuyS9FHdM0DRu1QnziIUuHkxiPI8kmwHlYj6d4UUamsulACykZLlSkA4giBe7+kRhV z/hyErDGbTP9PgMmjmTUOjJ6f76gaSQDj6/WBbdB5dutm8Vp0moPIgcjOUJ8uDBv9r 9BVujwaUsW4eZcL/ukhEkPNjd0R8BebmXvX1ED3CoHUGVLid4LEveLLoY2+/HwZ/wR MWlzTf6vmlDmJo12AIv8AS9YGYnxlU3dlcY6MMPsV9D+w4zKmHQ/IQAeab0PwF0JxA l96fZm3yoDZiQ== Date: Tue, 5 Oct 2021 17:35:28 -0700 From: Mike Rapoport To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, Andrew Morton , Michal Hocko , Oscar Salvador , Jianyong Wu , "Aneesh Kumar K . V" , Vineet Gupta , Geert Uytterhoeven , Huacai Chen , Jiaxun Yang , Thomas Bogendoerfer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Eric Biederman , Arnd Bergmann , linux-snps-arc@lists.infradead.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-s390@vger.kernel.org, linux-mm@kvack.org, kexec@lists.infradead.org Subject: Re: [PATCH v2 4/5] memblock: add MEMBLOCK_DRIVER_MANAGED to mimic IORESOURCE_SYSRAM_DRIVER_MANAGED Message-ID: References: <20211004093605.5830-1-david@redhat.com> <20211004093605.5830-5-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211004093605.5830-5-david@redhat.com> X-Rspamd-Queue-Id: A2B08D001B9D X-Stat-Signature: 1ic661h1ucjpmb3xzc7eccwsu9war1fp Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JHEmt663; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org X-Rspamd-Server: rspam06 X-HE-Tag: 1633480533-733793 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: On Mon, Oct 04, 2021 at 11:36:04AM +0200, David Hildenbrand wrote: > Let's add a flag that corresponds to IORESOURCE_SYSRAM_DRIVER_MANAGED, > indicating that we're dealing with a memory region that is never > indicated in the firmware-provided memory map, but always detected and > added by a driver. > > Similar to MEMBLOCK_HOTPLUG, most infrastructure has to treat such memory > regions like ordinary MEMBLOCK_NONE memory regions -- for example, when > selecting memory regions to add to the vmcore for dumping in the > crashkernel via for_each_mem_range(). > > However, especially kexec_file is not supposed to select such memblocks via > for_each_free_mem_range() / for_each_free_mem_range_reverse() to place > kexec images, similar to how we handle IORESOURCE_SYSRAM_DRIVER_MANAGED > without CONFIG_ARCH_KEEP_MEMBLOCK. > > We'll make sure that memory hotplug code sets the flag where applicable > (IORESOURCE_SYSRAM_DRIVER_MANAGED) next. This prepares architectures > that need CONFIG_ARCH_KEEP_MEMBLOCK, such as arm64, for virtio-mem > support. > > Note that kexec *must not* indicate this memory to the second kernel > and *must not* place kexec-images on this memory. Let's add a comment to > kexec_walk_memblock(), documenting how we handle MEMBLOCK_DRIVER_MANAGED > now just like using IORESOURCE_SYSRAM_DRIVER_MANAGED in > locate_mem_hole_callback() for kexec_walk_resources(). > > Also note that MEMBLOCK_HOTPLUG cannot be reused due to different > semantics: > MEMBLOCK_HOTPLUG: memory is indicated as "System RAM" in the > firmware-provided memory map and added to the system early during > boot; kexec *has to* indicate this memory to the second kernel and > can place kexec-images on this memory. After memory hotunplug, > kexec has to be re-armed. We mostly ignore this flag when > "movable_node" is not set on the kernel command line, because > then we're told to not care about hotunpluggability of such > memory regions. > > MEMBLOCK_DRIVER_MANAGED: memory is not indicated as "System RAM" in > the firmware-provided memory map; this memory is always detected > and added to the system by a driver; memory might not actually be > physically hotunpluggable. kexec *must not* indicate this memory to > the second kernel and *must not* place kexec-images on this memory. > > Signed-off-by: David Hildenbrand Reviewed-by: Mike Rapoport > --- > include/linux/memblock.h | 16 ++++++++++++++-- > kernel/kexec_file.c | 5 +++++ > mm/memblock.c | 4 ++++ > 3 files changed, 23 insertions(+), 2 deletions(-) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index 2bc726e43a1b..b3b29ccf91f3 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -37,12 +37,17 @@ extern unsigned long long max_possible_pfn; > * @MEMBLOCK_NOMAP: don't add to kernel direct mapping and treat as > * reserved in the memory map; refer to memblock_mark_nomap() description > * for further details > + * @MEMBLOCK_DRIVER_MANAGED: memory region that is always detected and added > + * via a driver, and never indicated in the firmware-provided memory map as > + * system RAM. This corresponds to IORESOURCE_SYSRAM_DRIVER_MANAGED in the > + * kernel resource tree. > */ > enum memblock_flags { > MEMBLOCK_NONE = 0x0, /* No special request */ > MEMBLOCK_HOTPLUG = 0x1, /* hotpluggable region */ > MEMBLOCK_MIRROR = 0x2, /* mirrored region */ > MEMBLOCK_NOMAP = 0x4, /* don't add to kernel direct mapping */ > + MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ > }; > > /** > @@ -213,7 +218,8 @@ static inline void __next_physmem_range(u64 *idx, struct memblock_type *type, > */ > #define for_each_mem_range(i, p_start, p_end) \ > __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, \ > - MEMBLOCK_HOTPLUG, p_start, p_end, NULL) > + MEMBLOCK_HOTPLUG | MEMBLOCK_DRIVER_MANAGED, \ > + p_start, p_end, NULL) > > /** > * for_each_mem_range_rev - reverse iterate through memblock areas from > @@ -224,7 +230,8 @@ static inline void __next_physmem_range(u64 *idx, struct memblock_type *type, > */ > #define for_each_mem_range_rev(i, p_start, p_end) \ > __for_each_mem_range_rev(i, &memblock.memory, NULL, NUMA_NO_NODE, \ > - MEMBLOCK_HOTPLUG, p_start, p_end, NULL) > + MEMBLOCK_HOTPLUG | MEMBLOCK_DRIVER_MANAGED,\ > + p_start, p_end, NULL) > > /** > * for_each_reserved_mem_range - iterate over all reserved memblock areas > @@ -254,6 +261,11 @@ static inline bool memblock_is_nomap(struct memblock_region *m) > return m->flags & MEMBLOCK_NOMAP; > } > > +static inline bool memblock_is_driver_managed(struct memblock_region *m) > +{ > + return m->flags & MEMBLOCK_DRIVER_MANAGED; > +} > + > int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn, > unsigned long *end_pfn); > void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > index 33400ff051a8..8347fc158d2b 100644 > --- a/kernel/kexec_file.c > +++ b/kernel/kexec_file.c > @@ -556,6 +556,11 @@ static int kexec_walk_memblock(struct kexec_buf *kbuf, > if (kbuf->image->type == KEXEC_TYPE_CRASH) > return func(&crashk_res, kbuf); > > + /* > + * Using MEMBLOCK_NONE will properly skip MEMBLOCK_DRIVER_MANAGED. See > + * IORESOURCE_SYSRAM_DRIVER_MANAGED handling in > + * locate_mem_hole_callback(). > + */ > if (kbuf->top_down) { > for_each_free_mem_range_reverse(i, NUMA_NO_NODE, MEMBLOCK_NONE, > &mstart, &mend, NULL) { > diff --git a/mm/memblock.c b/mm/memblock.c > index 47a56b223141..540a35317fb0 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -979,6 +979,10 @@ static bool should_skip_region(struct memblock_type *type, > if (!(flags & MEMBLOCK_NOMAP) && memblock_is_nomap(m)) > return true; > > + /* skip driver-managed memory unless we were asked for it explicitly */ > + if (!(flags & MEMBLOCK_DRIVER_MANAGED) && memblock_is_driver_managed(m)) > + return true; > + > return false; > } > > -- > 2.31.1 > -- Sincerely yours, Mike.