Re: [PATCH v2 2/7] kexec_file, x86, powerpc: factor out kexec_file_ops functions

[Michael Ellerman]

Thiago Jung Bauermann  writes:

> Dave Young  writes:
>
>> On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
>>> As arch_kexec_kernel_image_{probe,load}(),
>>> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
>>> are almost duplicated among architectures, they can be commonalized with
>>> an architecture-defined kexec_file_ops array. So let's factor them out.
>>> 
>>> Signed-off-by: AKASHI Takahiro 
>>> Cc: Dave Young 
>>> Cc: Vivek Goyal 
>>> Cc: Baoquan He 
>>> Cc: Michael Ellerman 
>>> Cc: Thiago Jung Bauermann 
>>> ---
>>>  arch/powerpc/include/asm/kexec.h|  2 +-
>>>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>>>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>>>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>>>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>>>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>>>  include/linux/kexec.h   | 13 +++
>>>  kernel/kexec_file.c | 60 
>>> +++--
>>>  8 files changed, 71 insertions(+), 94 deletions(-)
>>> 
>>
>> For this patch it also needs some review from powerpc people. 
>
> FWIW:
>
> Reviewed-by: Thiago Jung Bauermann 
>
> Also, tested on a ppc64le KVM guest:
>
> Tested-by: Thiago Jung Bauermann 

Thanks for testing. It looks OK to me.

Acked-by: Michael Ellerman  (powerpc)

cheers

Re: [PATCH v2 2/7] kexec_file, x86, powerpc: factor out kexec_file_ops functions

[Michael Ellerman]

Thiago Jung Bauermann  writes:

> Dave Young  writes:
>
>> On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
>>> As arch_kexec_kernel_image_{probe,load}(),
>>> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
>>> are almost duplicated among architectures, they can be commonalized with
>>> an architecture-defined kexec_file_ops array. So let's factor them out.
>>> 
>>> Signed-off-by: AKASHI Takahiro 
>>> Cc: Dave Young 
>>> Cc: Vivek Goyal 
>>> Cc: Baoquan He 
>>> Cc: Michael Ellerman 
>>> Cc: Thiago Jung Bauermann 
>>> ---
>>>  arch/powerpc/include/asm/kexec.h|  2 +-
>>>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>>>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>>>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>>>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>>>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>>>  include/linux/kexec.h   | 13 +++
>>>  kernel/kexec_file.c | 60 
>>> +++--
>>>  8 files changed, 71 insertions(+), 94 deletions(-)
>>> 
>>
>> For this patch it also needs some review from powerpc people. 
>
> FWIW:
>
> Reviewed-by: Thiago Jung Bauermann 
>
> Also, tested on a ppc64le KVM guest:
>
> Tested-by: Thiago Jung Bauermann 

Thanks for testing. It looks OK to me.

Acked-by: Michael Ellerman  (powerpc)

cheers

Re: [PATCH v2 2/7] kexec_file,x86,powerpc: factor out kexec_file_ops functions

[Thiago Jung Bauermann]

Dave Young  writes:

> On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
>> As arch_kexec_kernel_image_{probe,load}(),
>> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
>> are almost duplicated among architectures, they can be commonalized with
>> an architecture-defined kexec_file_ops array. So let's factor them out.
>> 
>> Signed-off-by: AKASHI Takahiro 
>> Cc: Dave Young 
>> Cc: Vivek Goyal 
>> Cc: Baoquan He 
>> Cc: Michael Ellerman 
>> Cc: Thiago Jung Bauermann 
>> ---
>>  arch/powerpc/include/asm/kexec.h|  2 +-
>>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>>  include/linux/kexec.h   | 13 +++
>>  kernel/kexec_file.c | 60 
>> +++--
>>  8 files changed, 71 insertions(+), 94 deletions(-)
>> 
>
> For this patch it also needs some review from powerpc people. 

FWIW:

Reviewed-by: Thiago Jung Bauermann 

Also, tested on a ppc64le KVM guest:

Tested-by: Thiago Jung Bauermann 

-- 
Thiago Jung Bauermann
IBM Linux Technology Center

Re: [PATCH v2 2/7] kexec_file,x86,powerpc: factor out kexec_file_ops functions

