vmcore: calculate vmcore file size from buffer size and total size of vmcore objects

The previous patches newly added holes before each chunk of memory and
the holes need to be count in vmcore file size.  There are two ways to
count file size in such a way:

1) suppose m is a poitner to the last vmcore object in vmcore_list.
   Then file size is (m->offset + m->size), or

2) calculate sum of size of buffers for ELF header, program headers,
   ELF note segments and objects in vmcore_list.

Although 1) is more direct and simpler than 2), 2) seems better in that
it reflects internal object structure of /proc/vmcore.  Thus, this patch
changes get_vmcore_size_elf{64, 32} so that it calculates size in the
way of 2).

As a result, both get_vmcore_size_elf{64, 32} have the same definition.
Merge them as get_vmcore_size.

Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
Cc: Lisa Mitchell <lisa.mitchell@hp.com>
Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 1082492e02fca4b9e006697fa64c744334c6bab1..8ec6483689857377ab1ae4f12df72c87a869b5ba 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -204,36 +204,15 @@ static struct vmcore* __init get_new_element(void)
        return kzalloc(sizeof(struct vmcore), GFP_KERNEL);
 }
 
-static u64 __init get_vmcore_size_elf64(char *elfptr, size_t elfsz)
+static u64 __init get_vmcore_size(size_t elfsz, size_t elfnotesegsz,
+                                 struct list_head *vc_list)
 {
-       int i;
        u64 size;
-       Elf64_Ehdr *ehdr_ptr;
-       Elf64_Phdr *phdr_ptr;
-
-       ehdr_ptr = (Elf64_Ehdr *)elfptr;
-       phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr));
-       size = elfsz;
-       for (i = 0; i < ehdr_ptr->e_phnum; i++) {
-               size += phdr_ptr->p_memsz;
-               phdr_ptr++;
-       }
-       return size;
-}
-
-static u64 __init get_vmcore_size_elf32(char *elfptr, size_t elfsz)
-{
-       int i;
-       u64 size;
-       Elf32_Ehdr *ehdr_ptr;
-       Elf32_Phdr *phdr_ptr;
+       struct vmcore *m;
 
-       ehdr_ptr = (Elf32_Ehdr *)elfptr;
-       phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr));
-       size = elfsz;
-       for (i = 0; i < ehdr_ptr->e_phnum; i++) {
-               size += phdr_ptr->p_memsz;
-               phdr_ptr++;
+       size = elfsz + elfnotesegsz;
+       list_for_each_entry(m, vc_list, list) {
+               size += m->size;
        }
        return size;
 }
@@ -856,20 +835,19 @@ static int __init parse_crash_elf_headers(void)
                rc = parse_crash_elf64_headers();
                if (rc)
                        return rc;
-
-               /* Determine vmcore size. */
-               vmcore_size = get_vmcore_size_elf64(elfcorebuf, elfcorebuf_sz);
        } else if (e_ident[EI_CLASS] == ELFCLASS32) {
                rc = parse_crash_elf32_headers();
                if (rc)
                        return rc;
-
-               /* Determine vmcore size. */
-               vmcore_size = get_vmcore_size_elf32(elfcorebuf, elfcorebuf_sz);
        } else {
                pr_warn("Warning: Core image elf header is not sane\n");
                return -EINVAL;
        }
+
+       /* Determine vmcore size. */
+       vmcore_size = get_vmcore_size(elfcorebuf_sz, elfnotes_sz,
+                                     &vmcore_list);
+
        return 0;
 }