diff options
| -rw-r--r-- | kexec/arch/ppc64/crashdump-ppc64.c | 142 |
1 files changed, 31 insertions, 111 deletions
diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c index 59acb1c..2d67bb8 100644 --- a/kexec/arch/ppc64/crashdump-ppc64.c +++ b/kexec/arch/ppc64/crashdump-ppc64.c @@ -35,6 +35,28 @@ #include "kexec-ppc64.h" #include "crashdump-ppc64.h" +static struct crash_elf_info elf_info64 = +{ + class: ELFCLASS64, + data: ELFDATA2MSB, + machine: EM_PPC64, + backup_src_start: BACKUP_SRC_START, + backup_src_end: BACKUP_SRC_END, + page_offset: PAGE_OFFSET, + lowmem_limit: MAXMEM, +}; + +static struct crash_elf_info elf_info32 = +{ + class: ELFCLASS32, + data: ELFDATA2MSB, + machine: EM_PPC64, + backup_src_start: BACKUP_SRC_START, + backup_src_end: BACKUP_SRC_END, + page_offset: PAGE_OFFSET, + lowmem_limit: MAXMEM, +}; + extern struct arch_options_t arch_options; /* Stores a sorted list of RAM memory ranges for which to create elf headers. @@ -260,99 +282,6 @@ static int add_cmdline_param(char *cmdline, unsigned long addr, return 0; } -/* Prepares the crash memory elf64 headers and stores in supplied buffer. */ -static int prepare_crash_memory_elf64_headers(struct kexec_info *info, - void *buf, unsigned long size) -{ - Elf64_Ehdr *elf; - Elf64_Phdr *phdr; - int i; - char *bufp; - long int nr_cpus = 0; - unsigned long notes_addr, notes_len; - - bufp = (char*) buf; - - /* Setup ELF Header*/ - elf = (Elf64_Ehdr *) bufp; - bufp += sizeof(Elf64_Ehdr); - memcpy(elf->e_ident, ELFMAG, SELFMAG); - elf->e_ident[EI_CLASS] = ELFCLASS64; - elf->e_ident[EI_DATA] = ELFDATA2MSB; - elf->e_ident[EI_VERSION]= EV_CURRENT; - elf->e_ident[EI_OSABI] = ELFOSABI_NONE; - memset(elf->e_ident+EI_PAD, 0, EI_NIDENT-EI_PAD); - elf->e_type = ET_CORE; - elf->e_machine = EM_PPC64; - elf->e_version = EV_CURRENT; - elf->e_entry = 0; - elf->e_phoff = sizeof(Elf64_Ehdr); - elf->e_shoff = 0; - elf->e_flags = 0; - elf->e_ehsize = sizeof(Elf64_Ehdr); - elf->e_phentsize= sizeof(Elf64_Phdr); - elf->e_phnum = 0; - elf->e_shentsize= 0; - elf->e_shnum = 0; - elf->e_shstrndx = 0; - - /* PT_NOTE program headers. One per cpu*/ - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - if (nr_cpus < 0) - return -1; - - for (i = 0; i < nr_cpus; i++) { - if (get_crash_notes_per_cpu(i, ¬es_addr, ¬es_len) < 0) { - /* This cpu is not present. Skip it. */ - continue; - } - phdr = (Elf64_Phdr *) bufp; - bufp += sizeof(Elf64_Phdr); - phdr->p_type = PT_NOTE; - phdr->p_flags = 0; - phdr->p_offset = phdr->p_paddr = notes_addr; - phdr->p_vaddr = 0; - phdr->p_filesz = phdr->p_memsz = notes_len; - /* Do we need any alignment of segments? */ - phdr->p_align = 0; - - /* Increment number of program headers. */ - (elf->e_phnum)++; - } - - /* Setup PT_LOAD type program header for every system RAM chunk. - * A seprate program header for Backup Region - */ - for (i = 0; i < CRASH_MAX_MEMORY_RANGES; i++) { - unsigned long long mstart, mend; - mstart = crash_memory_range[i].start; - mend = crash_memory_range[i].end; - if (!mstart && !mend) - break; - phdr = (Elf64_Phdr *) bufp; - bufp += sizeof(Elf64_Phdr); - phdr->p_type = PT_LOAD; - phdr->p_flags = PF_R|PF_W|PF_X; - if (mstart == BACKUP_SRC_START && mend == BACKUP_SRC_END) - phdr->p_offset = info->backup_start; - else - phdr->p_offset = mstart; - /* Handle linearly mapped region.*/ - if (mend <= (MAXMEM - 1)) - phdr->p_vaddr = mstart + PAGE_OFFSET; - else - phdr->p_vaddr = -1ULL; - phdr->p_paddr = mstart; - phdr->p_filesz = phdr->p_memsz = mend - mstart; - /* Do we need any alignment of segments? */ - phdr->p_align = 0; - - /* Increment number of program headers. */ - (elf->e_phnum)++; - } - return 0; -} - /* Loads additional segments in case of a panic kernel is being loaded. * One segment for backup region, another segment for storing elf headers * for crash memory image. @@ -376,27 +305,18 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline, info->backup_start = add_buffer(info, tmp, sz, sz, align, 0, max_addr, 1); reserve(info->backup_start, sz); + /* Create elf header segment and store crash image data. */ - nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - if (nr_cpus < 0) { - fprintf(stderr,"kexec_load (elf header segment)" - " failed: %s\n", strerror(errno)); - return -1; - } if (arch_options.core_header_type == CORE_TYPE_ELF64) { - sz = sizeof(Elf64_Ehdr) + - nr_cpus * sizeof(Elf64_Phdr) + - nr_ranges * sizeof(Elf64_Phdr); - } else { - sz = sizeof(Elf32_Ehdr) + - nr_cpus * sizeof(Elf32_Phdr) + - nr_ranges * sizeof(Elf32_Phdr); + if (crash_create_elf64_headers(info, &elf_info64, + crash_memory_range, nr_ranges, + &tmp, &sz) < 0) + return -1; } - sz = (sz + align - 1) & ~(align -1); - tmp = xmalloc(sz); - memset(tmp, 0, sz); - if (arch_options.core_header_type == CORE_TYPE_ELF64) { - if (prepare_crash_memory_elf64_headers(info, tmp, sz) < 0) + else { + if (crash_create_elf32_headers(info, &elf_info32, + crash_memory_range, nr_ranges, + &tmp, &sz) < 0) return -1; } |