Skip to contentSkip to conversation

crash_dump: remove saved_max_pfn

PATCH Applied Kairui Song 3 participants 3 messages Mar 30, 2020 – Apr 15, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crash_dump: remove saved_max_pfn

This variable is no longer used.

saved_max_pfn was originally introduce in commit 92aa63a5a1bf ("[PATCH]
kdump: Retrieve saved max pfn"), used to make sure that user does not try to read the physical memory beyond saved_max_pfn. But since commit 921d58c0e699 ("vmcore: remove saved_max_pfn check") it's no longer used for the check.

Only user left is Calary IOMMU, which start using it from commit 95b68dec0d52 ("calgary iommu: use the first kernels TCE tables in kdump"). But again, recently in commit 90dc392fc445 ("x86: Remove the calgary IOMMU driver"), Calary IOMMU is removed and this variable no longer have any user.

So just remove it.

---
 arch/x86/kernel/e820.c     | 8 --------
 include/linux/crash_dump.h | 2 --
 kernel/crash_dump.c        | 6 ------
 3 files changed, 16 deletions(-)
arch/x86/kernel/e820.c +0 -8
index c5399e80c59c..4d13c57f370a 100644
@@ -910,14 +910,6 @@ static int __init parse_memmap_one(char *p)
 		return -EINVAL;
 
 	if (!strncmp(p, "exactmap", 8)) {
-#ifdef CONFIG_CRASH_DUMP
-		/*
-		 * If we are doing a crash dump, we still need to know
-		 * the real memory size before the original memory map is
-		 * reset.
-		 */
-		saved_max_pfn = e820__end_of_ram_pfn();
-#endif
 		e820_table->nr_entries = 0;
 		userdef = 1;
 		return 0;
include/linux/crash_dump.h +0 -2
index 4664fc1871de..bc156285d097 100644
@@ -97,8 +97,6 @@ extern void unregister_oldmem_pfn_is_ram(void);
 static inline bool is_kdump_kernel(void) { return 0; }
 #endif /* CONFIG_CRASH_DUMP */
 
-extern unsigned long saved_max_pfn;
-
 /* Device Dump information to be filled by drivers */
 struct vmcoredd_data {
 	char dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Unique name of the dump */
kernel/crash_dump.c +0 -6
index 9c23ae074b40..92da32275af5 100644
@@ -5,12 +5,6 @@
 #include <linux/errno.h>
 #include <linux/export.h>
 
-/*
- * If we have booted due to a crash, max_pfn will be a very low value. We need
- * to know the amount of memory that the previous kernel used.
- */
-unsigned long saved_max_pfn;
-
 /*
  * stores the physical address of elf header of crash image
  *
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 14 lines · Kairui Song

This variable is no longer used.

saved_max_pfn was originally introduce in commit 92aa63a5a1bf ("[PATCH]
kdump: Retrieve saved max pfn"), used to make sure that user does not try to read the physical memory beyond saved_max_pfn. But since commit 921d58c0e699 ("vmcore: remove saved_max_pfn check") it's no longer used for the check.

Only user left is Calary IOMMU, which start using it from commit 95b68dec0d52 ("calgary iommu: use the first kernels TCE tables in kdump"). But again, recently in commit 90dc392fc445 ("x86: Remove the calgary IOMMU driver"), Calary IOMMU is removed and this variable no longer have any user.

Quoted 3 lines

So just remove it.

Can we merge this through the tip tree?

Quoted 55 lines
---
 arch/x86/kernel/e820.c     | 8 --------
 include/linux/crash_dump.h | 2 --
 kernel/crash_dump.c        | 6 ------
 3 files changed, 16 deletions(-)
arch/x86/kernel/e820.c +0 -8
index c5399e80c59c..4d13c57f370a 100644
@@ -910,14 +910,6 @@ static int __init parse_memmap_one(char *p)
 		return -EINVAL;
 
 	if (!strncmp(p, "exactmap", 8)) {
-#ifdef CONFIG_CRASH_DUMP
-		/*
-		 * If we are doing a crash dump, we still need to know
-		 * the real memory size before the original memory map is
-		 * reset.
-		 */
-		saved_max_pfn = e820__end_of_ram_pfn();
-#endif
 		e820_table->nr_entries = 0;
 		userdef = 1;
 		return 0;
include/linux/crash_dump.h +0 -2
index 4664fc1871de..bc156285d097 100644
@@ -97,8 +97,6 @@ extern void unregister_oldmem_pfn_is_ram(void);
 static inline bool is_kdump_kernel(void) { return 0; }
 #endif /* CONFIG_CRASH_DUMP */
 
-extern unsigned long saved_max_pfn;
-
 /* Device Dump information to be filled by drivers */
 struct vmcoredd_data {
 	char dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Unique name of the dump */
kernel/crash_dump.c +0 -6
index 9c23ae074b40..92da32275af5 100644
@@ -5,12 +5,6 @@
 #include <linux/errno.h>
 #include <linux/export.h>
 
-/*
- * If we have booted due to a crash, max_pfn will be a very low value. We need
- * to know the amount of memory that the previous kernel used.
- */
-unsigned long saved_max_pfn;
-
 /*
  * stores the physical address of elf header of crash image
  *
merge bot Applied
#2 lore raw

[tip: x86/cleanups] crash_dump: Remove no longer used saved_max_pfn

In reply to Kairui Song
The following commit has been merged into the x86/cleanups branch of tip:

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     4c5b566c2193e2af82c891daa5303c8899e61044
Gitweb:        https://git.kernel.org/tip/4c5b566c2193e2af82c891daa5303c8899e61044
Author:        Kairui Song <[email protected]>
AuthorDate:    Tue, 31 Mar 2020 02:15:44 +08:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 15 Apr 2020 11:21:54 +02:00

crash_dump: Remove no longer used saved_max_pfn

saved_max_pfn was originally introduced in commit

92aa63a5a1bf ("[PATCH] kdump: Retrieve saved max pfn")

It used to make sure that the user does not try to read the physical memory beyond saved_max_pfn. But since commit

921d58c0e699 ("vmcore: remove saved_max_pfn check")

it's no longer used for the check. This variable doesn't have any users anymore so just remove it.

[ bp: Drop the Calgary IOMMU reference from the commit message. ]

---
 arch/x86/kernel/e820.c     | 8 --------
 include/linux/crash_dump.h | 2 --
 kernel/crash_dump.c        | 6 ------
 3 files changed, 16 deletions(-)
arch/x86/kernel/e820.c +0 -8
index c5399e8..4d13c57 100644
@@ -910,14 +910,6 @@ static int __init parse_memmap_one(char *p)
 		return -EINVAL;
 
 	if (!strncmp(p, "exactmap", 8)) {
-#ifdef CONFIG_CRASH_DUMP
-		/*
-		 * If we are doing a crash dump, we still need to know
-		 * the real memory size before the original memory map is
-		 * reset.
-		 */
-		saved_max_pfn = e820__end_of_ram_pfn();
-#endif
 		e820_table->nr_entries = 0;
 		userdef = 1;
 		return 0;
include/linux/crash_dump.h +0 -2
index 4664fc1..bc15628 100644
@@ -97,8 +97,6 @@ extern void unregister_oldmem_pfn_is_ram(void);
 static inline bool is_kdump_kernel(void) { return 0; }
 #endif /* CONFIG_CRASH_DUMP */
 
-extern unsigned long saved_max_pfn;
-
 /* Device Dump information to be filled by drivers */
 struct vmcoredd_data {
 	char dump_name[VMCOREDD_MAX_NAME_BYTES]; /* Unique name of the dump */
kernel/crash_dump.c +0 -6
index 9c23ae0..92da322 100644
@@ -6,12 +6,6 @@
 #include <linux/export.h>
 
 /*
- * If we have booted due to a crash, max_pfn will be a very low value. We need
- * to know the amount of memory that the previous kernel used.
- */
-unsigned long saved_max_pfn;
-
-/*
  * stores the physical address of elf header of crash image
  *
  * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by