Skip to contentSkip to conversation

condition check fix

PATCH RESEND In review WANG Chao 3 participants 5 messages May 8, 2014 – May 11, 2014

Subsystems (2)
lore
Share & tools
lore

WANG Chao

author
#0 lore raw

PATCH RESEND 1/1 condition check fix

In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via e820 table or setup_data"), I made a wrong condition check.

We should only add cmdline for a memory range if --pass-memmap-cmdline and the range type isn't RANGE_RESERVED.

---
 kexec/arch/i386/crashdump-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kexec/arch/i386/crashdump-x86.c +1 -1
index cc33347..999a837 100644
@@ -1000,7 +1000,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
 		type = mem_range[i].type;
 		size = end - start + 1;
 		add_memmap(memmap_p, &nr_memmap, start, size, type);
-		if (arch_options.pass_memmap_cmdline || type != RANGE_RESERVED)
+		if (arch_options.pass_memmap_cmdline && type != RANGE_RESERVED)
 			cmdline_add_memmap_acpi(mod_cmdline, start, end);
 	}
 
Signature · 7 lines
1.9.0


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · WANG Chao

In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via e820 table or setup_data"), I made a wrong condition check.

We should only add cmdline for a memory range if --pass-memmap-cmdline and the range type isn't RANGE_RESERVED.

Ok, this fixes the issue for me. Thanks.

BTW, on a related note, I see that we are doing GART check two times.

                } else if (memcmp(str, "GART\n", 5) == 0) {
                } else if (memcmp(str, "GART\n", 5) == 0) {

I am not sure if it is due to your patches or not.

Thanks
Vivek

Quoted 19 lines
---
 kexec/arch/i386/crashdump-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kexec/arch/i386/crashdump-x86.c +1 -1
index cc33347..999a837 100644
@@ -1000,7 +1000,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
 		type = mem_range[i].type;
 		size = end - start + 1;
 		add_memmap(memmap_p, &nr_memmap, start, size, type);
-		if (arch_options.pass_memmap_cmdline || type != RANGE_RESERVED)
+		if (arch_options.pass_memmap_cmdline && type != RANGE_RESERVED)
 			cmdline_add_memmap_acpi(mod_cmdline, start, end);
 	}
 
Signature · 1 line
1.9.0

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

author
#2 lore raw
Quoted 11 lines · Vivek Goyal
Quoted 7 lines · WANG Chao

In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via e820 table or setup_data"), I made a wrong condition check.

We should only add cmdline for a memory range if --pass-memmap-cmdline and the range type isn't RANGE_RESERVED.

Ok, this fixes the issue for me. Thanks.

Quoted 8 lines

BTW, on a related note, I see that we are doing GART check two times.

                } else if (memcmp(str, "GART\n", 5) == 0) {
                } else if (memcmp(str, "GART\n", 5) == 0) {

I am not sure if it is due to your patches or not.

Right, another stupid carelessness. Already sent a fix.

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

#3 lore raw
In reply to Vivek Goyal
Quoted 4 lines · Vivek Goyal
Quoted 3 lines · WANG Chao

In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via e820 table or setup_data"), I made a wrong condition check.

Quoted 8 lines
Quoted 4 lines

We should only add cmdline for a memory range if --pass-memmap-cmdline and the range type isn't RANGE_RESERVED.

Ok, this fixes the issue for me. Thanks.

Thanks, and apologies for the delay.
I am currently returning from a weeks vacation.
I have applied this locally and will push it some
time after I get off the plane ride home.

Quoted 6 lines

BTW, on a related note, I see that we are doing GART check two times.

                } else if (memcmp(str, "GART\n", 5) == 0) {
                } else if (memcmp(str, "GART\n", 5) == 0) {

I am not sure if it is due to your patches or not.

I believe it is introduced in the same patch that is mentioned above. Chao, could you post a fix?

Quoted 20 lines

Thanks
Vivek

Quoted 17 lines
---
 kexec/arch/i386/crashdump-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kexec/arch/i386/crashdump-x86.c +1 -1
index cc33347..999a837 100644
@@ -1000,7 +1000,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
 		type = mem_range[i].type;
 		size = end - start + 1;
 		add_memmap(memmap_p, &nr_memmap, start, size, type);
-		if (arch_options.pass_memmap_cmdline || type != RANGE_RESERVED)
+		if (arch_options.pass_memmap_cmdline && type != RANGE_RESERVED)
 			cmdline_add_memmap_acpi(mod_cmdline, start, end);
 	}
 
Quoted 3 lines
Quoted 2 lines
Signature · 1 line
1.9.0

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

#4 lore raw
Quoted 21 lines · Simon Horman
Quoted 4 lines · Vivek Goyal
Quoted 3 lines · WANG Chao

In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via e820 table or setup_data"), I made a wrong condition check.

Quoted 8 lines
Quoted 4 lines

We should only add cmdline for a memory range if --pass-memmap-cmdline and the range type isn't RANGE_RESERVED.

Ok, this fixes the issue for me. Thanks.

Thanks, and apologies for the delay.
I am currently returning from a weeks vacation.
I have applied this locally and will push it some
time after I get off the plane ride home.

Quoted 2 lines

BTW, on a related note, I see that we are doing GART check two times.

Quoted 7 lines
Quoted 4 lines
                } else if (memcmp(str, "GART\n", 5) == 0) {
                } else if (memcmp(str, "GART\n", 5) == 0) {

I am not sure if it is due to your patches or not.

I believe it is introduced in the same patch that is mentioned above. Chao, could you post a fix?

I see you have already done so, thanks.

Quoted 21 lines
Quoted 21 lines

Thanks
Vivek

Quoted 17 lines
---
 kexec/arch/i386/crashdump-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kexec/arch/i386/crashdump-x86.c +1 -1
index cc33347..999a837 100644
@@ -1000,7 +1000,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
 		type = mem_range[i].type;
 		size = end - start + 1;
 		add_memmap(memmap_p, &nr_memmap, start, size, type);
-		if (arch_options.pass_memmap_cmdline || type != RANGE_RESERVED)
+		if (arch_options.pass_memmap_cmdline && type != RANGE_RESERVED)
 			cmdline_add_memmap_acpi(mod_cmdline, start, end);
 	}
 
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Signature · 1 line
1.9.0

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