Add kexec_file_load support to s390
Subsystems (7)
cover Add kexec_file_load support to s390
Hi everybody
this series adds the kexec_file_load system call to s390. Before the system call is added there are some preparations/clean ups to common kexec_file_load. In detail this series contains:
Patch #1&2: Minor cleanups/fixes.
Patch #3-9: Clean up the purgatory load/relocation code. Especially remove the mis-use of the purgatory_info->sechdrs->sh_offset field, currently holding a pointer into either kexec_purgatory (ro) or purgatory_buf (rw) depending on the section. With these patches the section address will be calculated verbosely and sh_offset will contain the offset of the section in the stripped purgatory binary (purgatory_buf).
Patch #10: Allows architectures to set the purgaory load address. This patch is important for s390 as the kernel and purgatory have to be loaded to fixed addresses. In current code this is impossible as the purgatory load is opaque to the architecture.
Patch #11: Moves x86 purgatories sha implementation to common lib/ directory.
Patches #12-17 finally adds the kexec_file_load system call to s390.
Please note that I had to touch arch code for x86 and power a little. In theory this should not change the behavior but I don't have a way to test it. Cross-compiling with defconfig(*) works fine for both.
Thanks
Philipp
(*) On x86 with the orc unwinder turned off. objtool SEGFAULTs on s390...
Philipp Rudo (17):
kexec_file: Silence compile warnings
kexec_file: Remove checks in kexec_purgatory_load
kexec_file: Make purgatory_info->ehdr const
kexec_file: Search symbols in read-only kexec_purgatory
kexec_file: Use read-only sections in arch_kexec_apply_relocations*
kexec_file: Split up __kexec_load_puragory
kexec_file: Simplify kexec_purgatory_setup_sechdrs 1
kexec_file: Simplify kexec_purgatory_setup_sechdrs 2
kexec_file: Remove mis-use of sh_offset field
kexec_file: Allow archs to set purgatory load address
kexec_file: Move purgatories sha256 to common code s390/kexec_file: Prepare setup.h for kexec_file_load s390/kexec_file: Add purgatory
s390/kexec_file: Add kexec_file_load system call s390/kexec_file: Add image loader
s390/kexec_file: Add crash support to image loader s390/kexec_file: Add ELF loader
arch/powerpc/kernel/kexec_elf_64.c | 9 +-
arch/s390/Kbuild | 1 +
arch/s390/Kconfig | 4 +
arch/s390/include/asm/kexec.h | 23 ++
arch/s390/include/asm/purgatory.h | 17 ++
arch/s390/include/asm/setup.h | 40 ++-
arch/s390/kernel/Makefile | 1 +
arch/s390/kernel/asm-offsets.c | 5 +
arch/s390/kernel/compat_wrapper.c | 1 +
arch/s390/kernel/kexec_elf.c | 149 ++++++++++
arch/s390/kernel/kexec_image.c | 78 +++++
arch/s390/kernel/machine_kexec_file.c | 291 +++++++++++++++++++
arch/s390/kernel/syscalls/syscall.tbl | 1 +
arch/s390/purgatory/Makefile | 37 +++
arch/s390/purgatory/head.S | 279 ++++++++++++++++++
arch/s390/purgatory/purgatory.c | 42 +++
arch/x86/kernel/kexec-bzimage64.c | 8 +-
arch/x86/kernel/machine_kexec_64.c | 66 ++---
arch/x86/purgatory/Makefile | 3 +
arch/x86/purgatory/purgatory.c | 2 +-
include/linux/kexec.h | 38 +--
{arch/x86/purgatory => include/linux}/sha256.h | 10 +-
kernel/kexec_file.c | 375 ++++++++++++-------------
{arch/x86/purgatory => lib}/sha256.c | 4 +-
24 files changed, 1200 insertions(+), 284 deletions(-)
create mode 100644 arch/s390/include/asm/purgatory.h
create mode 100644 arch/s390/kernel/kexec_elf.c
create mode 100644 arch/s390/kernel/kexec_image.c
create mode 100644 arch/s390/kernel/machine_kexec_file.c
create mode 100644 arch/s390/purgatory/Makefile
create mode 100644 arch/s390/purgatory/head.S
create mode 100644 arch/s390/purgatory/purgatory.c
rename {arch/x86/purgatory => include/linux}/sha256.h (63%)
rename {arch/x86/purgatory => lib}/sha256.c (99%)Signature · 1 line
2.13.5
PATCH 1/17 kexec_file: Silence compile warnings
When building the kernel with CONFIG_KEXEC_FILE enabled gcc prints a compile warning multiple times.
In file included from <path>/linux/init/initramfs.c:526:0:
<path>/include/linux/kexec.h:120:9: warning: ‘struct kimage’ declared inside parameter list [enabled by default]
unsigned long cmdline_len);
^This is because the typedefs for kexec_file_load uses struct kimage before it is declared. Fix this by simply forward declaring struct kimage.
--- include/linux/kexec.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/kexec.h +2 -0
@@ -114,6 +114,8 @@ struct purgatory_info {unsigned long purgatory_load_addr; }; +struct kimage ; +typedef int (kexec_probe_t )(const char *kernel_buf,unsigned long kernel_size); typedef void *(kexec_load_t)(struct kimage *image, char *kernel_buf, unsigned long kernel_len, char *initrd,
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 2/17 kexec_file: Remove checks in kexec_purgatory_load
In reply to Philipp RudoBefore the purgatory is loaded several checks are done whether the ELF file in kexec_purgatory is valid or not. These checks are incomplete. For example they don't check for the total size of the sections defined in the section header table or if the entry point actually points into the purgatory.
On the other hand the purgatory, although an ELF file on its own, is part of the kernel. Thus not trusting the purgatory means not trusting the kernel build itself.
So remove all validity checks on the purgatory and just trust the kernel build.
--- kernel/kexec_file.c | 14 -------------- 1 file changed, 14 deletions(-)
kernel/kexec_file.c +0 -14
@@ -880,22 +880,8 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min,if (kexec_purgatory_size <=0 )return -EINVAL ; -if (kexec_purgatory_size <sizeof (Elf_Ehdr)) -return -ENOEXEC ; - pi->ehdr = (Elf_Ehdr *)kexec_purgatory; -if (memcmp (pi->ehdr->e_ident,ELFMAG ,SELFMAG ) !=0 - || pi->ehdr->e_type !=ET_REL - || !elf_check_arch (pi->ehdr) - || pi->ehdr->e_shentsize !=sizeof (Elf_Shdr)) -return -ENOEXEC ; - -if (pi->ehdr->e_shoff >= kexec_purgatory_size - || (pi->ehdr->e_shnum *sizeof (Elf_Shdr) > - kexec_purgatory_size - pi->ehdr->e_shoff)) -return -ENOEXEC ; - ret =__kexec_load_purgatory (image, min, max, top_down);if (ret)return ret;
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 3/17 kexec_file: Make purgatory_info->ehdr const
In reply to Philipp RudoThe kexec_purgatory buffer is read-only. Thus all pointers into kexec_purgatory are read-only, too. Point this out by explicitly marking purgatory_info->ehdr as 'const' and update the comments in purgatory_info.
--- include/linux/kexec.h | 17 +++++++++++------ kernel/kexec_file.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-)
include/linux/kexec.h +11 -6
@@ -99,14 +99,19 @@ struct compat_kexec_segment { #ifdef CONFIG_KEXEC_FILE struct purgatory_info { - /* Pointer to elf header of read only purgatory */ - Elf_Ehdr *ehdr; - - /* Pointer to purgatory sechdrs which are modifiable */ + /* + * Pointer to elf header at the beginning of kexec_purgatory. + * Note: kexec_purgatory is read only + */ + const Elf_Ehdr *ehdr; + /* + * Temporary, modifiable buffer for sechdrs used for relocation. + * This memory can be freed post image load. + */ Elf_Shdr *sechdrs; /* - * Temporary buffer location where purgatory is loaded and relocated - * This memory can be freed post image load + * Temporary, modifiable buffer for stripped purgatory used for + * relocation. This memory can be freed post image load. */ void *purgatory_buf;
kernel/kexec_file.c +2 -2
@@ -880,7 +880,7 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min,if (kexec_purgatory_size <=0 )return -EINVAL ; - pi->ehdr = (Elf_Ehdr *)kexec_purgatory; + pi->ehdr = (const Elf_Ehdr *)kexec_purgatory; ret =__kexec_load_purgatory (image, min, max, top_down);if (ret)
@@ -904,9 +904,9 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min,static Elf_Sym *kexec_purgatory_find_symbol (struct purgatory_info *pi,const char *name) { +const Elf_Ehdr *ehdr;Elf_Sym *syms;Elf_Shdr *sechdrs; -Elf_Ehdr *ehdr;int i, k;const char *strtab;
Signature · 1 line
2.13.5
PATCH 4/17 kexec_file: Search symbols in read-only kexec_purgatory
In reply to Philipp RudoThe stripped purgatory does not contain a symtab. So when looking for symbols this is done in read-only kexec_purgatory. Highlight this by marking the corresponding variables as 'const'.
--- kernel/kexec_file.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
kernel/kexec_file.c +22 -16
@@ -901,20 +901,27 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min,return ret; } -static Elf_Sym *kexec_purgatory_find_symbol (struct purgatory_info *pi, -const char *name) +/* +* kexec_purgatory_find_symbol - find a symbol in the purgatory +* @pi: Purgatory to search in. +* @name: Name of the symbol. +* +* Return: pointer to symbol in read-only symtab on success, NULL on error. +*/ +static const Elf_Sym *kexec_purgatory_find_symbol (struct purgatory_info *pi, +const char *name) { +const Elf_Shdr *sechdrs;const Elf_Ehdr *ehdr; -Elf_Sym *syms; -Elf_Shdr *sechdrs; -int i, k; +const Elf_Sym *syms;const char *strtab; +int i, k; -if (!pi->sechdrs || !pi->ehdr) +if (!pi->ehdr)return NULL ; - sechdrs = pi->sechdrs; ehdr = pi->ehdr; + sechdrs = (void *)ehdr + ehdr->e_shoff;for (i =0 ; i < ehdr->e_shnum; i++) {if (sechdrs[i].sh_type !=SHT_SYMTAB )
@@ -923,8 +930,8 @@ static Elf_Sym *kexec_purgatory_find_symbol(struct purgatory_info *pi,if (sechdrs[i].sh_link >= ehdr->e_shnum)/* Invalid strtab section number */ continue ; - strtab = (char *)sechdrs[sechdrs[i].sh_link].sh_offset; - syms = (Elf_Sym *)sechdrs[i].sh_offset; + strtab = (void *)ehdr + sechdrs[sechdrs[i].sh_link].sh_offset; + syms = (void *)ehdr + sechdrs[i].sh_offset;/* Go through symbols for a match */ for (k =0 ; k < sechdrs[i].sh_size/sizeof (Elf_Sym); k++) {
@@ -952,7 +959,7 @@ static Elf_Sym *kexec_purgatory_find_symbol(struct purgatory_info *pi,void *kexec_purgatory_get_symbol_addr (struct kimage *image,const char *name) {struct purgatory_info *pi = &image->purgatory_info; -Elf_Sym *sym; +const Elf_Sym *sym;Elf_Shdr *sechdr; sym =kexec_purgatory_find_symbol (pi, name);
@@ -975,9 +982,9 @@ void *kexec_purgatory_get_symbol_addr(struct kimage *image, const char *name)int kexec_purgatory_get_set_symbol (struct kimage *image,const char *name,void *buf,unsigned int size,bool get_value) { -Elf_Sym *sym; -Elf_Shdr *sechdrs;struct purgatory_info *pi = &image->purgatory_info; +const Elf_Sym *sym; +Elf_Shdr *sec;char *sym_buf; sym =kexec_purgatory_find_symbol (pi, name);
@@ -990,16 +997,15 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name,return -EINVAL ; } - sechdrs = pi->sechdrs; + sec = pi->sechdrs + sym->st_shndx; -if (sechdrs[sym->st_shndx].sh_type ==SHT_NOBITS ) { +if (sec->sh_type ==SHT_NOBITS ) {pr_err ("symbol %s is in a bss section. Cannot %s\n" , name, get_value ?"get" :"set" );return -EINVAL ; } - sym_buf = (unsigned char *)sechdrs[sym->st_shndx].sh_offset + - sym->st_value; + sym_buf = (char *)sec->sh_offset + sym->st_value;if (get_value)memcpy ((void *)buf, sym_buf, size);
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 5/17 kexec_file: Use read-only sections in arch_kexec_apply_relocations*
In reply to Philipp RudoWhen the relocations are applied to the purgatory only the section the relocations are applied to is writable. The other sections, i.e. the symtab and .rel/.rela, are in read-only kexec_purgatory. Highlight this by marking the corresponding variables as 'const'.
While at it also change the signatures of arch_kexec_apply_relocations* to take section pointers instead of just the index of the relocation section. This removes the second lookup and sanity check of the sections in arch code.
--- arch/x86/kernel/machine_kexec_64.c | 56 ++++++++++++--------------------- include/linux/kexec.h | 12 +++++--- kernel/kexec_file.c | 63 +++++++++++++++++++++++++------------- 3 files changed, 70 insertions(+), 61 deletions(-)
arch/x86/kernel/machine_kexec_64.c +20 -36
@@ -422,52 +422,36 @@ int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel,/* * Apply purgatory relocations. * -* ehdr: Pointer to elf headers -* sechdrs: Pointer to section headers. -* relsec: section index of SHT_RELA section. +* @pi: Purgatory to be relocated. +* @section: Section relocations applying to. +* @relsec: Section containing RELAs. +* @symtabsec: Corresponding symtab. * * TODO: Some of the code belongs to generic code. Move that in kexec.c. */ -int arch_kexec_apply_relocations_add (const Elf64_Ehdr *ehdr, -Elf64_Shdr *sechdrs,unsigned int relsec) +int arch_kexec_apply_relocations_add (struct purgatory_info *pi, +Elf_Shdr *section,const Elf_Shdr *relsec, +const Elf_Shdr *symtabsec) {unsigned int i;Elf64_Rela *rel;Elf64_Sym *sym;void *location; -Elf64_Shdr *section, *symtabsec;unsigned long address, sec_base, value;const char *strtab, *name, *shstrtab; +const Elf_Shdr *sechdrs; -/* -* ->sh_offset has been modified to keep the pointer to section -* contents in memory -*/ - rel = (void *)sechdrs[relsec].sh_offset; - -/* Section to which relocations apply */ - section = &sechdrs[sechdrs[relsec].sh_info]; - -pr_debug ("Applying relocate section %u to %u\n" , relsec, - sechdrs[relsec].sh_info); - -/* Associated symbol table */ - symtabsec = &sechdrs[sechdrs[relsec].sh_link]; - -/* String table */ -if (symtabsec->sh_link >= ehdr->e_shnum) { -/* Invalid strtab section number */ -pr_err ("Invalid string table section index %d\n" , - symtabsec->sh_link); -return -ENOEXEC ; - } +/* String & section header string table */ + sechdrs = (void *)pi->ehdr + pi->ehdr->e_shoff; + strtab = (char *)pi->ehdr + sechdrs[symtabsec->sh_link].sh_offset; + shstrtab = (char *)pi->ehdr + sechdrs[pi->ehdr->e_shstrndx].sh_offset; - strtab = (char *)sechdrs[symtabsec->sh_link].sh_offset; + rel = (void *)pi->ehdr + relsec->sh_offset; -/* section header string table */ - shstrtab = (char *)sechdrs[ehdr->e_shstrndx].sh_offset; +pr_debug ("Applying relocate section %s to %u\n" , + shstrtab + relsec->sh_name, relsec->sh_info); -for (i =0 ; i < sechdrs[relsec].sh_size /sizeof (*rel); i++) { +for (i =0 ; i < relsec->sh_size /sizeof (*rel); i++) {/* * rel[i].r_offset contains byte offset from beginning
@@ -490,8 +474,8 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,* to apply. ELF64_R_SYM() and ELF64_R_TYPE() macros get * these respectively. */ - sym = (Elf64_Sym *)symtabsec->sh_offset + -ELF64_R_SYM (rel[i].r_info); + sym = (void *)pi->ehdr + symtabsec->sh_offset; + sym +=ELF64_R_SYM (rel[i].r_info);if (sym->st_name) name = strtab + sym->st_name;
@@ -514,12 +498,12 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,if (sym->st_shndx ==SHN_ABS ) sec_base =0 ; -else if (sym->st_shndx >= ehdr->e_shnum) { +else if (sym->st_shndx >= pi->ehdr->e_shnum) {pr_err ("Invalid section %d for symbol %s\n" , sym->st_shndx, name);return -ENOEXEC ; }else - sec_base = sechdrs[sym->st_shndx].sh_addr; + sec_base = pi->sechdrs[sym->st_shndx].sh_addr; value = sym->st_value; value += sec_base;
include/linux/kexec.h +8 -4
@@ -290,10 +290,14 @@ void * __weak arch_kexec_kernel_image_load(struct kimage *image);int __weak arch_kimage_file_post_load_cleanup (struct kimage *image);int __weak arch_kexec_kernel_verify_sig (struct kimage *image,void *buf,unsigned long buf_len); -int __weak arch_kexec_apply_relocations_add (const Elf_Ehdr *ehdr, -Elf_Shdr *sechdrs,unsigned int relsec); -int __weak arch_kexec_apply_relocations (const Elf_Ehdr *ehdr,Elf_Shdr *sechdrs, -unsigned int relsec); +int __weak arch_kexec_apply_relocations_add (struct purgatory_info *pi, +Elf_Shdr *section, +const Elf_Shdr *relsec, +const Elf_Shdr *symtab); +int __weak arch_kexec_apply_relocations (struct purgatory_info *pi, +Elf_Shdr *section, +const Elf_Shdr *relsec, +const Elf_Shdr *symtab);void arch_kexec_protect_crashkres (void );void arch_kexec_unprotect_crashkres (void );
kernel/kexec_file.c +42 -21
99 lines not on this page · raw message
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 6/17 kexec_file: Split up __kexec_load_puragory
In reply to Philipp RudoWhen inspecting __kexec_load_purgatory you find that it has two tasks
1) setting up the kexec_buffer for the new kernel and,
2) setting up pi->sechdrs for the final load address.
The two tasks are independent of each other. To improve readability split up __kexec_load_purgatory into two functions, one for each task, and call them directly from kexec_load_purgatory.
--- kernel/kexec_file.c | 200 +++++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 97 deletions(-)
kernel/kexec_file.c +103 -97
@@ -649,39 +649,97 @@ static int kexec_calculate_store_digests(struct kimage *image)return ret; } -/* Actually load purgatory. Lot of code taken from kexec-tools */ -static int __kexec_load_purgatory (struct kimage *image,unsigned long min, -unsigned long max,int top_down) +/* +* kexec_purgatory_setup_kbuf - prepare buffer to load purgatory. +* @pi: Purgatory to be loaded. +* @kbuf: Buffer to setup. +* +* Allocates the memory needed for the buffer. Caller is responsible to free +* the memory after use. +* +* Return: 0 on success, negative errno on error. +*/ +static int kexec_purgatory_setup_kbuf (struct purgatory_info *pi, +struct kexec_buf *kbuf) { -struct purgatory_info *pi = &image->purgatory_info; -unsigned long align, bss_align, bss_sz, bss_pad; -unsigned long entry, load_addr, curr_load_addr, bss_addr, offset; -unsigned char *buf_addr, *src; -int i, ret =0 , entry_sidx =-1 ; -const Elf_Shdr *sechdrs_c; -Elf_Shdr *sechdrs =NULL ; -struct kexec_buf kbuf = { .image = image, .bufsz =0 , .buf_align =1 , - .buf_min = min, .buf_max = max, - .top_down = top_down }; +const Elf_Shdr *sechdrs; +unsigned long bss_align; +unsigned long bss_sz; +unsigned long align; +int i, ret; -/* -* sechdrs_c points to section headers in purgatory and are read -* only. No modifications allowed. -*/ - sechdrs_c = (void *)pi->ehdr + pi->ehdr->e_shoff; + sechdrs = (void *)pi->ehdr + pi->ehdr->e_shoff; + bss_align =1 ; + bss_sz =0 ; + +for (i =0 ; i < pi->ehdr->e_shnum; i++) { +if (!(sechdrs[i].sh_flags &SHF_ALLOC )) +continue ; + + align = sechdrs[i].sh_addralign; +if (sechdrs[i].sh_type !=SHT_NOBITS ) { +if (kbuf->buf_align < align) + kbuf->buf_align = align; + kbuf->bufsz =ALIGN (kbuf->bufsz, align); + kbuf->bufsz += sechdrs[i].sh_size; + }else { +if (bss_align < align) + bss_align = align; + bss_sz =ALIGN (bss_sz, align); + bss_sz += sechdrs[i].sh_size; + } + } + kbuf->bufsz =ALIGN (kbuf->bufsz, bss_align); + kbuf->memsz = kbuf->bufsz + bss_sz; +if (kbuf->buf_align < bss_align) + kbuf->buf_align = bss_align; + + kbuf->buffer =vzalloc (kbuf->bufsz); +if (!kbuf->buffer) +return -ENOMEM ; + pi->purgatory_buf = kbuf->buffer; + + ret =kexec_add_buffer (kbuf); +if (ret) + goto out; + pi->purgatory_load_addr = kbuf->mem; + +return 0 ; +out: +vfree (pi->purgatory_buf); + pi->purgatory_buf =NULL ; +return ret; +} + +/* +* kexec_purgatory_setup_sechdrs - prepares the pi->sechdrs buffer. +* @pi: Purgatory to be loaded. +* @kbuf: Buffer prepared to store purgatory. +* +* Allocates the memory needed for the buffer. Caller is responsible to free +* the memory after use. +* +* Return: 0 on success, negative errno on error. +*/ +static int kexec_purgatory_setup_sechdrs (struct purgatory_info *pi, +struct kexec_buf *kbuf) +{ +unsigned long curr_load_addr; +unsigned long load_addr; +unsigned long bss_addr; +unsigned long offset; +unsigned char *buf_addr; +unsigned char *src; +Elf_Shdr *sechdrs; +int entry_sidx =-1 ; +int i; -/* -* We can not modify sechdrs_c[] and its fields. It is read only. -* Copy it over to a local copy where one can store some temporary -* data and free it at the end. We need to modify ->sh_addr and -* ->sh_offset fields to keep track of permanent and temporary -* locations of sections. -*/ sechdrs =vzalloc (pi->ehdr->e_shnum *sizeof (Elf_Shdr));if (!sechdrs)return -ENOMEM ; - -memcpy (sechdrs, sechdrs_c, pi->ehdr->e_shnum *sizeof (Elf_Shdr)); +memcpy (sechdrs, (void *)pi->ehdr + pi->ehdr->e_shoff, + pi->ehdr->e_shnum *sizeof (Elf_Shdr)); + pi->sechdrs = sechdrs;/* * We seem to have multiple copies of sections. First copy is which
@@ -709,7 +767,7 @@ static int __kexec_load_purgatory(struct kimage *image, unsigned long min,* Identify entry point section and make entry relative to section * start. */ - entry = pi->ehdr->e_entry; + kbuf->image->start = pi->ehdr->e_entry;for (i =0 ; i < pi->ehdr->e_shnum; i++) {if (!(sechdrs[i].sh_flags &SHF_ALLOC ))continue ;
@@ -722,63 +780,19 @@ static int __kexec_load_purgatory(struct kimage *image, unsigned long min, ((sechdrs[i].sh_addr + sechdrs[i].sh_size) > pi->ehdr->e_entry)) { entry_sidx = i; - entry -= sechdrs[i].sh_addr; + kbuf->image->start -= sechdrs[i].sh_addr;break ; } } -/* Determine how much memory is needed to load relocatable object. */ - bss_align =1 ; - bss_sz =0 ; - -for (i =0 ; i < pi->ehdr->e_shnum; i++) { -if (!(sechdrs[i].sh_flags &SHF_ALLOC )) -continue ; - - align = sechdrs[i].sh_addralign; -if (sechdrs[i].sh_type !=SHT_NOBITS ) { -if (kbuf.buf_align < align) - kbuf.buf_align = align; - kbuf.bufsz =ALIGN (kbuf.bufsz, align); - kbuf.bufsz += sechdrs[i].sh_size; - }else { -/* bss section */ -if (bss_align < align) - bss_align = align; - bss_sz =ALIGN (bss_sz, align); - bss_sz += sechdrs[i].sh_size; - } - } - -/* Determine the bss padding required to align bss properly */ - bss_pad =0 ; -if (kbuf.bufsz & (bss_align -1 )) - bss_pad = bss_align - (kbuf.bufsz & (bss_align -1 )); - - kbuf.memsz = kbuf.bufsz + bss_pad + bss_sz; - -/* Allocate buffer for purgatory */ - kbuf.buffer =vzalloc (kbuf.bufsz); -if (!kbuf.buffer) { - ret = -ENOMEM ; - goto out; - } - -if (kbuf.buf_align < bss_align) - kbuf.buf_align = bss_align; - -/* Add buffer to segment list */ - ret =kexec_add_buffer (&kbuf); -if (ret) - goto out; - pi->purgatory_load_addr = kbuf.mem; -/* Load SHF_ALLOC sections */ - buf_addr = kbuf.buffer; - load_addr = curr_load_addr = pi->purgatory_load_addr; - bss_addr = load_addr + kbuf.bufsz + bss_pad; + buf_addr = kbuf->buffer; + load_addr = curr_load_addr = kbuf->mem; + bss_addr = load_addr + kbuf->bufsz;for (i =0 ; i < pi->ehdr->e_shnum; i++) { +unsigned long align; +if (!(sechdrs[i].sh_flags &SHF_ALLOC ))continue ;
@@ -810,24 +824,9 @@ static int __kexec_load_purgatory(struct kimage *image, unsigned long min,/* Update entry point based on load address of text section */ if (entry_sidx >=0 ) - entry += sechdrs[entry_sidx].sh_addr; - -/* Make kernel jump to purgatory after shutdown */ - image->start = entry; - -/* Used later to get/set symbol values */ - pi->sechdrs = sechdrs; + kbuf->image->start += sechdrs[entry_sidx].sh_addr; -/* -* Used later to identify which section is purgatory and skip it -* from checksumming. -*/ - pi->purgatory_buf = kbuf.buffer; -return ret; -out: -vfree (sechdrs); -vfree (kbuf.buffer); -return ret; +return 0 ; }static int kexec_apply_relocations (struct kimage *image)
@@ -897,16 +896,23 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min, {struct purgatory_info *pi = &image->purgatory_info;int ret; +struct kexec_buf kbuf = { .image = image, .bufsz =0 , .buf_align =1 , + .buf_min = min, .buf_max = max, + .top_down = top_down };if (kexec_purgatory_size <=0 )return -EINVAL ; pi->ehdr = (const Elf_Ehdr *)kexec_purgatory; - ret =__kexec_load_purgatory (image, min, max, top_down); + ret =kexec_purgatory_setup_kbuf (pi, &kbuf);if (ret)return ret; + ret =kexec_purgatory_setup_sechdrs (pi, &kbuf); +if (ret) + goto out_free_kbuf; + ret =kexec_apply_relocations (image);if (ret) goto out;
@@ -916,7 +922,7 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min, out:vfree (pi->sechdrs); pi->sechdrs =NULL ; - +out_free_kbuf:vfree (pi->purgatory_buf); pi->purgatory_buf =NULL ;return ret;
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 7/17 kexec_file: Simplify kexec_purgatory_setup_sechdrs 1
In reply to Philipp RudoTo update the entry point there is an extra loop over all section headers although this can be done in the main loop. So move it there and eliminate the extra loop and variable to store the 'entry section index'.
Also, in the main loop, move the usual case, i.e. non-bss section, out of the extra if-block.
--- kernel/kexec_file.c | 76 +++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 46 deletions(-)
kernel/kexec_file.c +30 -46
@@ -731,7 +731,6 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,unsigned char *buf_addr;unsigned char *src;Elf_Shdr *sechdrs; -int entry_sidx =-1 ;int i; sechdrs =vzalloc (pi->ehdr->e_shnum *sizeof (Elf_Shdr));
@@ -763,32 +762,11 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi, sechdrs[i].sh_offset; } -/* -* Identify entry point section and make entry relative to section -* start. -*/ - kbuf->image->start = pi->ehdr->e_entry; -for (i =0 ; i < pi->ehdr->e_shnum; i++) { -if (!(sechdrs[i].sh_flags &SHF_ALLOC )) -continue ; - -if (!(sechdrs[i].sh_flags &SHF_EXECINSTR )) -continue ; - -/* Make entry section relative */ -if (sechdrs[i].sh_addr <= pi->ehdr->e_entry && - ((sechdrs[i].sh_addr + sechdrs[i].sh_size) > - pi->ehdr->e_entry)) { - entry_sidx = i; - kbuf->image->start -= sechdrs[i].sh_addr; -break ; - } - } -/* Load SHF_ALLOC sections */ buf_addr = kbuf->buffer; load_addr = curr_load_addr = kbuf->mem; bss_addr = load_addr + kbuf->bufsz; + kbuf->image->start = pi->ehdr->e_entry;for (i =0 ; i < pi->ehdr->e_shnum; i++) {unsigned long align;
@@ -797,34 +775,40 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,continue ; align = sechdrs[i].sh_addralign; -if (sechdrs[i].sh_type !=SHT_NOBITS ) { - curr_load_addr =ALIGN (curr_load_addr, align); - offset = curr_load_addr - load_addr; -/* We already modifed ->sh_offset to keep src addr */ - src = (char *) sechdrs[i].sh_offset; -memcpy (buf_addr + offset, src, sechdrs[i].sh_size); - -/* Store load address and source address of section */ - sechdrs[i].sh_addr = curr_load_addr; - -/* -* This section got copied to temporary buffer. Update -* ->sh_offset accordingly. -*/ - sechdrs[i].sh_offset = (unsigned long )(buf_addr + offset); - -/* Advance to the next address */ - curr_load_addr += sechdrs[i].sh_size; - }else { + +if (sechdrs[i].sh_type ==SHT_NOBITS ) { bss_addr =ALIGN (bss_addr, align); sechdrs[i].sh_addr = bss_addr; bss_addr += sechdrs[i].sh_size; +continue ; + } + + curr_load_addr =ALIGN (curr_load_addr, align); + offset = curr_load_addr - load_addr; +/* We already modifed ->sh_offset to keep src addr */ + src = (char *)sechdrs[i].sh_offset; +memcpy (buf_addr + offset, src, sechdrs[i].sh_size); + +if (sechdrs[i].sh_flags &SHF_EXECINSTR && + pi->ehdr->e_entry >= sechdrs[i].sh_addr && + pi->ehdr->e_entry < (sechdrs[i].sh_addr + + sechdrs[i].sh_size)) { + kbuf->image->start -= sechdrs[i].sh_addr; + kbuf->image->start += curr_load_addr } - } -/* Update entry point based on load address of text section */ -if (entry_sidx >=0 ) - kbuf->image->start += sechdrs[entry_sidx].sh_addr; +/* Store load address and source address of section */ + sechdrs[i].sh_addr = curr_load_addr; + +/* +* This section got copied to temporary buffer. Update +* ->sh_offset accordingly. +*/ + sechdrs[i].sh_offset = (unsigned long )(buf_addr + offset); + +/* Advance to the next address */ + curr_load_addr += sechdrs[i].sh_size; + }return 0 ; }
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 8/17 kexec_file: Simplify kexec_purgatory_setup_sechdrs 2
In reply to Philipp RudoThe main loop currently uses quite a lot of variables to update the section headers. Some of them are unnecessary. So clean them up a little.
--- kernel/kexec_file.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-)
kernel/kexec_file.c +12 -22
@@ -724,12 +724,8 @@ static int kexec_purgatory_setup_kbuf(struct purgatory_info *pi,static int kexec_purgatory_setup_sechdrs (struct purgatory_info *pi,struct kexec_buf *kbuf) { -unsigned long curr_load_addr; -unsigned long load_addr;unsigned long bss_addr;unsigned long offset; -unsigned char *buf_addr; -unsigned char *src;Elf_Shdr *sechdrs;int i;
@@ -762,20 +758,18 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi, sechdrs[i].sh_offset; } -/* Load SHF_ALLOC sections */ - buf_addr = kbuf->buffer; - load_addr = curr_load_addr = kbuf->mem; - bss_addr = load_addr + kbuf->bufsz; + offset =0 ; + bss_addr = kbuf->mem + kbuf->bufsz; kbuf->image->start = pi->ehdr->e_entry;for (i =0 ; i < pi->ehdr->e_shnum; i++) {unsigned long align; +void *src, *dst;if (!(sechdrs[i].sh_flags &SHF_ALLOC ))continue ; align = sechdrs[i].sh_addralign; -if (sechdrs[i].sh_type ==SHT_NOBITS ) { bss_addr =ALIGN (bss_addr, align); sechdrs[i].sh_addr = bss_addr;
@@ -783,31 +777,27 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,continue ; } - curr_load_addr =ALIGN (curr_load_addr, align); - offset = curr_load_addr - load_addr; -/* We already modifed ->sh_offset to keep src addr */ - src = (char *)sechdrs[i].sh_offset; -memcpy (buf_addr + offset, src, sechdrs[i].sh_size); - + offset =ALIGN (offset, align);if (sechdrs[i].sh_flags &SHF_EXECINSTR && pi->ehdr->e_entry >= sechdrs[i].sh_addr && pi->ehdr->e_entry < (sechdrs[i].sh_addr + sechdrs[i].sh_size)) { kbuf->image->start -= sechdrs[i].sh_addr; - kbuf->image->start += curr_load_addr + kbuf->image->start += kbuf->mem + offset; } -/* Store load address and source address of section */ - sechdrs[i].sh_addr = curr_load_addr; + src = (void *)sechdrs[i].sh_offset; + dst = pi->purgatory_buf + offset; +memcpy (dst, src, sechdrs[i].sh_size); + + sechdrs[i].sh_addr = kbuf->mem + offset;/* * This section got copied to temporary buffer. Update * ->sh_offset accordingly. */ - sechdrs[i].sh_offset = (unsigned long )(buf_addr + offset); - -/* Advance to the next address */ - curr_load_addr += sechdrs[i].sh_size; + sechdrs[i].sh_offset = (unsigned long )dst; + offset += sechdrs[i].sh_size; }return 0 ;
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 9/17 kexec_file: Remove mis-use of sh_offset field
In reply to Philipp RudoThe current code uses the sh_offset field in purgatory_info->sechdrs to store a pointer to the current load address of the section. Depending whether the section will be loaded or not this is either a pointer into purgatory_info->purgatory_buf or kexec_purgatory. This is not only a violation of the ELF standard but also makes the code very hard to understand as you cannot tell if the memory you are using is read-only or not.
Remove this mis-use and store the offset of the section in pugaroty_info->purgatory_buf in sh_offset.
--- arch/x86/kernel/machine_kexec_64.c | 10 ++++++---- kernel/kexec_file.c | 33 +++------------------------------ 2 files changed, 9 insertions(+), 34 deletions(-)
arch/x86/kernel/machine_kexec_64.c +6 -4
@@ -457,13 +457,15 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,* rel[i].r_offset contains byte offset from beginning * of section to the storage unit affected. * -* This is location to update (->sh_offset). This is temporary -* buffer where section is currently loaded. This will finally -* be loaded to a different address later, pointed to by +* This is location to update. This is temporary buffer +* where section is currently loaded. This will finally be +* loaded to a different address later, pointed to by * ->sh_addr. kexec takes care of moving it * (kexec_load_segment()). */ - location = (void *)(section->sh_offset + rel[i].r_offset); + location = pi->purgatory_buf; + location += section->sh_offset; + location += rel[i].r_offset;/* Final address of the location */ address = section->sh_addr + rel[i].r_offset;
kernel/kexec_file.c +3 -30
@@ -736,28 +736,6 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi, pi->ehdr->e_shnum * sizeof(Elf_Shdr)); pi->sechdrs = sechdrs; -/* -* We seem to have multiple copies of sections. First copy is which -* is embedded in kernel in read only section. Some of these sections -* will be copied to a temporary buffer and relocated. And these -* sections will finally be copied to their final destination at -* segment load time. -* -* Use ->sh_offset to reflect section address in memory. It will -* point to original read only copy if section is not allocatable. -* Otherwise it will point to temporary copy which will be relocated. -* -* Use ->sh_addr to contain final address of the section where it -* will go during execution time. -*/ -for (i =0 ; i < pi->ehdr->e_shnum; i++) { -if (sechdrs[i].sh_type ==SHT_NOBITS ) -continue ; - - sechdrs[i].sh_offset = (unsigned long )pi->ehdr + - sechdrs[i].sh_offset; - } - offset =0 ; bss_addr = kbuf->mem + kbuf->bufsz; kbuf->image->start = pi->ehdr->e_entry;
@@ -786,17 +764,12 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi, kbuf->image->start += kbuf->mem + offset; } - src = (void *)sechdrs[i].sh_offset; + src = (void *)pi->ehdr + sechdrs[i].sh_offset; dst = pi->purgatory_buf + offset;memcpy (dst, src, sechdrs[i].sh_size); sechdrs[i].sh_addr = kbuf->mem + offset; - -/* -* This section got copied to temporary buffer. Update -* ->sh_offset accordingly. -*/ - sechdrs[i].sh_offset = (unsigned long )dst; + sechdrs[i].sh_offset = offset; offset += sechdrs[i].sh_size; }
@@ -1006,7 +979,7 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name,return -EINVAL ; } - sym_buf = (char *)sec->sh_offset + sym->st_value; + sym_buf = (char *)pi->purgatory_buf + sec->sh_offset + sym->st_value;if (get_value)memcpy ((void *)buf, sym_buf, size);
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 10/17 kexec_file: Allow archs to set purgatory load address
In reply to Philipp RudoFor s390 new kernels are loaded to fixed addresses in memory before they are booted. With the current code this is a problem as it assumes the kernel will be loaded to an 'arbitrary' address. In particular, kexec_locate_mem_hole searches for a large enough memory region and sets the load address (kexec_bufer->mem) to it.
Luckily there is a simple workaround for this problem. By returning 1 in arch_kexec_walk_mem, kexec_locate_mem_hole is turned off. This allows the architecture to set kbuf->mem by hand. While the trick works fine for the kernel it does not for the purgatory as here the architectures don't have access to its kexec_buffer.
Give architectures access to the purgatories kexec_buffer by changing kexec_load_purgatory to take a pointer to it. With this change architectures have access to the buffer and can edit it as they need.
A nice side effect of this change is that we can get rid of the purgatory_info->purgatory_load_address field. As now the information stored there can directly be accessed from kbuf->mem.
--- arch/powerpc/kernel/kexec_elf_64.c | 9 +++++---- arch/x86/kernel/kexec-bzimage64.c | 8 ++++---- include/linux/kexec.h | 7 +------ kernel/kexec_file.c | 29 ++++++++++++++++------------- 4 files changed, 26 insertions(+), 27 deletions(-)
arch/powerpc/kernel/kexec_elf_64.c +5 -4
@@ -572,7 +572,7 @@ static void *elf64_load(struct kimage *image, char *kernel_buf, {int ret;unsigned int fdt_size; -unsigned long kernel_load_addr, purgatory_load_addr; +unsigned long kernel_load_addr;unsigned long initrd_load_addr =0 , fdt_load_addr;void *fdt;const void *slave_code;
@@ -580,6 +580,8 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,struct elf_info elf_info;struct kexec_buf kbuf = { .image = image, .buf_min =0 , .buf_max = ppc64_rma_size }; +struct kexec_buf pbuf = { .image = image, .buf_min =0 , + .buf_max = ppc64_rma_size, .top_down = true }; ret =build_elf_exec_info (kernel_buf, kernel_len, &ehdr, &elf_info);if (ret)
@@ -591,14 +593,13 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,pr_debug ("Loaded the kernel at 0x%lx\n" , kernel_load_addr); - ret =kexec_load_purgatory (image,0 , ppc64_rma_size, true, - &purgatory_load_addr); + ret =kexec_load_purgatory (image, &pbuf);if (ret) {pr_err ("Loading purgatory failed.\n" ); goto out; } -pr_debug ("Loaded purgatory at 0x%lx\n" , purgatory_load_addr); +pr_debug ("Loaded purgatory at 0x%lx\n" , pbuf.mem);if (initrd !=NULL ) { kbuf.buffer = initrd;
arch/x86/kernel/kexec-bzimage64.c +4 -4
@@ -334,7 +334,6 @@ static void *bzImage64_load(struct kimage *image, char *kernel,unsigned long setup_header_size, params_cmdline_sz;struct boot_params *params;unsigned long bootparam_load_addr, kernel_load_addr, initrd_load_addr; -unsigned long purgatory_load_addr;struct bzimage64_data *ldata;struct kexec_entry64_regs regs64;void *stack;
@@ -342,6 +341,8 @@ static void *bzImage64_load(struct kimage *image, char *kernel,unsigned int efi_map_offset, efi_map_sz, efi_setup_data_offset;struct kexec_buf kbuf = { .image = image, .buf_max =ULONG_MAX , .top_down = true }; +struct kexec_buf pbuf = { .image = image, .buf_min =MIN_PURGATORY_ADDR , + .buf_max =ULONG_MAX , .top_down = true }; header = (struct setup_header *)(kernel + setup_hdr_offset); setup_sects = header->setup_sects;
@@ -379,14 +380,13 @@ static void *bzImage64_load(struct kimage *image, char *kernel,* Load purgatory. For 64bit entry point, purgatory code can be * anywhere. */ - ret =kexec_load_purgatory (image,MIN_PURGATORY_ADDR ,ULONG_MAX ,1 , - &purgatory_load_addr); + ret =kexec_load_purgatory (image, &pbuf);if (ret) {pr_err ("Loading purgatory failed\n" );return ERR_PTR (ret); } -pr_debug ("Loaded purgatory at 0x%lx\n" , purgatory_load_addr); +pr_debug ("Loaded purgatory at 0x%lx\n" , pbuf.mem);/*
include/linux/kexec.h +1 -6
@@ -114,9 +114,6 @@ struct purgatory_info {* relocation. This memory can be freed post image load. */ void *purgatory_buf; - -/* Address where purgatory is finally loaded and is executed from */ -unsigned long purgatory_load_addr; };struct kimage ;
@@ -237,9 +234,7 @@ extern asmlinkage long sys_kexec_load(unsigned long entry,extern int kernel_kexec (void );extern struct page *kimage_alloc_control_pages (struct kimage *image,unsigned int order); -extern int kexec_load_purgatory (struct kimage *image,unsigned long min, -unsigned long max,int top_down, -unsigned long *load_addr); +extern int kexec_load_purgatory (struct kimage *image,struct kexec_buf *kbuf);extern int kexec_purgatory_get_set_symbol (struct kimage *image,const char *name,void *buf,unsigned int size,bool get_value);
kernel/kexec_file.c +16 -13
@@ -669,8 +669,8 @@ static int kexec_purgatory_setup_kbuf(struct purgatory_info *pi,int i, ret; sechdrs = (void *)pi->ehdr + pi->ehdr->e_shoff; - bss_align =1 ; - bss_sz =0 ; + kbuf->buf_align = bss_align =1 ; + kbuf->bufsz = bss_sz =0 ;for (i =0 ; i < pi->ehdr->e_shnum; i++) {if (!(sechdrs[i].sh_flags &SHF_ALLOC ))
@@ -702,7 +702,6 @@ static int kexec_purgatory_setup_kbuf(struct purgatory_info *pi, ret =kexec_add_buffer (kbuf);if (ret) goto out; - pi->purgatory_load_addr = kbuf->mem;return 0 ; out:
@@ -836,27 +835,32 @@ static int kexec_apply_relocations(struct kimage *image)return 0 ; } -/* Load relocatable purgatory object and relocate it appropriately */ -int kexec_load_purgatory (struct kimage *image,unsigned long min, -unsigned long max,int top_down, -unsigned long *load_addr) +/* +* kexec_load_purgatory - Load and relocate the purgatory object. +* @image: Image to add the purgatory to. +* @kbuf: Memory parameters to use. +* +* Allocates the memory needed for image->purgatory_info.sechdrs and +* image->purgatory_info.purgatory_buf/kbuf->buffer. Caller is responsible +* to free the memory after use. +* +* Return: 0 on success, negative errno on error. +*/ +int kexec_load_purgatory (struct kimage *image,struct kexec_buf *kbuf) {struct purgatory_info *pi = &image->purgatory_info;int ret; -struct kexec_buf kbuf = { .image = image, .bufsz =0 , .buf_align =1 , - .buf_min = min, .buf_max = max, - .top_down = top_down };if (kexec_purgatory_size <=0 )return -EINVAL ; pi->ehdr = (const Elf_Ehdr *)kexec_purgatory; - ret =kexec_purgatory_setup_kbuf (pi, &kbuf); + ret =kexec_purgatory_setup_kbuf (pi, kbuf);if (ret)return ret; - ret =kexec_purgatory_setup_sechdrs (pi, &kbuf); + ret =kexec_purgatory_setup_sechdrs (pi, kbuf);if (ret) goto out_free_kbuf;
@@ -864,7 +868,6 @@ int kexec_load_purgatory(struct kimage *image, unsigned long min,if (ret) goto out; - *load_addr = pi->purgatory_load_addr;return 0 ; out:vfree (pi->sechdrs);
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 11/17 kexec_file: Move purgatories sha256 to common code
In reply to Philipp RudoThe code to verify the new kernels sha digest are applicable for all architectures. Move it to common code.
---
arch/x86/purgatory/Makefile | 3 +++
arch/x86/purgatory/purgatory.c | 2 +-
{arch/x86/purgatory => include/linux}/sha256.h | 10 +++++++++-
{arch/x86/purgatory => lib}/sha256.c | 4 ++--
4 files changed, 15 insertions(+), 4 deletions(-)
rename {arch/x86/purgatory => include/linux}/sha256.h (63%)
rename {arch/x86/purgatory => lib}/sha256.c (99%)arch/x86/purgatory/Makefile +3 -0
@@ -6,6 +6,9 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string targets += $(purgatory-y) PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) +$(obj)/sha256.o: $(srctree)/lib/sha256.c + $(call if_changed_rule,cc_o_c) + LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib targets += purgatory.ro
arch/x86/purgatory/purgatory.c +1 -1
@@ -11,9 +11,9 @@*/ #include <linux/bug.h> +#include <linux/sha256.h> #include <asm/purgatory.h> -#include "sha256.h" #include "../boot/string.h" unsigned long purgatory_backup_dest __section(.kexec-purgatory);
include/linux/sha256.h renamed from arch/x86/purgatory/sha256.h +9 -1
@@ -13,9 +13,17 @@#include <linux/types.h> #include <crypto/sha.h> +/* Stand-alone implementation of the SHA256 algorithm. It is designed to +* have as little dependencies as possible so it can be used in the +* kexec_file purgatory. In other cases you should use the implementation in +* crypto/. +* +* For details see lib/sha256.c +*/ +extern int sha256_init (struct sha256_state *sctx);extern int sha256_update (struct sha256_state *sctx,const u8 *input, -unsigned int length); +unsigned int length);extern int sha256_final (struct sha256_state *sctx,u8 *hash);#endif /* SHA256_H */
lib/sha256.c renamed from arch/x86/purgatory/sha256.c +2 -2
@@ -16,9 +16,9 @@*/ #include <linux/bitops.h> +#include <linux/sha256.h> +#include <linux/string.h> #include <asm/byteorder.h> -#include "sha256.h" -#include "../boot/string.h" static inline u32 Ch (u32 x,u32 y,u32 z) {
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 12/17 s390/kexec_file: Prepare setup.h for kexec_file_load
In reply to Philipp Rudokexec_file_load needs to prepare the new kernels before they are loaded. For that it has to know the offsets in head.S, e.g. to register the new command line. Unfortunately there are no macros right now defining those offsets. Define them now.
--- arch/s390/include/asm/setup.h | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-)
arch/s390/include/asm/setup.h +27 -13
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* * S390 version -* Copyright IBM Corp. 1999, 2010 +* Copyright IBM Corp. 1999, 2017 */ #ifndef _ASM_S390_SETUP_H#define _ASM_S390_SETUP_H
@@ -38,17 +38,31 @@#define LPP_MAGIC _BITUL(31)#define LPP_PID_MASK _AC(0xffffffff, UL) +/* Offsets to entry points in kernel/head.S */ + +#define STARTUP_NORMAL_OFFSET 0x10000 +#define STARTUP_KDUMP_OFFSET 0x10010 + +/* Offsets to parameters in kernel/head.S */ + +#define IPL_DEVICE_OFFSET 0x10400 +#define INITRD_START_OFFSET 0x10408 +#define INITRD_SIZE_OFFSET 0x10410 +#define OLDMEM_BASE_OFFSET 0x10418 +#define OLDMEM_SIZE_OFFSET 0x10420 +#define COMMAND_LINE_OFFSET 0x10480 +#ifndef __ASSEMBLY__#include <asm/lowcore.h> #include <asm/types.h> -#define IPL_DEVICE (*(unsigned long *) (0x10400)) -#define INITRD_START (*(unsigned long *) (0x10408)) -#define INITRD_SIZE (*(unsigned long *) (0x10410)) -#define OLDMEM_BASE (*(unsigned long *) (0x10418)) -#define OLDMEM_SIZE (*(unsigned long *) (0x10420)) -#define COMMAND_LINE ((char *) (0x10480)) +#define IPL_DEVICE (*(unsigned long *) (IPL_DEVICE_OFFSET)) +#define INITRD_START (*(unsigned long *) (INITRD_START_OFFSET)) +#define INITRD_SIZE (*(unsigned long *) (INITRD_SIZE_OFFSET)) +#define OLDMEM_BASE (*(unsigned long *) (OLDMEM_BASE_OFFSET)) +#define OLDMEM_SIZE (*(unsigned long *) (OLDMEM_SIZE_OFFSET)) +#define COMMAND_LINE ((char *) (COMMAND_LINE_OFFSET))extern int memory_end_set;extern unsigned long memory_end;
@@ -123,12 +137,12 @@ extern void (*_machine_power_off)(void);#else /* __ASSEMBLY__ */ -#define IPL_DEVICE 0x10400 -#define INITRD_START 0x10408 -#define INITRD_SIZE 0x10410 -#define OLDMEM_BASE 0x10418 -#define OLDMEM_SIZE 0x10420 -#define COMMAND_LINE 0x10480 +#define IPL_DEVICE (IPL_DEVICE_OFFSET) +#define INITRD_START (INITRD_START_OFFSET) +#define INITRD_SIZE (INITRD_SIZE_OFFSET) +#define OLDMEM_BASE (OLDMEM_BASE_OFFSET) +#define OLDMEM_SIZE (OLDMEM_SIZE_OFFSET) +#define COMMAND_LINE (COMMAND_LINE_OFFSET)#endif /* __ASSEMBLY__ */ #endif /* _ASM_S390_SETUP_H */
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 13/17 s390/kexec_file: Add purgatory
In reply to Philipp RudoThe common code expects the architecture to have a purgatory that runs between the two kernels. Add it now. For simplicity first skip crash support.
--- arch/s390/Kbuild | 1 + arch/s390/include/asm/purgatory.h | 17 +++++++ arch/s390/kernel/asm-offsets.c | 5 ++ arch/s390/purgatory/Makefile | 37 +++++++++++++++ arch/s390/purgatory/head.S | 96 +++++++++++++++++++++++++++++++++++++++ arch/s390/purgatory/purgatory.c | 38 ++++++++++++++++ 6 files changed, 194 insertions(+) create mode 100644 arch/s390/include/asm/purgatory.h create mode 100644 arch/s390/purgatory/Makefile create mode 100644 arch/s390/purgatory/head.S create mode 100644 arch/s390/purgatory/purgatory.c
arch/s390/Kbuild +1 -0
@@ -8,3 +8,4 @@ obj-$(CONFIG_APPLDATA_BASE) += appldata/ obj-y += net/ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_NUMA) += numa/ +obj-y += purgatory/
arch/s390/include/asm/purgatory.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright IBM Corp. 2018 +* +* Author(s): Philipp Rudo <[email protected]> +*/ + +#ifndef _S390_PURGATORY_H_ +#define _S390_PURGATORY_H_ +#ifndef __ASSEMBLY__ + +#include <linux/purgatory.h> + +int verify_sha256_digest (void ); + +#endif /* __ASSEMBLY__ */ +#endif /* _S390_PURGATORY_H_ */
arch/s390/kernel/asm-offsets.c +5 -0
@@ -10,6 +10,7 @@#include <linux/kbuild.h> #include <linux/kvm_host.h> #include <linux/sched.h> +#include <linux/purgatory.h> #include <asm/idle.h> #include <asm/vdso.h> #include <asm/pgtable.h>
@@ -203,5 +204,9 @@ int main(void)OFFSET (__GMAP_ASCE, gmap, asce);OFFSET (__SIE_PROG0C, kvm_s390_sie_block, prog0c);OFFSET (__SIE_PROG20, kvm_s390_sie_block, prog20); +/* kexec_sha_region */ +OFFSET (__KEXEC_SHA_REGION_START, kexec_sha_region, start); +OFFSET (__KEXEC_SHA_REGION_LEN, kexec_sha_region, len); +DEFINE (__KEXEC_SHA_REGION_SIZE,sizeof (struct kexec_sha_region ));return 0 ; }
arch/s390/purgatory/Makefile new file +37 -0
@@ -0,0 +1,37 @@ +# SPDX-License-Identifier: GPL-2.0 + +OBJECT_FILES_NON_STANDARD := y + +purgatory-y := head.o purgatory.o string.o sha256.o mem.o + +targets += $(purgatory-y) purgatory.ro kexec-purgatory.c +PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) + +$(obj)/sha256.o: $(srctree)/lib/sha256.c + $(call if_changed_rule,cc_o_c) + +$(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S + $(call if_changed_rule,as_o_S) + +$(obj)/string.o: $(srctree)/arch/s390/lib/string.c + $(call if_changed_rule,cc_o_c) + +LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib +LDFLAGS_purgatory.ro += -z nodefaultlib +KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes +KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare +KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding +KBUILD_CFLAGS += -c -MD -Os -m64 +KBUILD_CFLAGS += $(call cc-option,-fno-PIE) + +$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE + $(call if_changed,ld) + +CMD_BIN2C = $(objtree)/scripts/basic/bin2c +quiet_cmd_bin2c = BIN2C $@ + cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@ + +$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE + $(call if_changed,bin2c) + +obj-y += kexec-purgatory.o
arch/s390/purgatory/head.S new file +96 -0
96 lines not on this page · raw message
arch/s390/purgatory/purgatory.c new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Purgatory code running between two kernels. +* +* Copyright IBM Corp. 2018 +* +* Author(s): Philipp Rudo <[email protected]> +*/ + +#include <linux/kexec.h> +#include <linux/sha256.h> +#include <linux/string.h> +#include <asm/purgatory.h> + +struct kexec_sha_region purgatory_sha_regions[KEXEC_SEGMENT_MAX ]; +u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE ]; + +u64 kernel_entry; + +int verify_sha256_digest (void ) +{ +struct kexec_sha_region *ptr, *end; +u8 digest[SHA256_DIGEST_SIZE ]; +struct sha256_state sctx; + +sha256_init (&sctx); + end = purgatory_sha_regions +ARRAY_SIZE (purgatory_sha_regions); + +for (ptr = purgatory_sha_regions; ptr < end; ptr++) +sha256_update (&sctx, (uint8_t *)(ptr->start), ptr->len); + +sha256_final (&sctx, digest); + +if (memcmp (digest, purgatory_sha256_digest,sizeof (digest))) +return 1 ; + +return 0 ; +}
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 14/17 s390/kexec_file: Add kexec_file_load system call
In reply to Philipp RudoThis patch adds the kexec_file_load system call to s390 as well as the arch specific functions common code requires to work. Loaders for the different file types will be added later.
--- arch/s390/Kconfig | 4 + arch/s390/kernel/Makefile | 1 + arch/s390/kernel/compat_wrapper.c | 1 + arch/s390/kernel/machine_kexec_file.c | 174 ++++++++++++++++++++++++++++++++++ arch/s390/kernel/syscalls/syscall.tbl | 1 + 5 files changed, 181 insertions(+) create mode 100644 arch/s390/kernel/machine_kexec_file.c
arch/s390/Kconfig +4 -0
@@ -51,6 +51,10 @@ config KEXEC def_bool y select KEXEC_CORE +config KEXEC_FILE + def_bool y + select KEXEC_CORE + config AUDIT_ARCH def_bool y
arch/s390/kernel/Makefile +1 -0
@@ -60,6 +60,7 @@ obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o +obj-y += machine_kexec_file.o extra-y += head.o head64.o vmlinux.lds
arch/s390/kernel/compat_wrapper.c +1 -0
@@ -182,3 +182,4 @@ COMPAT_SYSCALL_WRAP6(copy_file_range, int, fd_in, loff_t __user *, off_in, int, COMPAT_SYSCALL_WRAP2(s390_guarded_storage, int, command, struct gs_cb *, gs_cb); COMPAT_SYSCALL_WRAP5(statx, int, dfd, const char __user *, path, unsigned, flags, unsigned, mask, struct statx __user *, buffer); COMPAT_SYSCALL_WRAP4(s390_sthyi, unsigned long, code, void __user *, info, u64 __user *, rc, unsigned long, flags); +COMPAT_SYSCALL_WRAP5(kexec_file_load, int, kernel_fd, int, initrd_fd, unsigned long, cmdline_len, const char __user *, cmdline_ptr, unsigned long, flags)
arch/s390/kernel/machine_kexec_file.c new file +174 -0
174 lines not on this page · raw message
arch/s390/kernel/syscalls/syscall.tbl +1 -0
@@ -388,3 +388,4 @@ 378 common s390_guarded_storage sys_s390_guarded_storage compat_sys_s390_guarded_storage 379 common statx sys_statx compat_sys_statx 380 common s390_sthyi sys_s390_sthyi compat_sys_s390_sthyi +381 common kexec_file_load sys_kexec_file_load compat_sys_kexec_file_load
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 15/17 s390/kexec_file: Add image loader
In reply to Philipp RudoAdd an image loader for kexec_file_load. For simplicity first skip crash support. The functions defined in machine_kexec_file will later be shared with the ELF loader.
--- arch/s390/include/asm/kexec.h | 22 ++++++++++ arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/kexec_image.c | 80 +++++++++++++++++++++++++++++++++++ arch/s390/kernel/machine_kexec_file.c | 73 ++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 arch/s390/kernel/kexec_image.c
arch/s390/include/asm/kexec.h +22 -0
@@ -46,4 +46,26 @@static inline void crash_setup_regs (struct pt_regs *newregs,struct pt_regs *oldregs) { } +struct kimage ; +struct s390_load_data { +/* Pointer to the kernel buffer. Used to register cmdline etc.. */ +void *kernel_buf; + +/* Total size of loaded segments in memory. Used as an offset. */ +size_t memsz; + +/* Load address of initrd. Used to register INITRD_START in kernel. */ +unsigned long initrd_load_addr; +}; + +int kexec_file_add_purgatory (struct kimage *image, +struct s390_load_data *data); +int kexec_file_add_initrd (struct kimage *image, +struct s390_load_data *data, +char *initrd,unsigned long initrd_len); +void kexec_file_update_kernel (struct kimage *iamge, +struct s390_load_data *data); + +extern const struct kexec_file_ops s390_kexec_image_ops; +#endif /*_S390_KEXEC_H */
arch/s390/kernel/Makefile +1 -1
@@ -60,7 +60,7 @@ obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o -obj-y += machine_kexec_file.o +obj-y += machine_kexec_file.o kexec_image.o extra-y += head.o head64.o vmlinux.lds
arch/s390/kernel/kexec_image.c new file +80 -0
80 lines not on this page · raw message
arch/s390/kernel/machine_kexec_file.c +73 -0
82 lines not on this page · raw message
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 16/17 s390/kexec_file: Add crash support to image loader
In reply to Philipp RudoAdd support to load a crash kernel to the image loader. This requires extending the purgatory.
--- arch/s390/kernel/kexec_image.c | 6 +- arch/s390/kernel/machine_kexec_file.c | 45 ++++++++- arch/s390/purgatory/head.S | 185 +++++++++++++++++++++++++++++++++- arch/s390/purgatory/purgatory.c | 4 + 4 files changed, 234 insertions(+), 6 deletions(-)
arch/s390/kernel/kexec_image.c +2 -4
@@ -25,6 +25,8 @@ static int kexec_file_add_image_kernel(struct kimage *image, buf.bufsz = kernel_len -STARTUP_NORMAL_OFFSET ; buf.mem =STARTUP_NORMAL_OFFSET ; +if (image->type ==KEXEC_TYPE_CRASH ) + buf.mem += crashk_res.start; buf.memsz = buf.bufsz; ret =kexec_add_buffer (&buf);
@@ -43,10 +45,6 @@ static void *s390_image_load(struct kimage *image,struct s390_load_data data = {0 };int ret; -/* We don't support crash kernels yet. */ -if (image->type ==KEXEC_TYPE_CRASH ) -return ERR_PTR (-ENOTSUPP ); - ret =kexec_file_add_image_kernel (image, &data, kernel, kernel_len);if (ret)return ERR_PTR (ret);
arch/s390/kernel/machine_kexec_file.c +44 -1
71 lines not on this page · raw message
arch/s390/purgatory/head.S +184 -1
218 lines not on this page · raw message
arch/s390/purgatory/purgatory.c +4 -0
@@ -16,6 +16,10 @@ struct kexec_sha_region purgatory_sha_regions[KEXEC_SEGMENT_MAX];u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE ];u64 kernel_entry; +u64 kernel_type; + +u64 crash_start; +u64 crash_size;int verify_sha256_digest (void ) {
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH 17/17 s390/kexec_file: Add ELF loader
In reply to Philipp RudoAdd an ELF loader for kexec_file. The main task here is to do proper sanity checks on the ELF file. Basically all other functionality was already implemented for the image loader.
--- arch/s390/include/asm/kexec.h | 1 + arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/kexec_elf.c | 149 ++++++++++++++++++++++++++++++++++ arch/s390/kernel/machine_kexec_file.c | 1 + 4 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 arch/s390/kernel/kexec_elf.c
arch/s390/include/asm/kexec.h +1 -0
@@ -67,5 +67,6 @@ void kexec_file_update_kernel(struct kimage *iamge, struct s390_load_data *data);extern const struct kexec_file_ops s390_kexec_image_ops; +extern const struct kexec_file_ops s390_kexec_elf_ops;#endif /*_S390_KEXEC_H */
arch/s390/kernel/Makefile +1 -1
@@ -60,7 +60,7 @@ obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o als.o obj-y += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o -obj-y += machine_kexec_file.o kexec_image.o +obj-y += machine_kexec_file.o kexec_image.o kexec_elf.o extra-y += head.o head64.o vmlinux.lds
arch/s390/kernel/kexec_elf.c new file +149 -0
149 lines not on this page · raw message
arch/s390/kernel/machine_kexec_file.c +1 -0
@@ -12,6 +12,7 @@#include <asm/setup.h> const struct kexec_file_ops *const kexec_file_loaders[] = { + &s390_kexec_elf_ops, &s390_kexec_image_ops,NULL , };
Signature · 7 lines
2.13.5 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec