[PATCH v2 18/20] vmcore: round-up offset of vmcore object in page-size boundary

2013-03-04 Thread HATAYAMA Daisuke 
To satisfy mmap()'s page-size bounary requirement, round-up offset of
each vmcore objects in page-size boundary; each offset is connected to
user-space virtual address through mapping of mmap().

Signed-off-by: HATAYAMA Daisuke 
---

 fs/proc/vmcore.c |   18 --
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 5582aaa..6660cd5 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -700,7 +700,7 @@ static int __init process_ptload_program_headers_elf32(char 
*elfptr,
 }
 
 /* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf64(char *elfptr,
+static void __init set_vmcore_list_offsets_elf64(char *elfptr, size_t elfsz,
struct list_head *vc_list)
 {
loff_t vmcore_off;
@@ -710,17 +710,16 @@ static void __init set_vmcore_list_offsets_elf64(char 
*elfptr,
ehdr_ptr = (Elf64_Ehdr *)elfptr;
 
/* Skip Elf header and program headers. */
-   vmcore_off = ehdr_ptr->e_phoff +
-   (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr);
+   vmcore_off = elfsz;
 
list_for_each_entry(m, vc_list, list) {
m->offset = vmcore_off;
-   vmcore_off += m->size;
+   vmcore_off += roundup(m->size, PAGE_SIZE);
}
 }
 
 /* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf32(char *elfptr,
+static void __init set_vmcore_list_offsets_elf32(char *elfptr, size_t elfsz,
struct list_head *vc_list)
 {
loff_t vmcore_off;
@@ -730,12 +729,11 @@ static void __init set_vmcore_list_offsets_elf32(char 
*elfptr,
ehdr_ptr = (Elf32_Ehdr *)elfptr;
 
/* Skip Elf header and program headers. */
-   vmcore_off = ehdr_ptr->e_phoff +
-   (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr);
+   vmcore_off = elfsz;
 
list_for_each_entry(m, vc_list, list) {
m->offset = vmcore_off;
-   vmcore_off += m->size;
+   vmcore_off += roundup(m->size, PAGE_SIZE);
}
 }
 
@@ -795,7 +793,7 @@ static int __init parse_crash_elf64_headers(void)
   get_order(elfcorebuf_sz_orig));
return rc;
}
-   set_vmcore_list_offsets_elf64(elfcorebuf, _list);
+   set_vmcore_list_offsets_elf64(elfcorebuf, elfcorebuf_sz, _list);
return 0;
 }
 
@@ -855,7 +853,7 @@ static int __init parse_crash_elf32_headers(void)
   get_order(elfcorebuf_sz_orig));
return rc;
}
-   set_vmcore_list_offsets_elf32(elfcorebuf, _list);
+   set_vmcore_list_offsets_elf32(elfcorebuf, elfcorebuf_sz, _list);
return 0;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 18/20] vmcore: round-up offset of vmcore object in page-size boundary

2013-03-04 Thread HATAYAMA Daisuke 
To satisfy mmap()'s page-size bounary requirement, round-up offset of
each vmcore objects in page-size boundary; each offset is connected to
user-space virtual address through mapping of mmap().

Signed-off-by: HATAYAMA Daisuke d.hatay...@jp.fujitsu.com
---

 fs/proc/vmcore.c |   18 --
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 5582aaa..6660cd5 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -700,7 +700,7 @@ static int __init process_ptload_program_headers_elf32(char 
*elfptr,
 }
 
 /* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf64(char *elfptr,
+static void __init set_vmcore_list_offsets_elf64(char *elfptr, size_t elfsz,
struct list_head *vc_list)
 {
loff_t vmcore_off;
@@ -710,17 +710,16 @@ static void __init set_vmcore_list_offsets_elf64(char 
*elfptr,
ehdr_ptr = (Elf64_Ehdr *)elfptr;
 
/* Skip Elf header and program headers. */
-   vmcore_off = ehdr_ptr-e_phoff +
-   (ehdr_ptr-e_phnum) * sizeof(Elf64_Phdr);
+   vmcore_off = elfsz;
 
list_for_each_entry(m, vc_list, list) {
m-offset = vmcore_off;
-   vmcore_off += m-size;
+   vmcore_off += roundup(m-size, PAGE_SIZE);
}
 }
 
 /* Sets offset fields of vmcore elements. */
-static void __init set_vmcore_list_offsets_elf32(char *elfptr,
+static void __init set_vmcore_list_offsets_elf32(char *elfptr, size_t elfsz,
struct list_head *vc_list)
 {
loff_t vmcore_off;
@@ -730,12 +729,11 @@ static void __init set_vmcore_list_offsets_elf32(char 
*elfptr,
ehdr_ptr = (Elf32_Ehdr *)elfptr;
 
/* Skip Elf header and program headers. */
-   vmcore_off = ehdr_ptr-e_phoff +
-   (ehdr_ptr-e_phnum) * sizeof(Elf32_Phdr);
+   vmcore_off = elfsz;
 
list_for_each_entry(m, vc_list, list) {
m-offset = vmcore_off;
-   vmcore_off += m-size;
+   vmcore_off += roundup(m-size, PAGE_SIZE);
}
 }
 
@@ -795,7 +793,7 @@ static int __init parse_crash_elf64_headers(void)
   get_order(elfcorebuf_sz_orig));
return rc;
}
-   set_vmcore_list_offsets_elf64(elfcorebuf, vmcore_list);
+   set_vmcore_list_offsets_elf64(elfcorebuf, elfcorebuf_sz, vmcore_list);
return 0;
 }
 
@@ -855,7 +853,7 @@ static int __init parse_crash_elf32_headers(void)
   get_order(elfcorebuf_sz_orig));
return rc;
}
-   set_vmcore_list_offsets_elf32(elfcorebuf, vmcore_list);
+   set_vmcore_list_offsets_elf32(elfcorebuf, elfcorebuf_sz, vmcore_list);
return 0;
 }
 

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/