Skip to contentSkip to conversation

get MODULES_VADDR by KERNEL_IMAGE_SIZE for x86_64

PATCH Superseded Baoquan He 2 participants 6 messages Sep 15, 2014 – Sep 19, 2014

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Baoquan He

author
#0 lore raw

PATCH 1/1 get MODULES_VADDR by KERNEL_IMAGE_SIZE for x86_64

In x86_64, since v2.6.26 the KERNEL_IMAGE_SIZE is changed to 512M, and according the MODULES_VADDR is changed to 0xffffffffa0000000. Before that, KERNEL_IMAGE_SIZE is 128M, and MODULES_VADDR is 0xffffffff88000000.

However, in v3.12 Kees Cook introduced kaslr to randomise the location of kernel. And the kernel text mapping addr space is enlarged from 512M to 1G. That means now KERNEL_IMAGE_SIZE is variable, its value is 512M with kaslr support not compiled in and 1G with kaslr support compiled in. Accordingly the MODULES_VADDR is changed too to be:

So when kaslr is compiled in and enabled, the kernel text mapping addr space and modules vaddr space need be adjusted. Otherwise makedumpfile will collapse since the addr for some symbols is not correct.

Hence KERNEL_IMAGE_SIZE need be exported to vmcoreinfo and got in makedumpfile to help calculate MODULES_VADDR.

---
 makedumpfile.c | 8 ++++++++
 makedumpfile.h | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
makedumpfile.c +8 -0
index b4d43d8..48d73a8 100644
@@ -1564,6 +1564,12 @@ get_value_for_old_linux(void)
 			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
 			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
 	}
+#ifdef __x86_64__
+	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
+		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
+			NUMBER(KERNEL_IMAGE_SIZE) = MODULES_VADDR_ORIG;
+	}
+#endif
 	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
 		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
 			SIZE(pageflags) =
