Introducing the --hotplug and --elfcorehdrsz command line options, which are used to indicate to the kernel that the kdump image is setup to permit the kernel to directly modify the elfcorehdr in response to CPU and memory hotplug and/or online/offline events. This option is only meaningful for kexec_load() syscall. For the kexec_file_load() syscall, this option is a no-op as the kernel handles all aspects of loading the kdump image. This change is just the command line processing portion; the handling of hotplug is in the subsequent patches. Signed-off-by: Eric DeVolder <eric.devolder@xxxxxxxxxx> --- kexec/kexec.c | 15 +++++++++++++++ kexec/kexec.h | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/kexec/kexec.c b/kexec/kexec.c index 36bb2ad..4a64e53 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -58,6 +58,8 @@ unsigned long long mem_min = 0; unsigned long long mem_max = ULONG_MAX; +unsigned long elfcorehdrsz = 0; +int do_hotplug = 0; static unsigned long kexec_flags = 0; /* Flags for kexec file (fd) based syscall */ static unsigned long kexec_file_flags = 0; @@ -1565,6 +1567,19 @@ int main(int argc, char *argv[]) case OPT_PRINT_CKR_SIZE: print_crashkernel_region_size(); return 0; + case OPT_ELFCOREHDRSZ: + elfcorehdrsz = strtoul(optarg, &endptr, 0); + if (*endptr) { + fprintf(stderr, + "Bad option value in --elfcorehdrsz=%s\n", + optarg); + usage(); + return 1; + } + break; + case OPT_HOTPLUG: + do_hotplug = 1; + break; default: break; } diff --git a/kexec/kexec.h b/kexec/kexec.h index 0d820ad..fc24b67 100644 --- a/kexec/kexec.h +++ b/kexec/kexec.h @@ -231,7 +231,9 @@ extern int file_types; #define OPT_PRINT_CKR_SIZE 262 #define OPT_LOAD_LIVE_UPDATE 263 #define OPT_EXEC_LIVE_UPDATE 264 -#define OPT_MAX 265 +#define OPT_ELFCOREHDRSZ 265 +#define OPT_HOTPLUG 266 +#define OPT_MAX 267 #define KEXEC_OPTIONS \ { "help", 0, 0, OPT_HELP }, \ { "version", 0, 0, OPT_VERSION }, \ @@ -258,6 +260,8 @@ extern int file_types; { "debug", 0, 0, OPT_DEBUG }, \ { "status", 0, 0, OPT_STATUS }, \ { "print-ckr-size", 0, 0, OPT_PRINT_CKR_SIZE }, \ + { "elfcorehdrsz", 1, 0, OPT_ELFCOREHDRSZ }, \ + { "hotplug", 0, 0, OPT_HOTPLUG }, \ #define KEXEC_OPT_STR "h?vdfixyluet:pscaS" @@ -295,6 +299,9 @@ extern int ifdown(void); extern char purgatory[]; extern size_t purgatory_size; +extern unsigned long elfcorehdrsz; +extern int do_hotplug; + #define BOOTLOADER "kexec" #define BOOTLOADER_VERSION PACKAGE_VERSION -- 2.31.1 _______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec