Skip to content

Commit

Permalink
s390/kexec_file: Unify loader code
Browse files Browse the repository at this point in the history 
s390_image_load and s390_elf_load have the same code to load the different
components. Combine this functionality in one shared function.

While at it move kexec_file_update_kernel into the new function as well.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Philipp Rudo authored and Martin Schwidefsky committed Apr 29, 2019
1 parent d0d249d commit 8e49642
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 84 deletions.
10 changes: 3 additions & 7 deletions arch/s390/include/asm/kexec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,9 @@ struct s390_load_data {
size_t memsz;
};

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);
int *kexec_file_update_kernel(struct kimage *iamge,
struct s390_load_data *data);
void *kexec_file_add_components(struct kimage *image,
int (*add_kernel)(struct kimage *image,
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;
Expand Down
31 changes: 7 additions & 24 deletions arch/s390/kernel/kexec_elf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
#include <linux/kexec.h>
#include <asm/setup.h>

static int kexec_file_add_elf_kernel(struct kimage *image,
struct s390_load_data *data,
char *kernel, unsigned long kernel_len)
static int kexec_file_add_kernel_elf(struct kimage *image,
struct s390_load_data *data)
{
struct kexec_buf buf;
const Elf_Ehdr *ehdr;
const Elf_Phdr *phdr;
Elf_Addr entry;
void *kernel;
int i, ret;

kernel = image->kernel_buf;
ehdr = (Elf_Ehdr *)kernel;
buf.image = image;
if (image->type == KEXEC_TYPE_CRASH)
Expand Down Expand Up @@ -62,19 +63,18 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz;
}

return 0;
return data->memsz ? 0 : -EINVAL;
}

static void *s390_elf_load(struct kimage *image,
char *kernel, unsigned long kernel_len,
char *initrd, unsigned long initrd_len,
char *cmdline, unsigned long cmdline_len)
{
struct s390_load_data data = {0};
const Elf_Ehdr *ehdr;
const Elf_Phdr *phdr;
size_t size;
int i, ret;
int i;

/* image->fobs->probe already checked for valid ELF magic number. */
ehdr = (Elf_Ehdr *)kernel;
Expand Down Expand Up @@ -107,24 +107,7 @@ static void *s390_elf_load(struct kimage *image,
if (size > kernel_len)
return ERR_PTR(-EINVAL);

ret = kexec_file_add_elf_kernel(image, &data, kernel, kernel_len);
if (ret)
return ERR_PTR(ret);

if (!data.memsz)
return ERR_PTR(-EINVAL);

if (initrd) {
ret = kexec_file_add_initrd(image, &data, initrd, initrd_len);
if (ret)
return ERR_PTR(ret);
}

ret = kexec_file_add_purgatory(image, &data);
if (ret)
return ERR_PTR(ret);

return kexec_file_update_kernel(image, &data);
return kexec_file_add_components(image, kexec_file_add_kernel_elf);
}

static int s390_elf_probe(const char *buf, unsigned long len)
Expand Down
37 changes: 8 additions & 29 deletions arch/s390/kernel/kexec_image.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,55 +12,34 @@
#include <linux/kexec.h>
#include <asm/setup.h>

static int kexec_file_add_image_kernel(struct kimage *image,
struct s390_load_data *data,
char *kernel, unsigned long kernel_len)
static int kexec_file_add_kernel_image(struct kimage *image,
struct s390_load_data *data)
{
struct kexec_buf buf;
int ret;

buf.image = image;

buf.buffer = kernel + STARTUP_NORMAL_OFFSET;
buf.bufsz = kernel_len - STARTUP_NORMAL_OFFSET;
buf.buffer = image->kernel_buf + STARTUP_NORMAL_OFFSET;
buf.bufsz = image->kernel_buf_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);

data->kernel_buf = kernel;
data->parm = (void *)kernel + PARMAREA;
data->kernel_buf = image->kernel_buf;
data->parm = image->kernel_buf + PARMAREA;
data->memsz += buf.memsz + STARTUP_NORMAL_OFFSET;

return ret;
return kexec_add_buffer(&buf);
}

static void *s390_image_load(struct kimage *image,
char *kernel, unsigned long kernel_len,
char *initrd, unsigned long initrd_len,
char *cmdline, unsigned long cmdline_len)
{
struct s390_load_data data = {0};
int ret;

ret = kexec_file_add_image_kernel(image, &data, kernel, kernel_len);
if (ret)
return ERR_PTR(ret);

if (initrd) {
ret = kexec_file_add_initrd(image, &data, initrd, initrd_len);
if (ret)
return ERR_PTR(ret);
}

ret = kexec_file_add_purgatory(image, &data);
if (ret)
return ERR_PTR(ret);

return kexec_file_update_kernel(image, &data);
return kexec_file_add_components(image, kexec_file_add_kernel_image);
}

static int s390_image_probe(const char *buf, unsigned long len)
Expand Down
64 changes: 40 additions & 24 deletions arch/s390/kernel/machine_kexec_file.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,6 @@ const struct kexec_file_ops * const kexec_file_loaders[] = {
NULL,
};

int *kexec_file_update_kernel(struct kimage *image,
struct s390_load_data *data)
{
unsigned long *loc;

if (image->cmdline_buf_len >= ARCH_COMMAND_LINE_SIZE)
return ERR_PTR(-EINVAL);

memcpy(data->parm->command_line, image->cmdline_buf,
image->cmdline_buf_len);

if (image->type == KEXEC_TYPE_CRASH) {
data->parm->oldmem_base = crashk_res.start;
data->parm->oldmem_size = crashk_res.end - crashk_res.start + 1;
}

return NULL;
}

static int kexec_file_update_purgatory(struct kimage *image)
{
u64 entry, type;
Expand Down Expand Up @@ -78,7 +59,8 @@ static int kexec_file_update_purgatory(struct kimage *image)
return ret;
}

int kexec_file_add_purgatory(struct kimage *image, struct s390_load_data *data)
static int kexec_file_add_purgatory(struct kimage *image,
struct s390_load_data *data)
{
struct kexec_buf buf;
int ret;
Expand All @@ -98,16 +80,16 @@ int kexec_file_add_purgatory(struct kimage *image, struct s390_load_data *data)
return ret;
}

int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,
char *initrd, unsigned long initrd_len)
static int kexec_file_add_initrd(struct kimage *image,
struct s390_load_data *data)
{
struct kexec_buf buf;
int ret;

buf.image = image;

buf.buffer = initrd;
buf.bufsz = initrd_len;
buf.buffer = image->initrd_buf;
buf.bufsz = image->initrd_buf_len;

data->memsz = ALIGN(data->memsz, PAGE_SIZE);
buf.mem = data->memsz;
Expand All @@ -123,6 +105,40 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,
return ret;
}

void *kexec_file_add_components(struct kimage *image,
int (*add_kernel)(struct kimage *image,
struct s390_load_data *data))
{
struct s390_load_data data = {0};
int ret;

ret = add_kernel(image, &data);
if (ret)
return ERR_PTR(ret);

if (image->cmdline_buf_len >= ARCH_COMMAND_LINE_SIZE)
return ERR_PTR(-EINVAL);
memcpy(data.parm->command_line, image->cmdline_buf,
image->cmdline_buf_len);

if (image->type == KEXEC_TYPE_CRASH) {
data.parm->oldmem_base = crashk_res.start;
data.parm->oldmem_size = crashk_res.end - crashk_res.start + 1;
}

if (image->initrd_buf) {
ret = kexec_file_add_initrd(image, &data);
if (ret)
return ERR_PTR(ret);
}

ret = kexec_file_add_purgatory(image, &data);
if (ret)
return ERR_PTR(ret);

return NULL;
}

int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
Elf_Shdr *section,
const Elf_Shdr *relsec,
Expand Down

0 comments on commit 8e49642

Please sign in to comment.