@@ -1813,6 +1819,7 @@ write_vmcoreinfo_data(void)
 	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
 
 	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	/*
 	 * write the source file of 1st kernel
@@ -2147,6 +2154,7 @@ read_vmcoreinfo(void)
 	READ_SRCFILE("pud_t", pud_t);
 
 	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	return TRUE;
 }
makedumpfile.h +3 -1
index 6493f61..28a3cac 100644
@@ -549,7 +549,8 @@ do { \
 #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
 
 #define __START_KERNEL_map	(0xffffffff80000000)
-#define MODULES_VADDR		(0xffffffff88000000)
+#define MODULES_VADDR_ORIG	(0xffffffff88000000)
+#define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
 #define MODULES_END		(0xfffffffffff00000)
 #define KVBASE			PAGE_OFFSET
 #define _SECTION_SIZE_BITS	(27)
@@ -1531,6 +1532,7 @@ struct number_table {
 	long    PG_hwpoison;
 
 	long	PAGE_BUDDY_MAPCOUNT_VALUE;
+	long	KERNEL_IMAGE_SIZE;
 	long	SECTION_SIZE_BITS;
 	long	MAX_PHYSMEM_BITS;
 };
Signature · 7 lines
1.8.5.3


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
author
#1 lore raw
Quoted 9 lines · Baoquan He

In x86_64, since v2.6.26 the KERNEL_IMAGE_SIZE is changed to 512M, and according the MODULES_VADDR is changed to 0xffffffffa0000000. Before that, KERNEL_IMAGE_SIZE is 128M, and MODULES_VADDR is 0xffffffff88000000.

However, in v3.12 Kees Cook introduced kaslr to randomise the location of kernel. And the kernel text mapping addr space is enlarged from 512M to 1G. That means now KERNEL_IMAGE_SIZE is variable, its value is 512M with kaslr support not compiled in and 1G with kaslr support compiled in. Accordingly the MODULES_VADDR is changed too to be:

#define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)

Sorry, the above formula is lost.

Quoted 72 lines

So when kaslr is compiled in and enabled, the kernel text mapping addr space and modules vaddr space need be adjusted. Otherwise makedumpfile will collapse since the addr for some symbols is not correct.

Hence KERNEL_IMAGE_SIZE need be exported to vmcoreinfo and got in makedumpfile to help calculate MODULES_VADDR.

---
 makedumpfile.c | 8 ++++++++
 makedumpfile.h | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
makedumpfile.c +8 -0
index b4d43d8..48d73a8 100644
@@ -1564,6 +1564,12 @@ get_value_for_old_linux(void)
 			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
 			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
 	}
+#ifdef __x86_64__
+	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
+		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
+			NUMBER(KERNEL_IMAGE_SIZE) = MODULES_VADDR_ORIG;
+	}
+#endif
 	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
 		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
 			SIZE(pageflags) =
@@ -1813,6 +1819,7 @@ write_vmcoreinfo_data(void)
 	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
 
 	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	/*
 	 * write the source file of 1st kernel
@@ -2147,6 +2154,7 @@ read_vmcoreinfo(void)
 	READ_SRCFILE("pud_t", pud_t);
 
 	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	return TRUE;
 }
makedumpfile.h +3 -1
index 6493f61..28a3cac 100644
@@ -549,7 +549,8 @@ do { \
 #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
 
 #define __START_KERNEL_map	(0xffffffff80000000)
-#define MODULES_VADDR		(0xffffffff88000000)
+#define MODULES_VADDR_ORIG	(0xffffffff88000000)
+#define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
 #define MODULES_END		(0xfffffffffff00000)
 #define KVBASE			PAGE_OFFSET
 #define _SECTION_SIZE_BITS	(27)
@@ -1531,6 +1532,7 @@ struct number_table {
 	long    PG_hwpoison;
 
 	long	PAGE_BUDDY_MAPCOUNT_VALUE;
+	long	KERNEL_IMAGE_SIZE;
 	long	SECTION_SIZE_BITS;
 	long	MAX_PHYSMEM_BITS;
 };
Signature · 1 line
1.8.5.3

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#2 lore raw
In reply to Baoquan He
Quoted 28 lines

In x86_64, since v2.6.26 the KERNEL_IMAGE_SIZE is changed to 512M, and according the MODULES_VADDR is changed to 0xffffffffa0000000. Before that, KERNEL_IMAGE_SIZE is 128M, and MODULES_VADDR is 0xffffffff88000000.

However, in v3.12 Kees Cook introduced kaslr to randomise the location of kernel. And the kernel text mapping addr space is enlarged from 512M to 1G. That means now KERNEL_IMAGE_SIZE is variable, its value is 512M with kaslr support not compiled in and 1G with kaslr support compiled in. Accordingly the MODULES_VADDR is changed too to be:

So when kaslr is compiled in and enabled, the kernel text mapping addr space and modules vaddr space need be adjusted. Otherwise makedumpfile will collapse since the addr for some symbols is not correct.

Hence KERNEL_IMAGE_SIZE need be exported to vmcoreinfo and got in makedumpfile to help calculate MODULES_VADDR.

---
makedumpfile.c | 8 ++++++++
makedumpfile.h | 4 +++-

2 files changed, 11 insertions(+), 1 deletion(-)
makedumpfile.c +0 -0
index b4d43d8..48d73a8 100644

makedumpfile.c get_value_for_old_linux(void) · line 1572

Quoted 9 lines
makedumpfile.c +6 -0
@@ -1564,6 +1564,12 @@ get_value_for_old_linux(void)
 			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
 			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
 	}
+#ifdef __x86_64__
+	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
+		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
+			NUMBER(KERNEL_IMAGE_SIZE) = MODULES_VADDR_ORIG;
+	}
+#endif

This code looks wrong, the value of MODULES_VADDR will overflow as:

MODULES_VADDR = __START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE)

                = 0xffffffff80000000 + 0xffffffff88000000

I think the code should be fixed as:

makedumpfile.h:

    #define __START_KERNEL_map      (0xffffffff80000000)
    #define KERNEL_IMAGE_SIZE_ORIG      (0x0000000008000000) /* 2.6.25, or former */
    #define KERNEL_IMAGE_SIZE_2_6_26    (0x0000000020000000) /* 2.6.26, or later  */
    #define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))

