From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f0.google.com (mail-pj2-f0.google.com [74.125.227.128]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C071A37F8B1 for ; Tue, 30 Jun 2026 07:48:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.128 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782805713; cv=none; b=k5RuwHbB7yjU/rHSRi/GBZ/RKtHlsrYA9iL9Zv33DCevr6T7+grKUI4m7Y3ADtwPdwD9DlLgirdEsxM4x6pebyPohRPqwCZfPnMLlq2VCXTDtPAPXygEZqLA2+1q3RIhVTQ+6+N5zdREHGwVaFh+6GtOgBVtAd6TNlM1HwtZZNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782805713; c=relaxed/simple; bh=5VDdvOioCyiv7v0NuhryTu7UmcEbfixHAtdpdJcVQrM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CKdHBcf258i3UgYSeilGrXu2+ihDqxfEpeo5q6AlLGLCDJ+MXrWkXC3HeevOW3trTbiaG1sUHqDwK4znZiXZ052GSQhOtRNJmy8+AOvAfi+eKZOxMj+Ouj9dMtIfMFe0E6FStSjDnaX2vVeLo0mUyopi4OBNfvXk+8VVViylR4Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=F+mc4Xxh; arc=none smtp.client-ip=74.125.227.128 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F+mc4Xxh" Received: by mail-pj2-f0.google.com with SMTP id d9443c01a7336-2c99784b434so2273065ad.0 for ; Tue, 30 Jun 2026 00:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782805710; x=1783410510; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kOeOq8JJcDQksJBuje0bYH/ntMqvxfxyxa0O7Jz9Ya0=; b=F+mc4XxhY9MBW8hSqo0P5WXVyHNFRSQXd19TVvX6sYL6HUcIRkRWlx3Mo36DKyEfU0 ieUqbmPbhnKbWFK80aTMh8awQGYSVd23BNxPZbbo8mCoJBtlewRoaqNnMDp0FAa5W/rB rcxH5K4E+KVe3xtUjOSbOlSBtLn82rnBltdPrXBaZchgDAiQOug97Nbt1FbCkUH8jqgC Ldn9rA/5l45caDAdBu6tr3b82HsTKQoMRjlwB5IloK6R/XDh2EW+xi9B13Tn04HHDOYL 8iASwz5WtqEUVvKzOSkmQQO6GYJLYwV7F90C9B7pK8YJFDY7ZG27SAZm3HoG+daWApcr aoSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782805710; x=1783410510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kOeOq8JJcDQksJBuje0bYH/ntMqvxfxyxa0O7Jz9Ya0=; b=jArz6le/Y4ySngrh9fOr5k7JQhyRi0GM4048YTH+b7XqsMTWHObCm+3OY0T3sMXLZ2 abEc7D1tMMT+oVUQYjBAbK9DzGjvcfi2UB2VkjBPmgOcLTF2N44OGt/LUhVWxB3hZmtN Zno6O6Fsz05JCW4yiOk2U9f449xMEZB8qEtcL3Fipfczu2TU53L37zZ2gl0LBjcsEQV/ C4fEI83UZ8UEnZ8APLnd7EWW1Fss/56D/w0H3uMlJXJiTrOudBWGuEptoo9nbuhAAtd0 sUNHIJu10G9aW3d4rR09Wa19iILMtdi61BPjc10eVFl+vNgMIEYFY1R6vfd9UFtbDgN6 nrMQ== X-Forwarded-Encrypted: i=1; AHgh+RpJyZtLWVEepmWItFXdtSHFiKSVGFueBzQXuXbAIGOUc3RyXA2JB1ReFT3RKUkaZ8dmFze2N48/RS1KHeY=@vger.kernel.org X-Gm-Message-State: AOJu0YyCBAANUiFxx6RsYaNVKlipdZeNqVwzSHb52oW663q5PM7M3j+D 6UWxdJsUXafRt9gfnNeIGmMNDWdSLWlMO2/QUaMZ0Y730k+WyTWpCuBF X-Gm-Gg: AfdE7cmFbdKbl8tys+G81W455cm+9TZDPDtZ3HIj2bzBd+HF+AenJSu39VQAAbxf8+4 2Fr+NBFF2a4cy78Ok0Xc85t6YPAZo+2D4eIwa7ZtBWiG58zrzVDb4X6srh4XopHvymuuMzSCFFb OgjqPeHb9D4EBtUOke/9LngRVQHRjtoP6XCQhIvYFOlk7N4VToyMYX5w1XftYpKtXULjWiQ42xD Eo4CEfw/Nk4Th8dCd2cwHv/iYoK39DrLB0kZ1ggrHZgTYU+ztR74Mgz/L0D8ifkJeB+I5fi4RYG FuIKrkm5z81Qdzey37oQnuveKv7tS279vCE6I3bSdv0XwxWikukSM2tv4vglFYkzU6lf88fKPJr FVIzVizKLOXrD0C8uKbxgLW4Q+LSBpFsJAK3pdAss0ugPOf2lS68iAsdiUjD+FwDuG0PgvJSzMp mmu1wif7NPyQWUc1SmquvD49D/Wg== X-Received: by 2002:a17:903:1a26:b0:2c8:e13a:f23a with SMTP id d9443c01a7336-2ca2e714d17mr18921635ad.28.1782805710141; Tue, 30 Jun 2026 00:48:30 -0700 (PDT) Received: from intel.company.local ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ca382a2d3dsm7821045ad.55.2026.06.30.00.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 00:48:29 -0700 (PDT) From: Wandun Chen To: chenhuacai@kernel.org, kernel@xen0n.name, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh@kernel.org, saravanak@kernel.org, bhe@redhat.com, rppt@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, kexec@lists.infradead.org, iommu@lists.linux.dev, zhaomeijing@lixiang.com Cc: catalin.marinas@arm.com, will@kernel.org, alex@ghiti.fr, akpm@linux-foundation.org, pasha.tatashin@soleen.com, pratyush@kernel.org, ruirui.yang@linux.dev, m.szyprowski@samsung.com, robin.murphy@arm.com Subject: [PATCH v4 06/10] of: reserved_mem: save /memreserve/ entries into the reserved_mem array Date: Tue, 30 Jun 2026 15:47:10 +0800 Message-ID: <20260630074715.4126796-7-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260630074715.4126796-1-chenwandun1@gmail.com> References: <20260630074715.4126796-1-chenwandun1@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wandun Chen /memreserve/ is used by firmware or bootloaders, such regions hold no useful data for crash analysis, they should be excluded from the kdump vmcore, so save /memreserve/ entries into the reserved_mem array for later exclusion. If a /memreserve/ entry overlaps any dumpable reserved region, mark the whole memreserve entry dumpable as well. This may keep slightly more memory in vmcore than strictly necessary, but avoids splitting entries and never drops data that may be useful for crash analysis. Signed-off-by: Wandun Chen Tested-by: Meijing Zhao --- drivers/of/fdt.c | 4 +++ drivers/of/of_private.h | 2 ++ drivers/of/of_reserved_mem.c | 52 ++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index b97775f6c9d4..3e478d29e247 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -497,6 +497,7 @@ void __init early_init_fdt_scan_reserved_mem(void) int n; int res; u64 base, size; + int nr_memreserve = 0; if (!initial_boot_params) return; @@ -514,7 +515,9 @@ void __init early_init_fdt_scan_reserved_mem(void) if (!size) break; memblock_reserve(base, size); + nr_memreserve++; } + fdt_reserved_mem_account_memreserve(nr_memreserve); } /** @@ -1286,6 +1289,7 @@ void __init unflatten_device_tree(void) if (!alloc_reserved_mem_array()) { /* Save the statically-placed regions in the reserved_mem array */ fdt_scan_reserved_mem_late(); + fdt_reserved_mem_save_memreserve_entries(); } /* Populate an empty root node when bootloader doesn't provide one */ diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h index 81c8ec9378b9..a67929c0a6ec 100644 --- a/drivers/of/of_private.h +++ b/drivers/of/of_private.h @@ -188,6 +188,8 @@ static inline struct device_node *__of_get_dma_parent(const struct device_node * int fdt_scan_reserved_mem(void); void __init fdt_scan_reserved_mem_late(void); int __init alloc_reserved_mem_array(void); +void __init fdt_reserved_mem_account_memreserve(int n); +void __init fdt_reserved_mem_save_memreserve_entries(void); bool of_fdt_device_is_available(const void *blob, unsigned long node); diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index f6c02b37deb7..9db0502989c3 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -251,6 +251,43 @@ static void __init __rmem_check_for_overlap(void) } } +static void __init fdt_reserved_mem_add_memreserve(phys_addr_t base, + phys_addr_t size) +{ + struct reserved_mem *rmem; + bool dumpable = false; + int i; + + if (reserved_mem_count == total_reserved_mem_cnt) { + pr_err("not enough space for memreserve regions.\n"); + return; + } + + for (i = 0; i < reserved_mem_count; i++) { + rmem = &reserved_mem[i]; + + if (!rmem->dumpable) + continue; + + if (base < rmem->base + rmem->size && rmem->base < base + size) { + dumpable = true; + break; + } + } + + rmem = &reserved_mem[reserved_mem_count]; + rmem->base = base; + rmem->size = size; + rmem->dumpable = dumpable; + + reserved_mem_count++; +} + +void __init fdt_reserved_mem_account_memreserve(int n) +{ + total_reserved_mem_cnt += n; +} + /** * fdt_scan_reserved_mem_late() - Scan FDT and initialize remaining reserved * memory regions. @@ -305,6 +342,21 @@ void __init fdt_scan_reserved_mem_late(void) __rmem_check_for_overlap(); } +void __init fdt_reserved_mem_save_memreserve_entries(void) +{ + const void *fdt = initial_boot_params; + u64 base, size; + int n; + + for (n = 0; ; n++) { + if (fdt_get_mem_rsv(fdt, n, &base, &size)) + break; + if (!size) + break; + fdt_reserved_mem_add_memreserve(base, size); + } +} + static int __init __reserved_mem_alloc_size(unsigned long node, const char *uname); /* -- 2.43.0