Skip to contentSkip to conversation

x86/kdump: bugfix, make the behavior of crashkernel=X consistent with kaslr

PATCH Superseded Pingfan Liu 3 participants 7 messages Dec 14, 2018 – Dec 27, 2018

Subsystems (3)

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/kdump: bugfix, make the behavior of crashkernel=X consistent with kaslr

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/setup.c +6 -3
index d494b9b..60f12c4 100644
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
 	/* 0 means: find the address automatically */
 	if (crash_base <= 0) {
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(true);
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
 		 * as old kexec-tools loads bzImage below that, unless
 		 * "crashkernel=size[KMG],high" is specified.
 		 */
 		crash_base = memblock_find_in_range(CRASH_ALIGN,
-						    high ? CRASH_ADDR_HIGH_MAX
-							 : CRASH_ADDR_LOW_MAX,
-						    crash_size, CRASH_ALIGN);
+			(max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(false);
+
 		if (!crash_base) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
 			return;
Signature · 1 line
2.7.4
Acked-by on v2 1/1
#1 lore raw
Quoted 35 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

Quoted 5 lines

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

This is a bug fix and urged by our customer.

I personally think crashkernel=xx@ is a generic synctax, the current code making it search only under 896 MB seems not so reasonable.

Ack this patch.

Thanks
Baoquan

Quoted 30 lines
arch/x86/kernel/setup.c +6 -3
index d494b9b..60f12c4 100644
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
 	/* 0 means: find the address automatically */
 	if (crash_base <= 0) {
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(true);
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
 		 * as old kexec-tools loads bzImage below that, unless
 		 * "crashkernel=size[KMG],high" is specified.
 		 */
 		crash_base = memblock_find_in_range(CRASH_ALIGN,
-						    high ? CRASH_ADDR_HIGH_MAX
-							 : CRASH_ADDR_LOW_MAX,
-						    crash_size, CRASH_ALIGN);
+			(max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(false);
+
 		if (!crash_base) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
 			return;
Signature · 1 line
2.7.4
#2 lore raw
Quoted 42 lines · Baoquan He
Quoted 35 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

Quoted 5 lines

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Quoted 3 lines

This is a bug fix and urged by our customer.

I personally think crashkernel=xx@ is a generic synctax, the current

                                 ~~ s/@/M
Quoted 39 lines

code making it search only under 896 MB seems not so reasonable.

Ack this patch.

Thanks
Baoquan

Quoted 30 lines
arch/x86/kernel/setup.c +6 -3
index d494b9b..60f12c4 100644
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
 	/* 0 means: find the address automatically */
 	if (crash_base <= 0) {
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(true);
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
 		 * as old kexec-tools loads bzImage below that, unless
 		 * "crashkernel=size[KMG],high" is specified.
 		 */
 		crash_base = memblock_find_in_range(CRASH_ALIGN,
-						    high ? CRASH_ADDR_HIGH_MAX
-							 : CRASH_ADDR_LOW_MAX,
-						    crash_size, CRASH_ALIGN);
+			(max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(false);
+
 		if (!crash_base) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
 			return;
Signature · 1 line
2.7.4
#3 lore raw
In reply to Pingfan Liu
Quoted 53 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/setup.c +2 -0
index d494b9b..60f12c4 100644
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
 	/* 0 means: find the address automatically */
 	if (crash_base <= 0) {
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(true);
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,

arch/x86/kernel/setup.c static void __init reserve_crashkernel(void) · line 554

Quoted 10 lines
arch/x86/kernel/setup.c +3 -3
 		 * as old kexec-tools loads bzImage below that, unless
 		 * "crashkernel=size[KMG],high" is specified.
 		 */
 		crash_base = memblock_find_in_range(CRASH_ALIGN,
-						    high ? CRASH_ADDR_HIGH_MAX
-							 : CRASH_ADDR_LOW_MAX,
-						    crash_size, CRASH_ALIGN);
+			(max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(false);

The previous memblock_set_bottom_up(true) set it as true, so "!memblock_bottom_up()" is impossible, not sure what is the point of this condition check.

Do you want to restore the original memblock direction? If so a variable to save the old direction is needed. But is this really necessary? Do you know any side effects of setting the bottom up as true?

Quoted 12 lines
arch/x86/kernel/setup.c +1 -0
+
 		if (!crash_base) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
 			return;
Signature · 7 lines
2.7.4


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

Thanks
Dave

#4 lore raw
Quoted 70 lines · Dave Young
Quoted 53 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/setup.c +2 -0
index d494b9b..60f12c4 100644
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
      /* 0 means: find the address automatically */
      if (crash_base <= 0) {
+             if (!memblock_bottom_up())
+                     memblock_set_bottom_up(true);
              /*
               * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,

arch/x86/kernel/setup.c static void __init reserve_crashkernel(void) · line 554

Quoted 10 lines
arch/x86/kernel/setup.c +3 -3
               * as old kexec-tools loads bzImage below that, unless
               * "crashkernel=size[KMG],high" is specified.
               */
              crash_base = memblock_find_in_range(CRASH_ALIGN,
-                                                 high ? CRASH_ADDR_HIGH_MAX
-                                                      : CRASH_ADDR_LOW_MAX,
-                                                 crash_size, CRASH_ALIGN);
+                     (max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+             if (!memblock_bottom_up())
+                     memblock_set_bottom_up(false);

The previous memblock_set_bottom_up(true) set it as true, so "!memblock_bottom_up()" is impossible, not sure what is the point of this condition check.

Quoted 4 lines

Do you want to restore the original memblock direction? If so a variable to save the old direction is needed. But is this really necessary? Do you know any side effects of setting the bottom up as true?

Yes, will fix it.

Thanks

Quoted 8 lines
Quoted 8 lines
arch/x86/kernel/setup.c +1 -1
+
              if (!crash_base) {
                      pr_info("crashkernel reservation failed - No suitable area found.\n");
                      return;
--

2.7.4

Quoted 7 lines
Quoted 4 lines

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

Thanks
Dave

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

#5 lore raw
In reply to Pingfan Liu
Quoted 46 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/setup.c +0 -0
index d494b9b..60f12c4 100644

arch/x86/kernel/setup.c static void __init reserve_crashkernel(void) · line 545

Quoted 5 lines
arch/x86/kernel/setup.c +2 -0
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
 	/* 0 means: find the address automatically */
 	if (crash_base <= 0) {
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(true);

Looking at the memblock_find_in_range_node code, it is allocating bottom up in case bottom_up is true, but it will try to allocate above kernel_end:

bottom_up_start = max(start, kernel_end);

If kernel lives very high eg. KASLR case, then this bottom up way does not help. So probably previous old version to try 896M first then 4G then maxmem is better.

Quoted 19 lines
arch/x86/kernel/setup.c +4 -3
 		/*
 		 * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
 		 * as old kexec-tools loads bzImage below that, unless
 		 * "crashkernel=size[KMG],high" is specified.
 		 */
 		crash_base = memblock_find_in_range(CRASH_ALIGN,
-						    high ? CRASH_ADDR_HIGH_MAX
-							 : CRASH_ADDR_LOW_MAX,
-						    crash_size, CRASH_ALIGN);
+			(max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+		if (!memblock_bottom_up())
+			memblock_set_bottom_up(false);
+
 		if (!crash_base) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
 			return;
Signature · 1 line
2.7.4
#6 lore raw
Quoted 58 lines · Dave Young
Quoted 46 lines · Pingfan Liu

Customer reported a bug on a high end server with many pcie devices, where kernel bootup with crashkernel=384M, and kaslr is enabled. Even though we still see much memory under 896 MB, the finding still failed intermittently. Because currently we can only find region under 896 MB, if w/0 ',high' specified. Then KASLR breaks 896 MB into several parts randomly, and crashkernel reservation need be aligned to 128 MB, that's why failure is found. It raises confusion to the end user that sometimes crashkernel=X works while sometimes fails.
If want to make it succeed, customer can change kernel option to "crashkernel=384M, high". Just this give "crashkernel=xx@yy" a very limited space to behave even though its grammer looks more generic. And we can't answer questions raised from customer that confidently:
1) why it doesn't succeed to reserve 896 MB;
2) what's wrong with memory region under 4G;
3) why I have to add ',high', I only require 384 MB, not 3840 MB.

This patch simplifies the method suggested in the mail [1]. It just goes bottom-up to find a candidate region for crashkernel. The bottom-up may be better compatible with the old reservation style, i.e. still want to get memory region from 896 MB firstly, then [896 MB, 4G], finally above 4G.

There is one trivial thing about the compatibility with old kexec-tools:
if the reserved region is above 896M, then old tool will fail to load bzImage. But without this patch, the old tool also fail since there is no memory below 896M can be reserved for crashkernel.

[1]: http://lists.infradead.org/pipermail/kexec/2017-October/019571.html

---
v1->v2:
improve commit log

 arch/x86/kernel/setup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/kernel/setup.c +0 -0
index d494b9b..60f12c4 100644

arch/x86/kernel/setup.c static void __init reserve_crashkernel(void) · line 545

Quoted 5 lines
arch/x86/kernel/setup.c +2 -0
@@ -541,15 +541,18 @@ static void __init reserve_crashkernel(void)
 
      /* 0 means: find the address automatically */
      if (crash_base <= 0) {
+             if (!memblock_bottom_up())
+                     memblock_set_bottom_up(true);

Looking at the memblock_find_in_range_node code, it is allocating bottom up in case bottom_up is true, but it will try to allocate above kernel_end:

Quoted 6 lines

bottom_up_start = max(start, kernel_end);

If kernel lives very high eg. KASLR case, then this bottom up way does not help. So probably previous old version to try 896M first then 4G then maxmem is better.

Yes, you are right. I will try to see whether it can be resolved or not.

Thanks,
Pingfan

Quoted 19 lines
Quoted 19 lines
arch/x86/kernel/setup.c +4 -4
              /*
               * Set CRASH_ADDR_LOW_MAX upper bound for crash memory,
               * as old kexec-tools loads bzImage below that, unless
               * "crashkernel=size[KMG],high" is specified.
               */
              crash_base = memblock_find_in_range(CRASH_ALIGN,
-                                                 high ? CRASH_ADDR_HIGH_MAX
-                                                      : CRASH_ADDR_LOW_MAX,
-                                                 crash_size, CRASH_ALIGN);
+                     (max_pfn * PAGE_SIZE), crash_size, CRASH_ALIGN);
+             if (!memblock_bottom_up())
+                     memblock_set_bottom_up(false);
+
              if (!crash_base) {
                      pr_info("crashkernel reservation failed - No suitable area found.\n");
                      return;
--

2.7.4