makedumpfile.c:

	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG;
		else
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26;
	}

Thanks
Atsushi Kumagai

Quoted 42 lines
makedumpfile.c +2 -0
 	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
 		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
 			SIZE(pageflags) =
@@ -1813,6 +1819,7 @@ write_vmcoreinfo_data(void)
 	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
 
 	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	/*
 	 * write the source file of 1st kernel
@@ -2147,6 +2154,7 @@ read_vmcoreinfo(void)
 	READ_SRCFILE("pud_t", pud_t);
 
 	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	return TRUE;
 }
makedumpfile.h +3 -2
index 6493f61..28a3cac 100644
@@ -549,7 +549,8 @@ do { \
 #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
 
 #define __START_KERNEL_map	(0xffffffff80000000)
-#define MODULES_VADDR		(0xffffffff88000000)
+#define MODULES_VADDR_ORIG	(0xffffffff88000000)
+#define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
 #define MODULES_END		(0xfffffffffff00000)
 #define KVBASE			PAGE_OFFSET
 #define _SECTION_SIZE_BITS	(27)
@@ -1531,6 +1532,7 @@ struct number_table {
 	long    PG_hwpoison;
 
 	long	PAGE_BUDDY_MAPCOUNT_VALUE;
+	long	KERNEL_IMAGE_SIZE;
 	long	SECTION_SIZE_BITS;
 	long	MAX_PHYSMEM_BITS;
 };
--
Quoted 1 line

1.8.5.3

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw
Quoted 37 lines · Atsushi Kumagai
Quoted 5 lines
makedumpfile.c +0 -0
index b4d43d8..48d73a8 100644

makedumpfile.c get_value_for_old_linux(void) · line 1572

Quoted 9 lines
makedumpfile.c +6 -0
@@ -1564,6 +1564,12 @@ get_value_for_old_linux(void)
 			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
 			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
 	}
+#ifdef __x86_64__
+	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
+		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
+			NUMBER(KERNEL_IMAGE_SIZE) = MODULES_VADDR_ORIG;
+	}
+#endif

This code looks wrong, the value of MODULES_VADDR will overflow as:

MODULES_VADDR = __START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE)

                = 0xffffffff80000000 + 0xffffffff88000000

I think the code should be fixed as:

makedumpfile.h:

    #define __START_KERNEL_map      (0xffffffff80000000)
    #define KERNEL_IMAGE_SIZE_ORIG      (0x0000000008000000) /* 2.6.25, or former */
    #define KERNEL_IMAGE_SIZE_2_6_26    (0x0000000020000000) /* 2.6.26, or later  */
    #define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))

makedumpfile.c:

	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG;
		else
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26;
	}
Quoted 2 lines

Thanks
Atsushi Kumagai

Hi Atsushi,

This is the definition of KERNEL_IMAGE_SIZE
in arch/x86/include/asm/page_64_types.h. It's not 0xffffffff88000000. KERNEL_IMAGE_SIZE is a size value.

#define KERNEL_IMAGE_SIZE_DEFAULT (512 * 1024 * 1024)
#if defined(CONFIG_RANDOMIZE_BASE) && \
CONFIG_RANDOMIZE_BASE_MAX_OFFSET > KERNEL_IMAGE_SIZE_DEFAULT
#define KERNEL_IMAGE_SIZE CONFIG_RANDOMIZE_BASE_MAX_OFFSET
#else
#define KERNEL_IMAGE_SIZE KERNEL_IMAGE_SIZE_DEFAULT
#endif

Thanks
Baoquan

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#4 lore raw
In reply to Atsushi Kumagai
Quoted 51 lines · Atsushi Kumagai
Quoted 28 lines

