Please find the enclosed patch below.
From 627b4c8085269251f6d66627dada447909bceafd Mon Sep 17 00:00:00 2001 From: root <[email protected]> Date: Tue, 16 May 2017 14:08:14 +0200 Subject: [PATCH] makedumpfile: Error on re-filtering the dump file with no free pages
When re-filtering the dump file after the free pages have already been stripped out we get an error "Can't get necessary symbols for excluding free pages" if newly specified dump level is below 16 (preserves free pages). According to the code, the check for the new dump level is done BEFORE the new dump level is actually set (based on the dump level specified in the command and the one from the input dump file). Moving the new_dump_level calculation ahead would fix the error. Signed-off-by: Mikhail Zaslonko <[email protected]> --- makedumpfile.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/makedumpfile.c b/makedumpfile.c index e69b6df..24f99fc 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -9774,10 +9774,25 @@ writeout_multiple_dumpfiles(void) return ret; } +void +update_dump_level(void) +{ + int new_level; + + new_level = info->dump_level | info->kh_memory->dump_level; + if (new_level != info->dump_level) { + info->dump_level = new_level; + MSG("dump_level is changed to %d, " \ + "because %s was created by dump_level(%d).", + new_level, info->name_memory, + info->kh_memory->dump_level); + } +} + int create_dumpfile(void) { - int num_retry, status, new_level; + int num_retry, status; if (!open_files_for_creating_dumpfile()) return FALSE; @@ -9786,6 +9801,10 @@ create_dumpfile(void) if (!get_elf_info(info->fd_memory, info->name_memory)) return FALSE; } + + if (info->flag_refiltering) + update_dump_level(); + if (!initial()) return FALSE; @@ -9804,17 +9823,8 @@ create_dumpfile(void) num_retry = 0; retry: - if (info->flag_refiltering) { - /* Change dump level */ - new_level = info->dump_level | info->kh_memory->dump_level; - if (new_level != info->dump_level) { - info->dump_level = new_level; - MSG("dump_level is changed to %d, " \ - "because %s was created by dump_level(%d).", - new_level, info->name_memory, - info->kh_memory->dump_level); - } - } + if (info->flag_refiltering) + update_dump_level(); if ((info->name_filterconfig || info->name_eppic_config) && !gather_filter_info()) -- 1.8.3.1
_______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
