[Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Amerigo Wang]

Vivek pointed out that I missed the i386 part in this commit,

	commit 1100580b05e3fdfe648d9be8617d962b11f4b88b
	Author: Amerigo Wang <amwang@redhat.com>
	Date:   Thu Mar 3 00:10:43 2011 +0800

	    get the backup area dynamically

Yes. The customer who reported that bug definitely only
tested it on x86_64. Now make it complete.

Signed-off-by: Amerigo Wang <amwang@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Simon Horman <horms@verge.net.au>

---
diff --git a/kexec/arch/i386/kexec-x86.c b/kexec/arch/i386/kexec-x86.c
index 5c701aa..014ecd5 100644
--- a/kexec/arch/i386/kexec-x86.c
+++ b/kexec/arch/i386/kexec-x86.c
@@ -184,6 +184,10 @@ void arch_update_purgatory(struct kexec_info *info)
 		&arch_options.console_vga, sizeof(arch_options.console_vga));
 	elf_rel_set_symbol(&info->rhdr, "console_serial",
 		&arch_options.console_serial, sizeof(arch_options.console_serial));
+	elf_rel_set_symbol(&info->rhdr, "backup_src_start",
+		&info->backup_src_start, sizeof(info->backup_src_start));
+	elf_rel_set_symbol(&info->rhdr, "backup_src_size",
+		&info->backup_src_size, sizeof(info->backup_src_size));
 	if (info->kexec_flags & KEXEC_ON_CRASH) {
 		panic_kernel = 1;
 		elf_rel_set_symbol(&info->rhdr, "backup_start",

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Simon Horman]

On Sun, Apr 17, 2011 at 04:29:05PM +0800, Amerigo Wang wrote:
> Vivek pointed out that I missed the i386 part in this commit,
> 
> 	commit 1100580b05e3fdfe648d9be8617d962b11f4b88b
> 	Author: Amerigo Wang <amwang@redhat.com>
> 	Date:   Thu Mar 3 00:10:43 2011 +0800
> 
> 	    get the backup area dynamically
> 
> Yes. The customer who reported that bug definitely only
> tested it on x86_64. Now make it complete.

Thanks, applied.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Vivek Goyal]

On Sun, Apr 17, 2011 at 04:29:05PM +0800, Amerigo Wang wrote:
> Vivek pointed out that I missed the i386 part in this commit,
> 
> 	commit 1100580b05e3fdfe648d9be8617d962b11f4b88b
> 	Author: Amerigo Wang <amwang@redhat.com>
> 	Date:   Thu Mar 3 00:10:43 2011 +0800
> 
> 	    get the backup area dynamically
> 
> Yes. The customer who reported that bug definitely only
> tested it on x86_64. Now make it complete.

Hi Amerigo,

Have you verified the contents of backup area? I want to make sure that
everything is working and in second kernel when we read up vmcore, we
do read contents properly.

Thanks
Vivek