In x86_64, since v2.6.26 the KERNEL_IMAGE_SIZE is changed to 512M, and according the MODULES_VADDR is changed to 0xffffffffa0000000. Before that, KERNEL_IMAGE_SIZE is 128M, and MODULES_VADDR is 0xffffffff88000000.

However, in v3.12 Kees Cook introduced kaslr to randomise the location of kernel. And the kernel text mapping addr space is enlarged from 512M to 1G. That means now KERNEL_IMAGE_SIZE is variable, its value is 512M with kaslr support not compiled in and 1G with kaslr support compiled in. Accordingly the MODULES_VADDR is changed too to be:

So when kaslr is compiled in and enabled, the kernel text mapping addr space and modules vaddr space need be adjusted. Otherwise makedumpfile will collapse since the addr for some symbols is not correct.

Hence KERNEL_IMAGE_SIZE need be exported to vmcoreinfo and got in makedumpfile to help calculate MODULES_VADDR.

---
makedumpfile.c | 8 ++++++++
makedumpfile.h | 4 +++-

2 files changed, 11 insertions(+), 1 deletion(-)
makedumpfile.c +0 -0
index b4d43d8..48d73a8 100644

makedumpfile.c get_value_for_old_linux(void) · line 1572

Quoted 9 lines
makedumpfile.c +6 -0
@@ -1564,6 +1564,12 @@ get_value_for_old_linux(void)
 			NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE) =
 			PAGE_BUDDY_MAPCOUNT_VALUE_v2_6_39_to_latest_version;
 	}
+#ifdef __x86_64__
+	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
+		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
+			NUMBER(KERNEL_IMAGE_SIZE) = MODULES_VADDR_ORIG;
+	}
+#endif

This code looks wrong, the value of MODULES_VADDR will overflow as:

MODULES_VADDR = __START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE)

                = 0xffffffff80000000 + 0xffffffff88000000

I think the code should be fixed as:

makedumpfile.h:

    #define __START_KERNEL_map      (0xffffffff80000000)
    #define KERNEL_IMAGE_SIZE_ORIG      (0x0000000008000000) /* 2.6.25, or former */
    #define KERNEL_IMAGE_SIZE_2_6_26    (0x0000000020000000) /* 2.6.26, or later  */
    #define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
Quoted 7 lines

makedumpfile.c:

	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG;
		else
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26;
	}

Well, I got what you mean. The reason I did that is because before kaslr is introduced 0xffffffff88000000 is always correct. Since if kernel location is usually 16M and no one put it any other places. And since kernel image is not greater than 128M up to now, it's always correct even though later kernel image size is increased to 512M. I wanted to use that.

Now you are suggesting to make it clear what the size it truly is in kernel. That's also good. I can repost it with your suggestion.

Thanks
Baoquan

Quoted 41 lines

Thanks
Atsushi Kumagai

Quoted 36 lines
makedumpfile.c +2 -0
 	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
 		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
 			SIZE(pageflags) =
@@ -1813,6 +1819,7 @@ write_vmcoreinfo_data(void)
 	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
 
 	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	/*
 	 * write the source file of 1st kernel
@@ -2147,6 +2154,7 @@ read_vmcoreinfo(void)
 	READ_SRCFILE("pud_t", pud_t);
 
 	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	return TRUE;
 }
makedumpfile.h +2 -1
index 6493f61..28a3cac 100644
@@ -549,7 +549,8 @@ do { \
 #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
 
 #define __START_KERNEL_map	(0xffffffff80000000)
-#define MODULES_VADDR		(0xffffffff88000000)
+#define MODULES_VADDR_ORIG	(0xffffffff88000000)
+#define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
 #define MODULES_END		(0xfffffffffff00000)
 #define KVBASE			PAGE_OFFSET
 #define _SECTION_SIZE_BITS	(27)
@@ -1531,6 +1532,7 @@ struct number_table {
 	long    PG_hwpoison;
 
Quoted 8 lines
Quoted 7 lines
makedumpfile.h +1 -1
 	long	PAGE_BUDDY_MAPCOUNT_VALUE;
+	long	KERNEL_IMAGE_SIZE;
 	long	SECTION_SIZE_BITS;
 	long	MAX_PHYSMEM_BITS;
 };
--

1.8.5.3

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#5 lore raw
Quoted 21 lines
Quoted 13 lines

This code looks wrong, the value of MODULES_VADDR will overflow as:

MODULES_VADDR = __START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE)

                = 0xffffffff80000000 + 0xffffffff88000000

I think the code should be fixed as:

makedumpfile.h:

    #define __START_KERNEL_map      (0xffffffff80000000)
    #define KERNEL_IMAGE_SIZE_ORIG      (0x0000000008000000) /* 2.6.25, or former */
    #define KERNEL_IMAGE_SIZE_2_6_26    (0x0000000020000000) /* 2.6.26, or later  */
    #define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
