mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
s390/kexec_file: Unify loader code
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>
This commit is contained in:
parent
d0d249d75d
commit
8e49642613
4 changed files with 58 additions and 84 deletions
|
@ -59,13 +59,9 @@ struct s390_load_data {
|
||||||
size_t memsz;
|
size_t memsz;
|
||||||
};
|
};
|
||||||
|
|
||||||
int kexec_file_add_purgatory(struct kimage *image,
|
void *kexec_file_add_components(struct kimage *image,
|
||||||
struct s390_load_data *data);
|
int (*add_kernel)(struct kimage *image,
|
||||||
int kexec_file_add_initrd(struct kimage *image,
|
struct s390_load_data *data));
|
||||||
struct s390_load_data *data,
|
|
||||||
char *initrd, unsigned long initrd_len);
|
|
||||||
int *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_image_ops;
|
||||||
extern const struct kexec_file_ops s390_kexec_elf_ops;
|
extern const struct kexec_file_ops s390_kexec_elf_ops;
|
||||||
|
|
|
@ -12,16 +12,17 @@
|
||||||
#include <linux/kexec.h>
|
#include <linux/kexec.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
static int kexec_file_add_elf_kernel(struct kimage *image,
|
static int kexec_file_add_kernel_elf(struct kimage *image,
|
||||||
struct s390_load_data *data,
|
struct s390_load_data *data)
|
||||||
char *kernel, unsigned long kernel_len)
|
|
||||||
{
|
{
|
||||||
struct kexec_buf buf;
|
struct kexec_buf buf;
|
||||||
const Elf_Ehdr *ehdr;
|
const Elf_Ehdr *ehdr;
|
||||||
const Elf_Phdr *phdr;
|
const Elf_Phdr *phdr;
|
||||||
Elf_Addr entry;
|
Elf_Addr entry;
|
||||||
|
void *kernel;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
|
kernel = image->kernel_buf;
|
||||||
ehdr = (Elf_Ehdr *)kernel;
|
ehdr = (Elf_Ehdr *)kernel;
|
||||||
buf.image = image;
|
buf.image = image;
|
||||||
if (image->type == KEXEC_TYPE_CRASH)
|
if (image->type == KEXEC_TYPE_CRASH)
|
||||||
|
@ -62,7 +63,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
|
||||||
data->memsz = ALIGN(data->memsz, phdr->p_align) + buf.memsz;
|
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,
|
static void *s390_elf_load(struct kimage *image,
|
||||||
|
@ -70,11 +71,10 @@ static void *s390_elf_load(struct kimage *image,
|
||||||
char *initrd, unsigned long initrd_len,
|
char *initrd, unsigned long initrd_len,
|
||||||
char *cmdline, unsigned long cmdline_len)
|
char *cmdline, unsigned long cmdline_len)
|
||||||
{
|
{
|
||||||
struct s390_load_data data = {0};
|
|
||||||
const Elf_Ehdr *ehdr;
|
const Elf_Ehdr *ehdr;
|
||||||
const Elf_Phdr *phdr;
|
const Elf_Phdr *phdr;
|
||||||
size_t size;
|
size_t size;
|
||||||
int i, ret;
|
int i;
|
||||||
|
|
||||||
/* image->fobs->probe already checked for valid ELF magic number. */
|
/* image->fobs->probe already checked for valid ELF magic number. */
|
||||||
ehdr = (Elf_Ehdr *)kernel;
|
ehdr = (Elf_Ehdr *)kernel;
|
||||||
|
@ -107,24 +107,7 @@ static void *s390_elf_load(struct kimage *image,
|
||||||
if (size > kernel_len)
|
if (size > kernel_len)
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
|
|
||||||
ret = kexec_file_add_elf_kernel(image, &data, kernel, kernel_len);
|
return kexec_file_add_components(image, kexec_file_add_kernel_elf);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int s390_elf_probe(const char *buf, unsigned long len)
|
static int s390_elf_probe(const char *buf, unsigned long len)
|
||||||
|
|
|
@ -12,30 +12,26 @@
|
||||||
#include <linux/kexec.h>
|
#include <linux/kexec.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
|
||||||
static int kexec_file_add_image_kernel(struct kimage *image,
|
static int kexec_file_add_kernel_image(struct kimage *image,
|
||||||
struct s390_load_data *data,
|
struct s390_load_data *data)
|
||||||
char *kernel, unsigned long kernel_len)
|
|
||||||
{
|
{
|
||||||
struct kexec_buf buf;
|
struct kexec_buf buf;
|
||||||
int ret;
|
|
||||||
|
|
||||||
buf.image = image;
|
buf.image = image;
|
||||||
|
|
||||||
buf.buffer = kernel + STARTUP_NORMAL_OFFSET;
|
buf.buffer = image->kernel_buf + STARTUP_NORMAL_OFFSET;
|
||||||
buf.bufsz = kernel_len - STARTUP_NORMAL_OFFSET;
|
buf.bufsz = image->kernel_buf_len - STARTUP_NORMAL_OFFSET;
|
||||||
|
|
||||||
buf.mem = STARTUP_NORMAL_OFFSET;
|
buf.mem = STARTUP_NORMAL_OFFSET;
|
||||||
if (image->type == KEXEC_TYPE_CRASH)
|
if (image->type == KEXEC_TYPE_CRASH)
|
||||||
buf.mem += crashk_res.start;
|
buf.mem += crashk_res.start;
|
||||||
buf.memsz = buf.bufsz;
|
buf.memsz = buf.bufsz;
|
||||||
|
|
||||||
ret = kexec_add_buffer(&buf);
|
data->kernel_buf = image->kernel_buf;
|
||||||
|
data->parm = image->kernel_buf + PARMAREA;
|
||||||
data->kernel_buf = kernel;
|
|
||||||
data->parm = (void *)kernel + PARMAREA;
|
|
||||||
data->memsz += buf.memsz + STARTUP_NORMAL_OFFSET;
|
data->memsz += buf.memsz + STARTUP_NORMAL_OFFSET;
|
||||||
|
|
||||||
return ret;
|
return kexec_add_buffer(&buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *s390_image_load(struct kimage *image,
|
static void *s390_image_load(struct kimage *image,
|
||||||
|
@ -43,24 +39,7 @@ static void *s390_image_load(struct kimage *image,
|
||||||
char *initrd, unsigned long initrd_len,
|
char *initrd, unsigned long initrd_len,
|
||||||
char *cmdline, unsigned long cmdline_len)
|
char *cmdline, unsigned long cmdline_len)
|
||||||
{
|
{
|
||||||
struct s390_load_data data = {0};
|
return kexec_file_add_components(image, kexec_file_add_kernel_image);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int s390_image_probe(const char *buf, unsigned long len)
|
static int s390_image_probe(const char *buf, unsigned long len)
|
||||||
|
|
|
@ -17,25 +17,6 @@ const struct kexec_file_ops * const kexec_file_loaders[] = {
|
||||||
NULL,
|
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)
|
static int kexec_file_update_purgatory(struct kimage *image)
|
||||||
{
|
{
|
||||||
u64 entry, type;
|
u64 entry, type;
|
||||||
|
@ -78,7 +59,8 @@ static int kexec_file_update_purgatory(struct kimage *image)
|
||||||
return ret;
|
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;
|
struct kexec_buf buf;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -98,16 +80,16 @@ int kexec_file_add_purgatory(struct kimage *image, struct s390_load_data *data)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,
|
static int kexec_file_add_initrd(struct kimage *image,
|
||||||
char *initrd, unsigned long initrd_len)
|
struct s390_load_data *data)
|
||||||
{
|
{
|
||||||
struct kexec_buf buf;
|
struct kexec_buf buf;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
buf.image = image;
|
buf.image = image;
|
||||||
|
|
||||||
buf.buffer = initrd;
|
buf.buffer = image->initrd_buf;
|
||||||
buf.bufsz = initrd_len;
|
buf.bufsz = image->initrd_buf_len;
|
||||||
|
|
||||||
data->memsz = ALIGN(data->memsz, PAGE_SIZE);
|
data->memsz = ALIGN(data->memsz, PAGE_SIZE);
|
||||||
buf.mem = data->memsz;
|
buf.mem = data->memsz;
|
||||||
|
@ -123,6 +105,40 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,
|
||||||
return ret;
|
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,
|
int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
|
||||||
Elf_Shdr *section,
|
Elf_Shdr *section,
|
||||||
const Elf_Shdr *relsec,
|
const Elf_Shdr *relsec,
|
||||||
|
|
Loading…
Reference in a new issue