kexec: Move some memembers and definitions within the scope of CONFIG_KEXEC_FILE
Subsystems (4)
PATCH 1/1 kexec: Move some memembers and definitions within the scope of CONFIG_KEXEC_FILE
Move the stuff currently only used by the kexec file code within CONFIG_KEXEC_FILE (and CONFIG_KEXEC_VERIFY_SIG).
Also move internal "struct kexec_sha_region" and "struct kexec_buf" into "kexec_internal.h".
--- arch/x86/kernel/machine_kexec_64.c | 2 ++ include/linux/kexec.h | 62 +++++++++++++++----------------------- kernel/kexec_file.c | 2 ++ kernel/kexec_internal.h | 21 +++++++++++++ 4 files changed, 50 insertions(+), 37 deletions(-)
arch/x86/kernel/machine_kexec_64.c +2 -0
@@ -385,6 +385,7 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)return image->fops->cleanup (image->image_loader_data); } +#ifdef CONFIG_KEXEC_VERIFY_SIG int arch_kexec_kernel_verify_sig (struct kimage *image,void *kernel,unsigned long kernel_len) {
@@ -395,6 +396,7 @@ int arch_kexec_kernel_verify_sig(struct kimage *image, void *kernel, return image->fops->verify_sig(kernel, kernel_len); } +#endif /* * Apply purgatory relocations.
include/linux/kexec.h +25 -37
86 lines not on this page · raw message
kernel/kexec_file.c +2 -0
@@ -109,11 +109,13 @@ int __weak arch_kimage_file_post_load_cleanup(struct kimage *image)return -EINVAL ; } +#ifdef CONFIG_KEXEC_VERIFY_SIG int __weak arch_kexec_kernel_verify_sig (struct kimage *image,void *buf,unsigned long buf_len) {return -EKEYREJECTED ; } +#endif /* Apply relocations of type RELA */ int __weak
kernel/kexec_internal.h +21 -0
@@ -15,6 +15,27 @@ int kimage_is_destination_range(struct kimage *image,extern struct mutex kexec_mutex;#ifdef CONFIG_KEXEC_FILE +struct kexec_sha_region { +unsigned long start; +unsigned long len; +}; + +/* +* Keeps track of buffer parameters as provided by caller for requesting +* memory placement of buffer. +*/ +struct kexec_buf { +struct kimage *image; +char *buffer; +unsigned long bufsz; +unsigned long mem; +unsigned long memsz; +unsigned long buf_align; +unsigned long buf_min; +unsigned long buf_max; +bool top_down;/* allocate from top of memory hole */ +}; +void kimage_file_post_load_cleanup (struct kimage *image);#else /* CONFIG_KEXEC_FILE */ static inline void kimage_file_post_load_cleanup (struct kimage *image) { }
Signature · 1 line
2.5.0
Quoted 84 lines · Xunlei Pang
include/linux/kexec.h +24
-31@@ -109,11 +109,7 @@ struct compat_kexec_segment { };#endif -struct kexec_sha_region { -unsigned long start; -unsigned long len; -}; - +#ifdef CONFIG_KEXEC_FILE struct purgatory_info { /* Pointer to elf header of read only purgatory */ Elf_Ehdr *ehdr;@@ -130,6 +126,28 @@ struct purgatory_info {unsigned long purgatory_load_addr; }; +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, +unsigned long initrd_len,char *cmdline, +unsigned long cmdline_len); +typedef int (kexec_cleanup_t )(void *loader_data); + +#ifdef CONFIG_KEXEC_VERIFY_SIG +typedef int (kexec_verify_sig_t )(const char *kernel_buf, +unsigned long kernel_len); +#endif + +struct kexec_file_ops { +kexec_probe_t *probe; +kexec_load_t *load; +kexec_cleanup_t *cleanup; +#ifdef CONFIG_KEXEC_VERIFY_SIG +kexec_verify_sig_t *verify_sig; +#endif +}; +#endif +struct kimage {kimage_entry_t head;kimage_entry_t *entry;@@ -161,6 +179,7 @@ struct kimage {struct kimage_arch arch;#endif +#ifdef CONFIG_KEXEC_FILE /* Additional fields for file based kexec syscall */ void *kernel_buf;unsigned long kernel_buf_len;@@ -179,38 +198,7 @@ struct kimage {/* Information for loading purgatory */ struct purgatory_info purgatory_info; -}; - -/* -* Keeps track of buffer parameters as provided by caller for requesting -* memory placement of buffer. -*/ -struct kexec_buf { -struct kimage *image; -char *buffer; -unsigned long bufsz; -unsigned long mem; -unsigned long memsz; -unsigned long buf_align; -unsigned long buf_min; -unsigned long buf_max; -bool top_down;/* allocate from top of memory hole */ -}; - -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, -unsigned long initrd_len,char *cmdline, -unsigned long cmdline_len); -typedef int (kexec_cleanup_t )(void *loader_data); -typedef int (kexec_verify_sig_t )(const char *kernel_buf, -unsigned long kernel_len);
include/linux/kexec.h struct kimage { · line 204
Quoted 10 lines
include/linux/kexec.h +1
-6- -struct kexec_file_ops { -kexec_probe_t *probe; -kexec_load_t *load; -kexec_cleanup_t *cleanup; -kexec_verify_sig_t *verify_sig; +#endif };/* kexec interface functions */
Hi, Xunlei.
Following functions will be used only in kexec_file. Please wrap them in CONFIG_KEXEC_FILE.
int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
unsigned long buf_len); 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);
Thanks
Minfei
Quoted 101 lines · Minfei Huang
Quoted 84 lines · Xunlei Pang
include/linux/kexec.h +24
-31@@ -109,11 +109,7 @@ struct compat_kexec_segment { };#endif -struct kexec_sha_region { -unsigned long start; -unsigned long len; -}; - +#ifdef CONFIG_KEXEC_FILE struct purgatory_info { /* Pointer to elf header of read only purgatory */ Elf_Ehdr *ehdr;@@ -130,6 +126,28 @@ struct purgatory_info {unsigned long purgatory_load_addr; }; +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, +unsigned long initrd_len,char *cmdline, +unsigned long cmdline_len); +typedef int (kexec_cleanup_t )(void *loader_data); + +#ifdef CONFIG_KEXEC_VERIFY_SIG +typedef int (kexec_verify_sig_t )(const char *kernel_buf, +unsigned long kernel_len); +#endif + +struct kexec_file_ops { +kexec_probe_t *probe; +kexec_load_t *load; +kexec_cleanup_t *cleanup; +#ifdef CONFIG_KEXEC_VERIFY_SIG +kexec_verify_sig_t *verify_sig; +#endif +}; +#endif +struct kimage {kimage_entry_t head;kimage_entry_t *entry;@@ -161,6 +179,7 @@ struct kimage {struct kimage_arch arch;#endif +#ifdef CONFIG_KEXEC_FILE /* Additional fields for file based kexec syscall */ void *kernel_buf;unsigned long kernel_buf_len;@@ -179,38 +198,7 @@ struct kimage {/* Information for loading purgatory */ struct purgatory_info purgatory_info; -}; - -/* -* Keeps track of buffer parameters as provided by caller for requesting -* memory placement of buffer. -*/ -struct kexec_buf { -struct kimage *image; -char *buffer; -unsigned long bufsz; -unsigned long mem; -unsigned long memsz; -unsigned long buf_align; -unsigned long buf_min; -unsigned long buf_max; -bool top_down;/* allocate from top of memory hole */ -}; - -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, -unsigned long initrd_len,char *cmdline, -unsigned long cmdline_len); -typedef int (kexec_cleanup_t )(void *loader_data); -typedef int (kexec_verify_sig_t )(const char *kernel_buf, -unsigned long kernel_len);include/linux/kexec.h struct kimage { · line 204
Quoted 10 lines
include/linux/kexec.h +1
-6- -struct kexec_file_ops { -kexec_probe_t *probe; -kexec_load_t *load; -kexec_cleanup_t *cleanup; -kexec_verify_sig_t *verify_sig; +#endif };/* kexec interface functions */ Hi, Xunlei.
Following functions will be used only in
kexec_file. Please wrap them inCONFIG_KEXEC_FILE.int
__weakarch_kexec_kernel_image_probe(struct kimage *image, void *buf,
Quoted 9 lines
unsigned long buf_len); 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);
Thanks for the comment.
I noticed this as well, but seems for the function declarations we don't need do this, since they don't consume the actual space.
For example, in the include/linux/timekeeping.h
/*
* RTC specific
*/
extern bool timekeeping_rtc_skipsuspend(void);
extern bool timekeeping_rtc_skipresume(void);
extern void timekeeping_inject_sleeptime64(struct timespec64 *delta);
also not embraced by the corresponding macros.
Regards,
Xunlei
Quoted 3 lines
Thanks
Minfei
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 19 lines · Xunlei Pang
Quoted 8 lines · Minfei Huang
include/linux/kexec.h
Quoted 1 line · Xunlei Pang
include/linux/kexec.h +0
-0Hi, Xunlei.
Following functions will be used only in
kexec_file. Please wrap them inCONFIG_KEXEC_FILE.int
__weakarch_kexec_kernel_image_probe(struct kimage *image, void *buf,Quoted 9 lines
unsigned long buf_len); 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);
Quoted 4 lines
Thanks for the comment.
I noticed this as well, but seems for the function declarations we don't need do this, since they don't consume the actual space.
Yeah. I think it is better to fold above code as well, since there is no side effect.
Quoted 11 lines
For example, in the
include/linux/timekeeping.h
/*
* RTC specific
*/
extern booltimekeeping_rtc_skipsuspend(void);
extern booltimekeeping_rtc_skipresume(void);extern void
timekeeping_inject_sleeptime64(struct timespec64 *delta);also not embraced by the corresponding macros.
I think it is consistent of the construction to make code more clear.
Thanks
Minfei
Andrew Morton
maintainerQuoted 26 lines · On Tue, 22 Dec 2015 19:40:39 +0800 Xunlei Pang <[email protected]> wrote:
Quoted 4 lines
Following functions will be used only in
kexec_file. Please wrap them inCONFIG_KEXEC_FILE.int
__weakarch_kexec_kernel_image_probe(struct kimage *image, void *buf,Quoted 9 lines
unsigned long buf_len); 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);Thanks for the comment.
I noticed this as well, but seems for the function declarations we don't need do this, since they don't consume the actual space.
For example, in the
include/linux/timekeeping.h
/*
* RTC specific
*/
extern booltimekeeping_rtc_skipsuspend(void);
extern booltimekeeping_rtc_skipresume(void);
Quoted 3 lines
extern void
timekeeping_inject_sleeptime64(struct timespec64 *delta);also not embraced by the corresponding macros.
Yes. If we add the ifdefs then a programming error will be detected at compile time. If we don't add the ifdefs then that error will be detected at link time. So the ifdefs provide a quite small advantage, while making the code harder to read and harder to maintain. I believe that "no ifdefs" is the better side of this tradeoff.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec