From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f6.google.com (mail-pj2-f6.google.com [74.125.227.134]) (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 955AD394499 for ; Fri, 16 Oct 2026 03:09:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.134 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792120166; cv=none; b=trYr1YRO9cesOm9exA3lMEUkXQcjFhhTJy1UfAFTKzfPeEWdlP6jxkBsgh+6HKJRyX0rXwxBdXW21xESU8sm5u4J8KtInac6otgWHhp6Ay0+/7bAVWX/LXUADuA3rq99dVuU31dqEiUnXuKD+6ejgqVZGpZadADwLIXeGmG5+iY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792120166; c=relaxed/simple; bh=PT3LWhSw2vdV442dcbthELxWe2cTjR/Mhzld4jrWTDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gf0ckAt2Afr0ttwcpzkD5zspep3L7sD3jstbogDCLq/2Sy1Dxc46t1PTkLSZ96bjzDaO/3jnHaULHYvV+knQ8LYsB3hLh9yK5nyMJDheylhJAmsvYGRWpMaN6JMmvh97aPQjIKoS9iO4CZKhRyVJBDQD5khNjeEBjfNHK4dihOM= 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=hf8Cr3AV; arc=none smtp.client-ip=74.125.227.134 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="hf8Cr3AV" Received: by mail-pj2-f6.google.com with SMTP id 98e67ed59e1d1-3acc610014eso196435a91.0 for ; Thu, 15 Oct 2026 20:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792120165; x=1792724965; 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:content-type; bh=pI8cU+3Va0VJY6BQ+e7sBVT9LPRu4J+OFo4gOdjLJ30=; b=hf8Cr3AVimwbT3PJ6eSUar8qGV+yZiQ4IYI2rNlPant/C3w4oj2FgGRBHzxSldfhQ5 GWrm3A1BtAmKS/FGpCPmHwWLXYQYKaX+qXajRUUmvXeSGgjZnR36VOeDxU48Kb076YLd UM3+rRXrpKLVgTlibUcX3M8baTfpFHeV1v289oDIjir/Fo40XoHmfBy1g/wpZfUyPpAm 4cPiEQxbiWv7hGLEbJBvxzaU9MQnGsVO0DpBcAmZ6Yzrv0OoxDZUcx1hWgZjjQOMrJP9 OeQ1I+NprFOijpwwSRVo2swALlqp+wf41OThNruUx0h7lWIiHERtzzn24Yj/wvLoLzTM i/eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792120165; x=1792724965; 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:content-type; bh=pI8cU+3Va0VJY6BQ+e7sBVT9LPRu4J+OFo4gOdjLJ30=; b=Hu52b2AqeFJbOvr6apeuo3aYTDHpskBmOP2LqtALA3/zwJ7wXV9owhV8kvDRHLRSys JPa7FVJgoXjJxr4+zHMCTzzna/KdmzsWlO06AWSZfbqiESVyRIDHgE1QTI9mnqVbOcmZ ZRphq5BntNVjXcsSEhvhd/6J3WR1f42/36CZsTcaJVk9QY53ckNw/ACy8j90EFom+UR+ 9tgdV0wGM42Pm7m6sTQwd3xdQWV2q+xR2s8UXbNATNadZUymyUk6U/CuzfsYkwbDTHNs l94U5UnAujp18xjHTP9DOmba3yhkz051chuBdcjlXD/rPvndIYWLf5HO3rtWdKO5/4Tg A2Aw== X-Forwarded-Encrypted: i=1; AKwUvBz7reuKVImFQ135IqfUzqcTKufm2mUuL2I8UbOONdMxc68TnOVT0lcmTRXY1Jgww4WGPrMV9t/qSQae3+k=@vger.kernel.org X-Gm-Message-State: AFq9FYJ53EKOkJhD8u0KVM0DWL5460LrPLLzJpb8q5I0kLTFRKQQgxnm nZe5H5Btejjy0bXLXdsUr16UmD3uexeZ0bCyN2DUwidMJy6/4GiApmzn X-Gm-Gg: AYBFou0yeDsNJYv02s3Ogg1d5CShM8WMnTOgv7Vm+yNyTMmdxCmCxeFw+xNN0bjAEfl IYcsyDxY4+mQlwA4ExFBDoiAT2lFPQj+6Pi+CZrcDEKvBlz7l2RL0o5Q2B03ORMNPnUAx15oUij g8SyLa/CLizhF2p5PK+gmKWrP/xywC0Os1blW3T3YAHlIYUgsJaNYUXa4B6/aujQ7jFR1EID29C m148EYq5JtXqgHGNq7bK6I323lDQDfwCwGM9Bot0/nB/1NRW1BjMeBWih1uH9g/V31AHeIJ7euo 3KlA9dp9XpXzxX2SX7y0LKrhCd/TNmg9UUpZq1X20VG9t3mdlvq5Ft1Mex0O2IUzEfyYUxkaLil BJx1UT6s9ndq6gdwT7KTRpOq8ELGSu2LKiyNLBG+P+76XlMP6cLKFem7B8L5YghL9cohM1+4F+Z 1hb2pa8gPiynKHeGrxen9SfW2hwbdeuxZl+F0aGfahaYue2YrORnbTbaOfIcAALMrJSJ8SOlL+2 LfJmx6OkOU= X-Received: by 2002:a17:90b:5823:b0:3a7:9413:cfae with SMTP id 98e67ed59e1d1-3ab3ab1d561mr18240688a91.42.1792120164811; Thu, 15 Oct 2026 20:09:24 -0700 (PDT) Received: from intel.company.local ([122.11.210.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3acd3cc73c7sm370085a91.4.2026.10.15.20.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2026 20:09:24 -0700 (PDT) From: Wandun Chen To: robh@kernel.org, baoquan.he@linux.dev, rppt@kernel.org, m.szyprowski@samsung.com Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, chenhuacai@kernel.org, kernel@xen0n.name, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, tglx@kernel.org, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, saravanak@kernel.org, akpm@linux-foundation.org, pasha.tatashin@soleen.com, pratyush@kernel.org, ruirui.yang@linux.dev, robin.murphy@arm.com, 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, linux-mm@kvack.org, iommu@lists.linux.dev Subject: [PATCH v8 1/8] riscv: build crash_mem ranges from memblock instead of resource tree Date: Fri, 16 Oct 2026 11:08:48 +0800 Message-ID: <20261016030855.4062882-2-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261016030855.4062882-1-chenwandun1@gmail.com> References: <20261016030855.4062882-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 Replace walk_system_ram_res() with for_each_mem_range(). A later patch introduces MEMBLOCK_NODUMP in memblock, the reserved-memory regions marked with MEMBLOCK_NODUMP can be excluded from the vmcore by walking memblock. for_each_mem_range() iterates memblock.memory, which is freed after init unless ARCH_KEEP_MEMBLOCK is selected. riscv needs ARCH_KEEP_MEMBLOCK to filter reserved memory from the vmcore, so extend its condition (ACPI || KEXEC) with CRASH_DUMP. arm64 and loongarch already select ARCH_KEEP_MEMBLOCK unconditionally. Signed-off-by: Wandun Chen Tested-by: Meijing Zhao Acked-by: Baoquan He --- arch/riscv/Kconfig | 2 +- arch/riscv/kernel/machine_kexec_file.c | 31 ++++++++++---------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 62a4be0474e3..529310e3ae1e 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -58,7 +58,7 @@ config RISCV select ARCH_HAS_UBSAN select ARCH_HAS_VDSO_ARCH_DATA select ARCH_HAVE_NMI_SAFE_CMPXCHG - select ARCH_KEEP_MEMBLOCK if ACPI || KEXEC + select ARCH_KEEP_MEMBLOCK if ACPI || KEXEC || CRASH_DUMP select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT diff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c index 26cd2a8bd0cd..808e872f4063 100644 --- a/arch/riscv/kernel/machine_kexec_file.c +++ b/arch/riscv/kernel/machine_kexec_file.c @@ -37,39 +37,32 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) } #ifdef CONFIG_CRASH_DUMP -static int get_nr_ram_ranges_callback(struct resource *res, void *arg) -{ - unsigned int *nr_ranges = arg; - - (*nr_ranges)++; - return 0; -} - unsigned int arch_get_system_nr_ranges(void) { unsigned int nr_ranges = 2 + crashk_cma_cnt; /* For exclusion of crashkernel region */ + u64 i; + phys_addr_t start, end; - walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback); + for_each_mem_range(i, &start, &end) + nr_ranges++; return nr_ranges; } -static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg) +int arch_crash_populate_cmem(struct crash_mem *cmem) { - struct crash_mem *cmem = arg; + u64 i; + phys_addr_t start, end; - cmem->ranges[cmem->nr_ranges].start = res->start; - cmem->ranges[cmem->nr_ranges].end = res->end; - cmem->nr_ranges++; + for_each_mem_range(i, &start, &end) { + cmem->ranges[cmem->nr_ranges].start = start; + cmem->ranges[cmem->nr_ranges].end = end - 1; + cmem->nr_ranges++; + } return 0; } -int arch_crash_populate_cmem(struct crash_mem *cmem) -{ - return walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback); -} - static char *setup_kdump_cmdline(struct kimage *image, char *cmdline, unsigned long cmdline_len) { -- 2.43.0