From nobody Tue Feb 10 00:58:40 2026 Received: from canpmsgout07.his.huawei.com (canpmsgout07.his.huawei.com [113.46.200.222]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5B3A39A7E1; Wed, 4 Feb 2026 09:36:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.222 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770197804; cv=none; b=ZLwfS7OObWnw20LhL5kpDHUkx1TP4PUQb46aOcXCRKjHv+nTbrCODjoeuUCvx6mOnoE6qC/V1XQTi7GfkeMlJENzNDO3VdorfdzZxSG5w538BPLCqG7IW7QYC1Sp1xaHgpPopkNKLN3QsVU5iFo7QiH8MRCyJNeap595sx+A7m4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770197804; c=relaxed/simple; bh=1srqwd/mrEYhwK7jBUUukUUXYyzIgrsbHsUiI/JSkS4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=udmkH2bw3F4xHwbSA1h0X1geu7nlFScG5pmndRd9mKwv6qa686U1KTbsQ073OJYVbksiCrKjlZWy2BVjEfwiAoNL9/jSOfONnZ8zSe1Lfk0IJRo50sznDCNalvvxMICepy2Ahtk0VQJEzglUWFfSp8hdMmU2gO25xpMpMNUzDic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=3aga8HNk; arc=none smtp.client-ip=113.46.200.222 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="3aga8HNk" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=QVg6OyxDVrqaKGU+pvZ6DlNaiN3X5DKslNqzBQhZthc=; b=3aga8HNkyvVPYyyaP7DsKfPU92VXxDmY9f7epER4l6Hw3sgYrNxgvZ1lbM4t0CmbNGfEzjYlh 7Z7dN5STGxEM45T2fuFfRB4UQbR2WGh1ZZTJVXpBzcrjn0gYSucWjZ25dZGu2oS4y1xBQwKjZY/ UA2dKT27fnDTZ0axxkIuFbo= Received: from mail.maildlp.com (unknown [172.19.163.200]) by canpmsgout07.his.huawei.com (SkyGuard) with ESMTPS id 4f5Zr64G09zLlSs; Wed, 4 Feb 2026 17:32:06 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id 8D1C84055B; Wed, 4 Feb 2026 17:36:40 +0800 (CST) Received: from huawei.com (10.90.53.73) by dggpemf500011.china.huawei.com (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 4 Feb 2026 17:36:37 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v3 1/3] crash: Exclude crash kernel memory in crash core Date: Wed, 4 Feb 2026 17:37:26 +0800 Message-ID: <20260204093728.1447527-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260204093728.1447527-1-ruanjinjie@huawei.com> References: <20260204093728.1447527-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To dggpemf500011.china.huawei.com (7.185.36.131) Content-Type: text/plain; charset="utf-8" The exclude of crashk_res, crashk_low_res and crashk_cma memory are almost identical across different architectures, so handling them in the crash core would eliminate a lot of duplication, so do them in the common code. Signed-off-by: Jinjie Ruan --- arch/arm64/kernel/machine_kexec_file.c | 12 ------- arch/loongarch/kernel/machine_kexec_file.c | 12 ------- arch/powerpc/kexec/ranges.c | 16 ++------- arch/riscv/kernel/machine_kexec_file.c | 5 +-- arch/x86/kernel/crash.c | 39 ++-------------------- kernel/crash_core.c | 28 ++++++++++++++++ 6 files changed, 34 insertions(+), 78 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/mac= hine_kexec_file.c index 410060ebd86d..ed2c45007158 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -64,20 +64,8 @@ static int prepare_elf_headers(void **addr, unsigned lon= g *sz) cmem->nr_ranges++; } =20 - /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); - if (ret) - goto out; - - if (crashk_low_res.end) { - ret =3D crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_r= es.end); - if (ret) - goto out; - } - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); =20 -out: kfree(cmem); return ret; } diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/ke= rnel/machine_kexec_file.c index fb57026f5f25..26f867e53955 100644 --- a/arch/loongarch/kernel/machine_kexec_file.c +++ b/arch/loongarch/kernel/machine_kexec_file.c @@ -80,20 +80,8 @@ static int prepare_elf_headers(void **addr, unsigned lon= g *sz) cmem->nr_ranges++; } =20 - /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); - if (ret < 0) - goto out; - - if (crashk_low_res.end) { - ret =3D crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_r= es.end); - if (ret < 0) - goto out; - } - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); =20 -out: kfree(cmem); return ret; } diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c index 867135560e5c..3f76dd266b1f 100644 --- a/arch/powerpc/kexec/ranges.c +++ b/arch/powerpc/kexec/ranges.c @@ -553,9 +553,7 @@ int get_usable_memory_ranges(struct crash_mem **mem_ran= ges) #endif /* CONFIG_KEXEC_FILE */ =20 #ifdef CONFIG_CRASH_DUMP -static int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges, - unsigned long long mstart, - unsigned long long mend) +static int crash_realloc_mem_range_guarded(struct crash_mem **mem_ranges) { struct crash_mem *tmem =3D *mem_ranges; =20 @@ -566,7 +564,7 @@ static int crash_exclude_mem_range_guarded(struct crash= _mem **mem_ranges, return -ENOMEM; } =20 - return crash_exclude_mem_range(tmem, mstart, mend); + return 0; } =20 /** @@ -604,18 +602,10 @@ int get_crash_memory_ranges(struct crash_mem **mem_ra= nges) sort_memory_ranges(*mem_ranges, true); } =20 - /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range_guarded(mem_ranges, crashk_res.start, cra= shk_res.end); + ret =3D crash_realloc_mem_range_guarded(mem_ranges); if (ret) goto out; =20 - for (i =3D 0; i < crashk_cma_cnt; ++i) { - ret =3D crash_exclude_mem_range_guarded(mem_ranges, crashk_cma_ranges[i]= .start, - crashk_cma_ranges[i].end); - if (ret) - goto out; - } - /* * FIXME: For now, stay in parity with kexec-tools but if RTAS/OPAL * regions are exported to save their context at the time of diff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/mac= hine_kexec_file.c index dd9d92a96517..fec3622a13c9 100644 --- a/arch/riscv/kernel/machine_kexec_file.c +++ b/arch/riscv/kernel/machine_kexec_file.c @@ -74,10 +74,7 @@ static int prepare_elf_headers(void **addr, unsigned lon= g *sz) if (ret) goto out; =20 - /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); - if (!ret) - ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); + ret =3D crash_prepare_elf64_headers(cmem, true, addr, sz); =20 out: kfree(cmem); diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 335fd2ee9766..d8341a48f6b3 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -186,41 +186,6 @@ static struct crash_mem *fill_up_crash_elf_data(void) return cmem; } =20 -/* - * Look for any unwanted ranges between mstart, mend and remove them. This - * might lead to split and split ranges are put in cmem->ranges[] array - */ -static int elf_header_exclude_ranges(struct crash_mem *cmem) -{ - int ret =3D 0; - int i; - - /* Exclude the low 1M because it is always reserved */ - ret =3D crash_exclude_mem_range(cmem, 0, SZ_1M - 1); - if (ret) - return ret; - - /* Exclude crashkernel region */ - ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); - if (ret) - return ret; - - if (crashk_low_res.end) - ret =3D crash_exclude_mem_range(cmem, crashk_low_res.start, - crashk_low_res.end); - if (ret) - return ret; - - for (i =3D 0; i < crashk_cma_cnt; ++i) { - ret =3D crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start, - crashk_cma_ranges[i].end); - if (ret) - return ret; - } - - return 0; -} - static int prepare_elf64_ram_headers_callback(struct resource *res, void *= arg) { struct crash_mem *cmem =3D arg; @@ -247,8 +212,8 @@ static int prepare_elf_headers(void **addr, unsigned lo= ng *sz, if (ret) goto out; =20 - /* Exclude unwanted mem ranges */ - ret =3D elf_header_exclude_ranges(cmem); + /* Exclude the low 1M because it is always reserved */ + ret =3D crash_exclude_mem_range(cmem, 0, SZ_1M - 1); if (ret) goto out; =20 diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 99dac1aa972a..5c0de111ddc3 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -161,8 +162,30 @@ static inline resource_size_t crash_resource_size(cons= t struct resource *res) return !res->end ? 0 : resource_size(res); } =20 +static int crash_exclude_mem_ranges(struct crash_mem *cmem) +{ + int ret, i; + + /* Exclude crashkernel region */ + ret =3D crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end); + if (ret) + return ret; + + if (crashk_low_res.end) { + ret =3D crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_r= es.end); + if (ret) + return ret; + } =20 + for (i =3D 0; i < crashk_cma_cnt; ++i) { + ret =3D crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start, + crashk_cma_ranges[i].end); + if (ret) + return ret; + } =20 + return ret; +} =20 int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map, void **addr, unsigned long *sz) @@ -174,6 +197,11 @@ int crash_prepare_elf64_headers(struct crash_mem *mem,= int need_kernel_map, unsigned int cpu, i; unsigned long long notes_addr; unsigned long mstart, mend; + int ret; + + ret =3D crash_exclude_mem_ranges(mem); + if (ret) + return ret; =20 /* extra phdr for vmcoreinfo ELF note */ nr_phdr =3D nr_cpus + 1; --=20 2.34.1