[Thiago Jung Bauermann]

Dave Young  writes:

> On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
>> As arch_kexec_kernel_image_{probe,load}(),
>> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
>> are almost duplicated among architectures, they can be commonalized with
>> an architecture-defined kexec_file_ops array. So let's factor them out.
>> 
>> Signed-off-by: AKASHI Takahiro 
>> Cc: Dave Young 
>> Cc: Vivek Goyal 
>> Cc: Baoquan He 
>> Cc: Michael Ellerman 
>> Cc: Thiago Jung Bauermann 
>> ---
>>  arch/powerpc/include/asm/kexec.h|  2 +-
>>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>>  include/linux/kexec.h   | 13 +++
>>  kernel/kexec_file.c | 60 
>> +++--
>>  8 files changed, 71 insertions(+), 94 deletions(-)
>> 
>
> For this patch it also needs some review from powerpc people. 

FWIW:

Reviewed-by: Thiago Jung Bauermann 

Also, tested on a ppc64le KVM guest:

Tested-by: Thiago Jung Bauermann 

-- 
Thiago Jung Bauermann
IBM Linux Technology Center

Re: [PATCH v2 2/7] kexec_file,x86,powerpc: factor out kexec_file_ops functions

[Dave Young]

On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
> As arch_kexec_kernel_image_{probe,load}(),
> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
> are almost duplicated among architectures, they can be commonalized with
> an architecture-defined kexec_file_ops array. So let's factor them out.
> 
> Signed-off-by: AKASHI Takahiro 
> Cc: Dave Young 
> Cc: Vivek Goyal 
> Cc: Baoquan He 
> Cc: Michael Ellerman 
> Cc: Thiago Jung Bauermann 
> ---
>  arch/powerpc/include/asm/kexec.h|  2 +-
>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>  include/linux/kexec.h   | 13 +++
>  kernel/kexec_file.c | 60 
> +++--
>  8 files changed, 71 insertions(+), 94 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/kexec.h 
> b/arch/powerpc/include/asm/kexec.h
> index d8b1e8e7e035..4a585cba1787 100644
> --- a/arch/powerpc/include/asm/kexec.h
> +++ b/arch/powerpc/include/asm/kexec.h
> @@ -95,7 +95,7 @@ static inline bool kdump_in_progress(void)
>  }
>  
>  #ifdef CONFIG_KEXEC_FILE
> -extern struct kexec_file_ops kexec_elf64_ops;
> +extern const struct kexec_file_ops kexec_elf64_ops;
>  
>  #ifdef CONFIG_IMA_KEXEC
>  #define ARCH_HAS_KIMAGE_ARCH
> diff --git a/arch/powerpc/kernel/kexec_elf_64.c 
> b/arch/powerpc/kernel/kexec_elf_64.c
> index 9a42309b091a..6c78c11c7faf 100644
> --- a/arch/powerpc/kernel/kexec_elf_64.c
> +++ b/arch/powerpc/kernel/kexec_elf_64.c
> @@ -657,7 +657,7 @@ static void *elf64_load(struct kimage *image, char 
> *kernel_buf,
>   return ret ? ERR_PTR(ret) : fdt;
>  }
>  
> -struct kexec_file_ops kexec_elf64_ops = {
> +const struct kexec_file_ops kexec_elf64_ops = {
>   .probe = elf64_probe,
>   .load = elf64_load,
>  };
> diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c 
> b/arch/powerpc/kernel/machine_kexec_file_64.c
> index e4395f937d63..3a962c87149a 100644
> --- a/arch/powerpc/kernel/machine_kexec_file_64.c
> +++ b/arch/powerpc/kernel/machine_kexec_file_64.c
> @@ -31,52 +31,19 @@
>  
>  #define SLAVE_CODE_SIZE  256
>  
> -static struct kexec_file_ops *kexec_file_loaders[] = {
> +const struct kexec_file_ops * const kexec_file_loaders[] = {
>   _elf64_ops,
> + NULL
>  };
>  
>  int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
> unsigned long buf_len)
>  {
> - int i, ret = -ENOEXEC;
> - struct kexec_file_ops *fops;
> -
>   /* We don't support crash kernels yet. */
>   if (image->type == KEXEC_TYPE_CRASH)
>   return -ENOTSUPP;
>  
> - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) {
> - fops = kexec_file_loaders[i];
> - if (!fops || !fops->probe)
> - continue;
> -
> - ret = fops->probe(buf, buf_len);
> - if (!ret) {
> - image->fops = fops;
> - return ret;
> - }
> - }
> -
> - return ret;
> -}
> -
> -void *arch_kexec_kernel_image_load(struct kimage *image)
> -{
> - if (!image->fops || !image->fops->load)
> - return ERR_PTR(-ENOEXEC);
> -
> - return image->fops->load(image, image->kernel_buf,
> -  image->kernel_buf_len, image->initrd_buf,
> -  image->initrd_buf_len, image->cmdline_buf,
> -  image->cmdline_buf_len);
> -}
> -
> -int arch_kimage_file_post_load_cleanup(struct kimage *image)
> -{
> - if (!image->fops || !image->fops->cleanup)
> - return 0;
> -
> - return image->fops->cleanup(image->image_loader_data);
> + return kexec_image_probe_default(image, buf, buf_len);
>  }
>  
>  /**
> diff --git a/arch/x86/include/asm/kexec-bzimage64.h 
> b/arch/x86/include/asm/kexec-bzimage64.h
> index 9f07cff43705..df89ee7d3e9e 100644
> --- a/arch/x86/include/asm/kexec-bzimage64.h
> +++ b/arch/x86/include/asm/kexec-bzimage64.h
> @@ -2,6 +2,6 @@
>  #ifndef _ASM_KEXEC_BZIMAGE64_H
>  #define _ASM_KEXEC_BZIMAGE64_H
>  
> -extern struct kexec_file_ops kexec_bzImage64_ops;
> +extern const struct kexec_file_ops kexec_bzImage64_ops;
>  
>  #endif  /* _ASM_KEXE_BZIMAGE64_H */
> diff --git a/arch/x86/kernel/kexec-bzimage64.c 
> b/arch/x86/kernel/kexec-bzimage64.c
> index fb095ba0c02f..705654776c0c 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -538,7 +538,7 @@ static int bzImage64_verify_sig(const char *kernel, 
> unsigned long kernel_len)
>  }
>  #endif
>  
> -struct kexec_file_ops kexec_bzImage64_ops = {
> 

Re: [PATCH v2 2/7] kexec_file,x86,powerpc: factor out kexec_file_ops functions

[Dave Young]

On 03/06/18 at 07:22pm, AKASHI Takahiro wrote:
> As arch_kexec_kernel_image_{probe,load}(),
> arch_kimage_file_post_load_cleanup() and arch_kexec_kernel_verify_sig()
> are almost duplicated among architectures, they can be commonalized with
> an architecture-defined kexec_file_ops array. So let's factor them out.
> 
> Signed-off-by: AKASHI Takahiro 
> Cc: Dave Young 
> Cc: Vivek Goyal 
> Cc: Baoquan He 
> Cc: Michael Ellerman 
> Cc: Thiago Jung Bauermann 
> ---
>  arch/powerpc/include/asm/kexec.h|  2 +-
>  arch/powerpc/kernel/kexec_elf_64.c  |  2 +-
>  arch/powerpc/kernel/machine_kexec_file_64.c | 39 ++-
>  arch/x86/include/asm/kexec-bzimage64.h  |  2 +-
>  arch/x86/kernel/kexec-bzimage64.c   |  2 +-
>  arch/x86/kernel/machine_kexec_64.c  | 45 +-
>  include/linux/kexec.h   | 13 +++
>  kernel/kexec_file.c | 60 
> +++--
>  8 files changed, 71 insertions(+), 94 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/kexec.h 
> b/arch/powerpc/include/asm/kexec.h
> index d8b1e8e7e035..4a585cba1787 100644
> --- a/arch/powerpc/include/asm/kexec.h
> +++ b/arch/powerpc/include/asm/kexec.h
> @@ -95,7 +95,7 @@ static inline bool kdump_in_progress(void)
>  }
>  
>  #ifdef CONFIG_KEXEC_FILE
> -extern struct kexec_file_ops kexec_elf64_ops;
> +extern const struct kexec_file_ops kexec_elf64_ops;
>  
>  #ifdef CONFIG_IMA_KEXEC
>  #define ARCH_HAS_KIMAGE_ARCH
> diff --git a/arch/powerpc/kernel/kexec_elf_64.c 
> b/arch/powerpc/kernel/kexec_elf_64.c
> index 9a42309b091a..6c78c11c7faf 100644
> --- a/arch/powerpc/kernel/kexec_elf_64.c
> +++ b/arch/powerpc/kernel/kexec_elf_64.c
> @@ -657,7 +657,7 @@ static void *elf64_load(struct kimage *image, char 
> *kernel_buf,
>   return ret ? ERR_PTR(ret) : fdt;
>  }
>  
> -struct kexec_file_ops kexec_elf64_ops = {
> +const struct kexec_file_ops kexec_elf64_ops = {
>   .probe = elf64_probe,
>   .load = elf64_load,
>  };
> diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c 
> b/arch/powerpc/kernel/machine_kexec_file_64.c
> index e4395f937d63..3a962c87149a 100644
> --- a/arch/powerpc/kernel/machine_kexec_file_64.c
> +++ b/arch/powerpc/kernel/machine_kexec_file_64.c
> @@ -31,52 +31,19 @@
>  
>  #define SLAVE_CODE_SIZE  256
>  
> -static struct kexec_file_ops *kexec_file_loaders[] = {
> +const struct kexec_file_ops * const kexec_file_loaders[] = {
>   _elf64_ops,
> + NULL
>  };
>  
>  int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
> unsigned long buf_len)
>  {
> - int i, ret = -ENOEXEC;
> - struct kexec_file_ops *fops;
> -
>   /* We don't support crash kernels yet. */
>   if (image->type == KEXEC_TYPE_CRASH)
>   return -ENOTSUPP;
>  
> - for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) {
> - fops = kexec_file_loaders[i];
> - if (!fops || !fops->probe)
> - continue;
> -
> - ret = fops->probe(buf, buf_len);
> - if (!ret) {
> - image->fops = fops;
> - return ret;
> - }
> - }
> -
> - return ret;
> -}
> -
> -void *arch_kexec_kernel_image_load(struct kimage *image)
> -{
> - if (!image->fops || !image->fops->load)
> - return ERR_PTR(-ENOEXEC);
> -
> - return image->fops->load(image, image->kernel_buf,
> -  image->kernel_buf_len, image->initrd_buf,
> -  image->initrd_buf_len, image->cmdline_buf,
> -  image->cmdline_buf_len);
> -}
> -
> -int arch_kimage_file_post_load_cleanup(struct kimage *image)
> -{
> - if (!image->fops || !image->fops->cleanup)
> - return 0;
> -
> - return image->fops->cleanup(image->image_loader_data);
> + return kexec_image_probe_default(image, buf, buf_len);
>  }
>  
>  /**
> diff --git a/arch/x86/include/asm/kexec-bzimage64.h 
> b/arch/x86/include/asm/kexec-bzimage64.h
> index 9f07cff43705..df89ee7d3e9e 100644
> --- a/arch/x86/include/asm/kexec-bzimage64.h
> +++ b/arch/x86/include/asm/kexec-bzimage64.h
> @@ -2,6 +2,6 @@
>  #ifndef _ASM_KEXEC_BZIMAGE64_H
>  #define _ASM_KEXEC_BZIMAGE64_H
>  
> -extern struct kexec_file_ops kexec_bzImage64_ops;
> +extern const struct kexec_file_ops kexec_bzImage64_ops;
>  
>  #endif  /* _ASM_KEXE_BZIMAGE64_H */
> diff --git a/arch/x86/kernel/kexec-bzimage64.c 
> b/arch/x86/kernel/kexec-bzimage64.c
> index fb095ba0c02f..705654776c0c 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -538,7 +538,7 @@ static int bzImage64_verify_sig(const char *kernel, 
> unsigned long kernel_len)
>  }
>  #endif
>  
> -struct kexec_file_ops kexec_bzImage64_ops = {
> +const struct kexec_file_ops kexec_bzImage64_ops = {
>   .probe = bzImage64_probe,
>   .load = bzImage64_load,
>   .cleanup =