Commit 9ec4ecef authored by AKASHI Takahiro's avatar AKASHI Takahiro Committed by Linus Torvalds
Browse files

kexec_file,x86,powerpc: factor out kexec_file_ops functions 

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.

Link: http://lkml.kernel.org/r/20180306102303.9063-3-takahiro.akashi@linaro.org


Signed-off-by: default avatarAKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by: default avatarDave Young <dyoung@redhat.com>
Tested-by: default avatarDave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b799a09f

arch/powerpc/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/kexec_elf_64.c

+1 −1
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ out: 
	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,

};

arch/powerpc/kernel/machine_kexec_file_64.c

+3 −36
Original line number Diff line number Diff line
@@ -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[] = {

	&kexec_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 -EOPNOTSUPP;



	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);

}



/**

arch/x86/include/asm/kexec-bzimage64.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/kexec-bzimage64.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = bzImage64_cleanup,

CRA Git | Maintained and supported by SUSTech CRA and CCSE