Quoted 7 lines

makedumpfile.c:

	if (NUMBER(KERNEL_IMAGE_SIZE) == NOT_FOUND_NUMBER) {
		if (info->kernel_version < KERNEL_VERSION(2, 6, 26))
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_ORIG;
		else
			NUMBER(KERNEL_IMAGE_SIZE) = KERNEL_IMAGE_SIZE_2_6_26;
	}
Quoted 6 lines

Well, I got what you mean. The reason I did that is because before kaslr is introduced 0xffffffff88000000 is always correct. Since if kernel location is usually 16M and no one put it any other places. And since kernel image is not greater than 128M up to now, it's always correct even though later kernel image size is increased to 512M. I wanted to use that.

Thanks, I understand your thoughts.

Quoted 2 lines

Now you are suggesting to make it clear what the size it truly is in kernel. That's also good. I can repost it with your suggestion.

I still prefer my idea, I would like to wait for your repost.

Thanks
Atsushi Kumagai

Quoted 52 lines

Thanks
Baoquan

Quoted 49 lines

Thanks
Atsushi Kumagai

Quoted 43 lines
	if (SIZE(pageflags) == NOT_FOUND_STRUCTURE) {
		if (info->kernel_version >= KERNEL_VERSION(2, 6, 27))
			SIZE(pageflags) =
makedumpfile.c +2 -0
@@ -1813,6 +1819,7 @@ write_vmcoreinfo_data(void)
 	WRITE_NUMBER("PG_hwpoison", PG_hwpoison);
 
 	WRITE_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	WRITE_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	/*
 	 * write the source file of 1st kernel
@@ -2147,6 +2154,7 @@ read_vmcoreinfo(void)
 	READ_SRCFILE("pud_t", pud_t);
 
 	READ_NUMBER("PAGE_BUDDY_MAPCOUNT_VALUE", PAGE_BUDDY_MAPCOUNT_VALUE);
+	READ_NUMBER("KERNEL_IMAGE_SIZE", KERNEL_IMAGE_SIZE);
 
 	return TRUE;
 }
makedumpfile.h +3 -2
index 6493f61..28a3cac 100644
@@ -549,7 +549,8 @@ do { \
 #define VMEMMAP_END_2_6_31	(0xffffeaffffffffff) /* 2.6.31, or later  */
 
 #define __START_KERNEL_map	(0xffffffff80000000)
-#define MODULES_VADDR		(0xffffffff88000000)
+#define MODULES_VADDR_ORIG	(0xffffffff88000000)
+#define MODULES_VADDR          (__START_KERNEL_map + NUMBER(KERNEL_IMAGE_SIZE))
 #define MODULES_END		(0xfffffffffff00000)
 #define KVBASE			PAGE_OFFSET
 #define _SECTION_SIZE_BITS	(27)
@@ -1531,6 +1532,7 @@ struct number_table {
 	long    PG_hwpoison;
 
 	long	PAGE_BUDDY_MAPCOUNT_VALUE;
+	long	KERNEL_IMAGE_SIZE;
 	long	SECTION_SIZE_BITS;
 	long	MAX_PHYSMEM_BITS;
 };
--

1.8.5.3

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec