summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kexec/arch/ppc64/crashdump-ppc64.c144
-rw-r--r--kexec/arch/ppc64/crashdump-ppc64.h3
-rw-r--r--kexec/arch/ppc64/kexec-ppc64.c29
-rw-r--r--kexec/arch/ppc64/kexec-ppc64.h3
4 files changed, 61 insertions, 118 deletions
diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c
index a213166..1435581 100644
--- a/kexec/arch/ppc64/crashdump-ppc64.c
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
@@ -44,9 +44,6 @@ static struct memory_range crash_memory_range[CRASH_MAX_MEMORY_RANGES];
*/
mem_rgns_t usablemem_rgns = {0, };
-/* array to store memory regions to be excluded from elf header creation */
-mem_rgns_t exclude_rgns = {0, };
-
/*
* To store the memory size of the first kernel and this value will be
* passed to the second kernel as command line (savemaxmem=xM).
@@ -58,8 +55,6 @@ mem_rgns_t exclude_rgns = {0, };
*/
unsigned long saved_max_mem = 0;
-static int sort_regions(mem_rgns_t *rgn);
-
/* Reads the appropriate file and retrieves the SYSTEM RAM regions for whom to
* create Elf headers. Keeping it separate from get_memory_ranges() as
* requirements are different in the case of normal kexec and crashdumps.
@@ -81,7 +76,7 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)
DIR *dir, *dmem;
FILE *file;
struct dirent *dentry, *mentry;
- int i, n, match;
+ int i, n;
unsigned long long start, end, cstart, cend;
/* create a separate program header for the backup region */
@@ -121,62 +116,51 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)
closedir(dir);
return -1;
}
- if (memory_ranges >= MAX_MEMORY_RANGES)
- break;
+ if (memory_ranges >= MAX_MEMORY_RANGES) {
+ /* No space to insert another element. */
+ fprintf(stderr,
+ "Error: Number of crash memory ranges"
+ " excedeed the max limit\n");
+ return -1;
+ }
+
start = ((unsigned long long *)buf)[0];
end = start + ((unsigned long long *)buf)[1];
if (start == 0 && end >= 0x8000)
start = 0x8000;
- match = 0;
- sort_regions(&exclude_rgns);
-
- /* exclude crash reserved regions */
- for (i = 0; i < exclude_rgns.size; i++) {
- cstart = exclude_rgns.ranges[i].start;
- cend = exclude_rgns.ranges[i].end;
- if (cstart < end && cend > start) {
- if ((cstart == start) && (cend == end)) {
- match = 1;
- continue;
- }
- if (start < cstart && end > cend) {
- match = 1;
- crash_memory_range[memory_ranges].start = start;
- crash_memory_range[memory_ranges].end = cstart - 1;
- crash_memory_range[memory_ranges].type = RANGE_RAM;
- memory_ranges++;
- crash_memory_range[memory_ranges].start = cend + 1;
- crash_memory_range[memory_ranges].end = end;
- crash_memory_range[memory_ranges].type = RANGE_RAM;
- memory_ranges++;
- break;
- } else if (start < cstart) {
- match = 1;
- crash_memory_range[memory_ranges].start = start;
- crash_memory_range[memory_ranges].end = cstart - 1;
- crash_memory_range[memory_ranges].type = RANGE_RAM;
- memory_ranges++;
- end = cstart - 1;
- continue;
- } else if (end > cend){
- match = 1;
- crash_memory_range[memory_ranges].start = cend + 1;
- crash_memory_range[memory_ranges].end = end;
- crash_memory_range[memory_ranges].type = RANGE_RAM;
- memory_ranges++;
- start = cend + 1;
- continue;
- }
- }
- } /* end of for loop */
- if (!match) {
+ cstart = crash_base;
+ cend = crash_base + crash_size;
+ /*
+ * Exclude the region that lies within crashkernel
+ */
+ if (cstart < end && cend > start) {
+ if (start < cstart && end > cend) {
+ crash_memory_range[memory_ranges].start = start;
+ crash_memory_range[memory_ranges].end = cstart;
+ crash_memory_range[memory_ranges].type = RANGE_RAM;
+ memory_ranges++;
+ crash_memory_range[memory_ranges].start = cend;
+ crash_memory_range[memory_ranges].end = end;
+ crash_memory_range[memory_ranges].type = RANGE_RAM;
+ memory_ranges++;
+ } else if (start < cstart) {
+ crash_memory_range[memory_ranges].start = start;
+ crash_memory_range[memory_ranges].end = cstart;
+ crash_memory_range[memory_ranges].type = RANGE_RAM;
+ memory_ranges++;
+ } else if (end > cend){
+ crash_memory_range[memory_ranges].start = cend;
+ crash_memory_range[memory_ranges].end = end;
+ crash_memory_range[memory_ranges].type = RANGE_RAM;
+ memory_ranges++;
+ }
+ } else {
crash_memory_range[memory_ranges].start = start;
crash_memory_range[memory_ranges].end = end;
crash_memory_range[memory_ranges].type = RANGE_RAM;
memory_ranges++;
}
-
fclose(file);
}
closedir(dmem);
@@ -184,6 +168,21 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)
closedir(dir);
/*
+ * If RTAS region is overlapped with crashkernel, need to create ELF
+ * Program header for the overlapped memory.
+ */
+ if (crash_base < rtas_base + rtas_size &&
+ rtas_base < crash_base + crash_size) {
+ cstart = rtas_base;
+ cend = rtas_base + rtas_size;
+ if (cstart < crash_base)
+ cstart = crash_base;
+ if (cend > crash_base + crash_size)
+ cend = crash_base + crash_size;
+ crash_memory_range[memory_ranges].start = cstart;
+ crash_memory_range[memory_ranges++].end = cend;
+ }
+ /*
* Can not trust the memory regions order that we read from
* device-tree. Hence, get the MAX end value.
*/
@@ -450,45 +449,7 @@ void add_usable_mem_rgns(unsigned long long base, unsigned long long size)
#endif
}
-/*
- * Used to exclude various memory regions that do not need elf hdr generation
- */
-
-void add_exclude_rgns(unsigned long long base, unsigned long long size)
-{
- int i;
- unsigned long long end = base + size;
- unsigned long long xstart, xend;
-
- for (i=0; i < exclude_rgns.size; i++) {
- xstart = exclude_rgns.ranges[i].start;
- xend = exclude_rgns.ranges[i].end;
- if (base < xend && end > xstart) {
- if ((base >= xstart) && (end <= xend))
- return;
- if (base < xstart && end > xend) {
- exclude_rgns.ranges[i].start = base;
- exclude_rgns.ranges[i].end = end;
- return;
- } else if (base < xstart) {
- exclude_rgns.ranges[i].start = base;
- exclude_rgns.ranges[i].end = xend;
- return;
- } else if (end > xend){
- exclude_rgns.ranges[i].start = xstart;
- exclude_rgns.ranges[i].end = end;
- return;
- }
- }
- }
- exclude_rgns.ranges[exclude_rgns.size].start = base;
- exclude_rgns.ranges[exclude_rgns.size++].end = end;
-
-#ifdef DEBUG
- fprintf(stderr, "exclude rgns size:%d base:%lx end:%lx size:%lx\n", exclude_rgns.size, base, end, size);
-#endif
-}
-
+#if 0
static int sort_regions(mem_rgns_t *rgn)
{
int i, j;
@@ -508,4 +469,5 @@ static int sort_regions(mem_rgns_t *rgn)
return 0;
}
+#endif
diff --git a/kexec/arch/ppc64/crashdump-ppc64.h b/kexec/arch/ppc64/crashdump-ppc64.h
index 8f4fa30..c359a63 100644
--- a/kexec/arch/ppc64/crashdump-ppc64.h
+++ b/kexec/arch/ppc64/crashdump-ppc64.h
@@ -4,7 +4,6 @@
int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline,
unsigned long max_addr, unsigned long min_base);
void add_usable_mem_rgns(unsigned long long base, unsigned long long size);
-void add_exclude_rgns(unsigned long long base, unsigned long long size);
#define PAGE_OFFSET 0xC000000000000000
#define KERNELBASE PAGE_OFFSET
@@ -31,5 +30,7 @@ void add_exclude_rgns(unsigned long long base, unsigned long long size);
extern unsigned long long crash_base;
extern unsigned long long crash_size;
+extern unsigned int rtas_base;
+extern unsigned int rtas_size;
#endif /* CRASHDUMP_PPC64_H */
diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c
index 7211203..fdd5385 100644
--- a/kexec/arch/ppc64/kexec-ppc64.c
+++ b/kexec/arch/ppc64/kexec-ppc64.c
@@ -41,6 +41,7 @@ static struct memory_range base_memory_range[MAX_MEMORY_RANGES];
unsigned long long memory_max = 0;
static int nr_memory_ranges, nr_exclude_ranges;
unsigned long long crash_base, crash_size;
+unsigned int rtas_base, rtas_size;
static int sort_base_ranges();
@@ -87,8 +88,10 @@ static int get_base_ranges()
closedir(dir);
return -1;
}
- if (local_memory_ranges >= MAX_MEMORY_RANGES)
+ if (local_memory_ranges >= MAX_MEMORY_RANGES) {
+ fclose(file);
break;
+ }
base_memory_range[local_memory_ranges].start =
((unsigned long long *)buf)[0];
base_memory_range[local_memory_ranges].end =
@@ -165,7 +168,6 @@ static int get_devtree_details(unsigned long kexec_flags)
unsigned long long rmo_base;
unsigned long long tce_base;
unsigned int tce_size;
- unsigned int rtas_base, rtas_size;
unsigned long long htab_base, htab_size;
unsigned long long kernel_end;
char buf[MAXBYTES-1];
@@ -428,29 +430,6 @@ static int get_devtree_details(unsigned long kexec_flags)
sort_ranges();
- /* add crash_region and remove rtas range from exclude regions if it
- * lies within crash region
- */
- if (kexec_flags & KEXEC_ON_CRASH) {
- unsigned long new_crash_size;
- if (crash_base < rtas_base &&
- ((crash_base + crash_size) > (rtas_base + rtas_size))){
- new_crash_size = rtas_base - crash_base;
- add_exclude_rgns(crash_base, new_crash_size);
- new_crash_size = (crash_base + crash_size) - (rtas_base + rtas_size);
- add_exclude_rgns(rtas_base + rtas_size, new_crash_size);
- } else if (crash_base < rtas_base &&
- ((rtas_base + rtas_size) > (crash_base + crash_size))){
- new_crash_size = rtas_base - crash_base;
- add_exclude_rgns(crash_base, new_crash_size);
- } else if (crash_base > rtas_base &&
- ((rtas_base + rtas_size) < (crash_base + crash_size))){
- new_crash_size = (crash_base + crash_size) - (rtas_base + rtas_size);
- add_exclude_rgns(rtas_base + rtas_size, new_crash_size);
- } else
- add_exclude_rgns(crash_base, crash_size);
- }
-
#ifdef DEBUG
int k;
for (k = 0; k < i; k++)
diff --git a/kexec/arch/ppc64/kexec-ppc64.h b/kexec/arch/ppc64/kexec-ppc64.h
index 07a2210..c74c95c 100644
--- a/kexec/arch/ppc64/kexec-ppc64.h
+++ b/kexec/arch/ppc64/kexec-ppc64.h
@@ -1,7 +1,8 @@
#ifndef KEXEC_PPC64_H
#define KEXEC_PPC64_H
-#define MAX_MEMORY_RANGES 256 /* TO FIX - needs to be dynamically set */
+#define MAX_MEMORY_RANGES 1024 /* TO FIX - needs to be dynamically set */
+
#define MAXBYTES 128
#define MAX_LINE 160
#define CORE_TYPE_ELF32 1
generated by cgit (git 2.34.1) at 2025-07-18 20:55:07 +0000