> 
> Signed-off-by: Amerigo Wang <amwang@redhat.com>
> Cc: Vivek Goyal <vgoyal@redhat.com>
> Cc: Simon Horman <horms@verge.net.au>
> 
> ---
> diff --git a/kexec/arch/i386/kexec-x86.c b/kexec/arch/i386/kexec-x86.c
> index 5c701aa..014ecd5 100644
> --- a/kexec/arch/i386/kexec-x86.c
> +++ b/kexec/arch/i386/kexec-x86.c
> @@ -184,6 +184,10 @@ void arch_update_purgatory(struct kexec_info *info)
>  		&arch_options.console_vga, sizeof(arch_options.console_vga));
>  	elf_rel_set_symbol(&info->rhdr, "console_serial",
>  		&arch_options.console_serial, sizeof(arch_options.console_serial));
> +	elf_rel_set_symbol(&info->rhdr, "backup_src_start",
> +		&info->backup_src_start, sizeof(info->backup_src_start));
> +	elf_rel_set_symbol(&info->rhdr, "backup_src_size",
> +		&info->backup_src_size, sizeof(info->backup_src_size));
>  	if (info->kexec_flags & KEXEC_ON_CRASH) {
>  		panic_kernel = 1;
>  		elf_rel_set_symbol(&info->rhdr, "backup_start",

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Cong Wang]

于 2011年04月18日 20:58, Vivek Goyal 写道:
> On Sun, Apr 17, 2011 at 04:29:05PM +0800, Amerigo Wang wrote:
>> Vivek pointed out that I missed the i386 part in this commit,
>>
>> 	commit 1100580b05e3fdfe648d9be8617d962b11f4b88b
>> 	Author: Amerigo Wang<amwang@redhat.com>
>> 	Date:   Thu Mar 3 00:10:43 2011 +0800
>>
>> 	    get the backup area dynamically
>>
>> Yes. The customer who reported that bug definitely only
>> tested it on x86_64. Now make it complete.
>
> Hi Amerigo,
>
> Have you verified the contents of backup area? I want to make sure that
> everything is working and in second kernel when we read up vmcore, we
> do read contents properly.
>

Not yet, I am still trying to figure out what the problem is.
I will send another patch once I know how to fix it, so, although this
patch doesn't fix that problem, it is clearly needed.

Thanks.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Cong Wang]

于 2011年04月19日 20:47, Cong Wang 写道:
> 于 2011年04月18日 20:58, Vivek Goyal 写道:
>> Have you verified the contents of backup area? I want to make sure that
>> everything is working and in second kernel when we read up vmcore, we
>> do read contents properly.
>>
>
> Not yet, I am still trying to figure out what the problem is.
> I will send another patch once I know how to fix it, so, although this
> patch doesn't fix that problem, it is clearly needed.

Ok, the issue I discussed with Vivek does _not_ apply to upstream,
that is a mistake when I backported the patch to RHEL5.

So, for upstream the patch in this thread is enough.

Hope this is clear now.

Thanks.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Vivek Goyal]

On Wed, Apr 20, 2011 at 12:20:13AM +0800, Cong Wang wrote:
> 于 2011年04月19日 20:47, Cong Wang 写道:
> >于 2011年04月18日 20:58, Vivek Goyal 写道:
> >>Have you verified the contents of backup area? I want to make sure that
> >>everything is working and in second kernel when we read up vmcore, we
> >>do read contents properly.
> >>
> >
> >Not yet, I am still trying to figure out what the problem is.
> >I will send another patch once I know how to fix it, so, although this
> >patch doesn't fix that problem, it is clearly needed.
> 
> Ok, the issue I discussed with Vivek does _not_ apply to upstream,
> that is a mistake when I backported the patch to RHEL5.
> 
> So, for upstream the patch in this thread is enough.
> 
> Hope this is clear now.

So again, have you done testing on upstream kernels to make sure backup
area contents are fine?

Thanks
Vivek

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [Patch] kexec: fix the missing i386 part in commit 1100580b05e

[Cong Wang]

于 2011年04月20日 00:53, Vivek Goyal 写道:
> On Wed, Apr 20, 2011 at 12:20:13AM +0800, Cong Wang wrote:
>> 于 2011年04月19日 20:47, Cong Wang 写道:
>>> 于 2011年04月18日 20:58, Vivek Goyal 写道:
>>>> Have you verified the contents of backup area? I want to make sure that
>>>> everything is working and in second kernel when we read up vmcore, we
>>>> do read contents properly.
>>>>
>>>
>>> Not yet, I am still trying to figure out what the problem is.
>>> I will send another patch once I know how to fix it, so, although this
>>> patch doesn't fix that problem, it is clearly needed.
>>
>> Ok, the issue I discussed with Vivek does _not_ apply to upstream,
>> that is a mistake when I backported the patch to RHEL5.
>>
>> So, for upstream the patch in this thread is enough.
>>
>> Hope this is clear now.
>
> So again, have you done testing on upstream kernels to make sure backup
> area contents are fine?

I did a crash reboot test and didn't see any problems,
but I didn't check the backup area contents. :-/

I will look at this shortly.

Thanks.

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec