2020-09-30 10:25:19

by Alexander Egorenkov

[permalink] [raw]
Subject: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

The offset of the field 'init_uts_ns.name' has changed
since commit 9a56493f6942 ("uts: Use generic ns_common::count").

Link: https://lore.kernel.org/r/159644978167.604812.1773586504374412107.stgit@localhost.localdomain

Make the offset of the field 'uts_namespace.name' available
in VMCOREINFO because tools like 'crash-utility' and
'makedumpfile' must be able to read it from crash dumps.

Signed-off-by: Alexander Egorenkov <[email protected]>
---

v2 -> v3:
* Added documentation to vmcoreinfo.rst
* Use the short form of the commit reference

v1 -> v2:
* Improved commit message
* Added link to the discussion of the uts namespace changes

Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 ++++++
kernel/crash_core.c | 1 +
2 files changed, 7 insertions(+)

diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst
index e44a6c01f336..3861a25faae1 100644
--- a/Documentation/admin-guide/kdump/vmcoreinfo.rst
+++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst
@@ -39,6 +39,12 @@ call.
User-space tools can get the kernel name, host name, kernel release
number, kernel version, architecture name and OS type from it.

+(uts_namespace, name)
+---------------------
+
+Offset of the name's member. Crash Utility and Makedumpfile get
+the start address of the init_uts_ns.name from this.
+
node_online_map
---------------

diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 106e4500fd53..173fdc261882 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -447,6 +447,7 @@ static int __init crash_save_vmcoreinfo_init(void)
VMCOREINFO_PAGESIZE(PAGE_SIZE);

VMCOREINFO_SYMBOL(init_uts_ns);
+ VMCOREINFO_OFFSET(uts_namespace, name);
VMCOREINFO_SYMBOL(node_online_map);
#ifdef CONFIG_MMU
VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
--
2.26.2


2020-10-02 02:41:15

by Lianbo Jiang

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

Hi, Alexander

在 2020年09月30日 18:23, Alexander Egorenkov 写道:
> The offset of the field 'init_uts_ns.name' has changed
> since commit 9a56493f6942 ("uts: Use generic ns_common::count").
>
> Link: https://lore.kernel.org/r/159644978167.604812.1773586504374412107.stgit@localhost.localdomain
>
> Make the offset of the field 'uts_namespace.name' available
> in VMCOREINFO because tools like 'crash-utility' and
> 'makedumpfile' must be able to read it from crash dumps.
>
> Signed-off-by: Alexander Egorenkov <[email protected]>
> ---
>
> v2 -> v3:
> * Added documentation to vmcoreinfo.rst
> * Use the short form of the commit reference
>
> v1 -> v2:
> * Improved commit message
> * Added link to the discussion of the uts namespace changes
>
> Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 ++++++
> kernel/crash_core.c | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> index e44a6c01f336..3861a25faae1 100644
> --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst
> +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> @@ -39,6 +39,12 @@ call.
> User-space tools can get the kernel name, host name, kernel release
> number, kernel version, architecture name and OS type from it.
>
> +(uts_namespace, name)
> +---------------------
> +
> +Offset of the name's member. Crash Utility and Makedumpfile get
> +the start address of the init_uts_ns.name from this.
> +

Thank you for the update. The v3 looks good to me.

> node_online_map
> ---------------
>
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index 106e4500fd53..173fdc261882 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -447,6 +447,7 @@ static int __init crash_save_vmcoreinfo_init(void)
> VMCOREINFO_PAGESIZE(PAGE_SIZE);
>
> VMCOREINFO_SYMBOL(init_uts_ns);
> + VMCOREINFO_OFFSET(uts_namespace, name);
> VMCOREINFO_SYMBOL(node_online_map);
> #ifdef CONFIG_MMU
> VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
>

2020-10-20 17:16:54

by Baoquan He

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> The offset of the field 'init_uts_ns.name' has changed
> since commit 9a56493f6942 ("uts: Use generic ns_common::count").
>
> Link: https://lore.kernel.org/r/159644978167.604812.1773586504374412107.stgit@localhost.localdomain
>
> Make the offset of the field 'uts_namespace.name' available
> in VMCOREINFO because tools like 'crash-utility' and
> 'makedumpfile' must be able to read it from crash dumps.
>
> Signed-off-by: Alexander Egorenkov <[email protected]>

Ack, thanks.

Acked-by: Baoquan He <[email protected]>

> ---
>
> v2 -> v3:
> * Added documentation to vmcoreinfo.rst
> * Use the short form of the commit reference
>
> v1 -> v2:
> * Improved commit message
> * Added link to the discussion of the uts namespace changes
>
> Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 ++++++
> kernel/crash_core.c | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> index e44a6c01f336..3861a25faae1 100644
> --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst
> +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> @@ -39,6 +39,12 @@ call.
> User-space tools can get the kernel name, host name, kernel release
> number, kernel version, architecture name and OS type from it.
>
> +(uts_namespace, name)
> +---------------------
> +
> +Offset of the name's member. Crash Utility and Makedumpfile get
> +the start address of the init_uts_ns.name from this.
> +
> node_online_map
> ---------------
>
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index 106e4500fd53..173fdc261882 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -447,6 +447,7 @@ static int __init crash_save_vmcoreinfo_init(void)
> VMCOREINFO_PAGESIZE(PAGE_SIZE);
>
> VMCOREINFO_SYMBOL(init_uts_ns);
> + VMCOREINFO_OFFSET(uts_namespace, name);
> VMCOREINFO_SYMBOL(node_online_map);
> #ifdef CONFIG_MMU
> VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
> --
> 2.26.2
>

2021-01-08 03:37:26

by Baoquan He

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> The offset of the field 'init_uts_ns.name' has changed
> since commit 9a56493f6942 ("uts: Use generic ns_common::count").

This patch is merged into 5.11-rc1, but we met the makedumpfile failure
of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
commit 9a56493f6942 is merged into 5.9-rc2.

Below tag and CC should have been added into patch when posted.

Fixes: commit 9a56493f6942 ("uts: Use generic ns_common::count")
Cc: <[email protected]>

Hi Greg,

Do we still have chance to make it added into stable?

Thanks
Baoquan

>
> Link: https://lore.kernel.org/r/159644978167.604812.1773586504374412107.stgit@localhost.localdomain
>
> Make the offset of the field 'uts_namespace.name' available
> in VMCOREINFO because tools like 'crash-utility' and
> 'makedumpfile' must be able to read it from crash dumps.
>
> Signed-off-by: Alexander Egorenkov <[email protected]>
> ---
>
> v2 -> v3:
> * Added documentation to vmcoreinfo.rst
> * Use the short form of the commit reference
>
> v1 -> v2:
> * Improved commit message
> * Added link to the discussion of the uts namespace changes
>
> Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 ++++++
> kernel/crash_core.c | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> index e44a6c01f336..3861a25faae1 100644
> --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst
> +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> @@ -39,6 +39,12 @@ call.
> User-space tools can get the kernel name, host name, kernel release
> number, kernel version, architecture name and OS type from it.
>
> +(uts_namespace, name)
> +---------------------
> +
> +Offset of the name's member. Crash Utility and Makedumpfile get
> +the start address of the init_uts_ns.name from this.
> +
> node_online_map
> ---------------
>
> diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> index 106e4500fd53..173fdc261882 100644
> --- a/kernel/crash_core.c
> +++ b/kernel/crash_core.c
> @@ -447,6 +447,7 @@ static int __init crash_save_vmcoreinfo_init(void)
> VMCOREINFO_PAGESIZE(PAGE_SIZE);
>
> VMCOREINFO_SYMBOL(init_uts_ns);
> + VMCOREINFO_OFFSET(uts_namespace, name);
> VMCOREINFO_SYMBOL(node_online_map);
> #ifdef CONFIG_MMU
> VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
> --
> 2.26.2
>

2021-01-08 08:15:13

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On Fri, Jan 08, 2021 at 11:32:48AM +0800, Baoquan He wrote:
> On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > The offset of the field 'init_uts_ns.name' has changed
> > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
>
> This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> commit 9a56493f6942 is merged into 5.9-rc2.
>
> Below tag and CC should have been added into patch when posted.
>
> Fixes: commit 9a56493f6942 ("uts: Use generic ns_common::count")
> Cc: <[email protected]>
>
> Hi Greg,
>
> Do we still have chance to make it added into stable?

Sure, what is the git commit id of this patch in Linus's tree?

In the future, please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

thanks,

greg k-h

2021-01-08 08:51:46

by Baoquan He

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On 01/08/21 at 09:12am, Greg KH wrote:
> On Fri, Jan 08, 2021 at 11:32:48AM +0800, Baoquan He wrote:
> > On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > > The offset of the field 'init_uts_ns.name' has changed
> > > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
> >
> > This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> > of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> > commit 9a56493f6942 is merged into 5.9-rc2.
> >
> > Below tag and CC should have been added into patch when posted.
> >
> > Fixes: commit 9a56493f6942 ("uts: Use generic ns_common::count")
> > Cc: <[email protected]>
> >
> > Hi Greg,
> >
> > Do we still have chance to make it added into stable?
>
> Sure, what is the git commit id of this patch in Linus's tree?

This commit:

ca4a9241cc5e kdump: append uts_namespace.name offset to VMCOREINFO

>
> In the future, please read:
> https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> for how to do this properly.

Sure, will do as the doc said in the future, thanks a lot for the
pointer.

Thanks
Baoquan

Subject: RE: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

Hi Baoquan,

-----Original Message-----
> On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > The offset of the field 'init_uts_ns.name' has changed
> > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
>
> This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> commit 9a56493f6942 is merged into 5.9-rc2.

Hmm, commit 9a56493f6942 should have been merged into 5.11-rc1
together with commit ca4a9241cc5e.

Does your makedumpfile have the following patch?
https://github.com/makedumpfile/makedumpfile/commit/54aec3878b3f91341e6bc735eda158cca5c54ec9

or am I missing something?

Thanks,
Kazu

>
> Below tag and CC should have been added into patch when posted.
>
> Fixes: commit 9a56493f6942 ("uts: Use generic ns_common::count")
> Cc: <[email protected]>
>
> Hi Greg,
>
> Do we still have chance to make it added into stable?
>
> Thanks
> Baoquan
>
> >
> > Link: https://lore.kernel.org/r/159644978167.604812.1773586504374412107.stgit@localhost.localdomain
> >
> > Make the offset of the field 'uts_namespace.name' available
> > in VMCOREINFO because tools like 'crash-utility' and
> > 'makedumpfile' must be able to read it from crash dumps.
> >
> > Signed-off-by: Alexander Egorenkov <[email protected]>
> > ---
> >
> > v2 -> v3:
> > * Added documentation to vmcoreinfo.rst
> > * Use the short form of the commit reference
> >
> > v1 -> v2:
> > * Improved commit message
> > * Added link to the discussion of the uts namespace changes
> >
> > Documentation/admin-guide/kdump/vmcoreinfo.rst | 6 ++++++
> > kernel/crash_core.c | 1 +
> > 2 files changed, 7 insertions(+)
> >
> > diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst
> b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> > index e44a6c01f336..3861a25faae1 100644
> > --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst
> > +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst
> > @@ -39,6 +39,12 @@ call.
> > User-space tools can get the kernel name, host name, kernel release
> > number, kernel version, architecture name and OS type from it.
> >
> > +(uts_namespace, name)
> > +---------------------
> > +
> > +Offset of the name's member. Crash Utility and Makedumpfile get
> > +the start address of the init_uts_ns.name from this.
> > +
> > node_online_map
> > ---------------
> >
> > diff --git a/kernel/crash_core.c b/kernel/crash_core.c
> > index 106e4500fd53..173fdc261882 100644
> > --- a/kernel/crash_core.c
> > +++ b/kernel/crash_core.c
> > @@ -447,6 +447,7 @@ static int __init crash_save_vmcoreinfo_init(void)
> > VMCOREINFO_PAGESIZE(PAGE_SIZE);
> >
> > VMCOREINFO_SYMBOL(init_uts_ns);
> > + VMCOREINFO_OFFSET(uts_namespace, name);
> > VMCOREINFO_SYMBOL(node_online_map);
> > #ifdef CONFIG_MMU
> > VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir);
> > --
> > 2.26.2
> >
>
>
> _______________________________________________
> kexec mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/kexec

2021-01-08 10:25:23

by Baoquan He

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On 01/08/21 at 10:07am, HAGIO KAZUHITO(萩尾 一仁) wrote:
> Hi Baoquan,
>
> -----Original Message-----
> > On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > > The offset of the field 'init_uts_ns.name' has changed
> > > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
> >
> > This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> > of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> > commit 9a56493f6942 is merged into 5.9-rc2.
>
> Hmm, commit 9a56493f6942 should have been merged into 5.11-rc1
> together with commit ca4a9241cc5e.

Checked on master branch of mainline kernel, commit 9a56493f6942 is in
5.9-rc1. commit ca4a9241cc5e is merged into 5.11-rc1.

commit 9a56493f6942c0e2df1579986128721da96e00d8
Author: Kirill Tkhai <[email protected]>
Date: Mon Aug 3 13:16:21 2020 +0300

uts: Use generic ns_common::count


commit ca4a9241cc5e718de86a34afd41972869546a5e3
Author: Alexander Egorenkov <[email protected]>
Date: Tue Dec 15 20:45:31 2020 -0800

kdump: append uts_namespace.name offset to VMCOREINFO


>
> Does your makedumpfile have the following patch?
> https://github.com/makedumpfile/makedumpfile/commit/54aec3878b3f91341e6bc735eda158cca5c54ec9

We met this issue on 5.10 kernel, the latest makedumpfile 1.6.8+ fixs
it. Makedumpfile 1.6.8+ includes the commit 54aec3878b3f. Not sure if I
got the kernel commit right in their corresponding release.

Thanks
Baoquan

2021-01-11 09:16:37

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On Fri, Jan 08, 2021 at 11:32:48AM +0800, Baoquan He wrote:
> On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > The offset of the field 'init_uts_ns.name' has changed
> > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
>
> This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> commit 9a56493f6942 is merged into 5.9-rc2.
>
> Below tag and CC should have been added into patch when posted.
>
> Fixes: commit 9a56493f6942 ("uts: Use generic ns_common::count")
> Cc: <[email protected]>
>
> Hi Greg,
>
> Do we still have chance to make it added into stable?

Wait, 9a56493f6942 ("uts: Use generic ns_common::count") is in 5.11-rc1,
and this commit fixes that one, so why does anything need to be
backported?

Are you _SURE_ that this commit is needed in 5.10.y?

thanks,

greg k-h

2021-01-11 09:18:23

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On Fri, Jan 08, 2021 at 06:22:24PM +0800, Baoquan He wrote:
> On 01/08/21 at 10:07am, HAGIO KAZUHITO(萩尾 一仁) wrote:
> > Hi Baoquan,
> >
> > -----Original Message-----
> > > On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > > > The offset of the field 'init_uts_ns.name' has changed
> > > > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
> > >
> > > This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> > > of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> > > commit 9a56493f6942 is merged into 5.9-rc2.
> >
> > Hmm, commit 9a56493f6942 should have been merged into 5.11-rc1
> > together with commit ca4a9241cc5e.
>
> Checked on master branch of mainline kernel, commit 9a56493f6942 is in
> 5.9-rc1.


No, that commit is in 5.11-rc1, not 5.9-rc1:
$ git describe --contains 9a56493f6942
v5.11-rc1~182^2~9

> commit ca4a9241cc5e is merged into 5.11-rc1.
>
> commit 9a56493f6942c0e2df1579986128721da96e00d8
> Author: Kirill Tkhai <[email protected]>
> Date: Mon Aug 3 13:16:21 2020 +0300
>
> uts: Use generic ns_common::count
>
>
> commit ca4a9241cc5e718de86a34afd41972869546a5e3
> Author: Alexander Egorenkov <[email protected]>
> Date: Tue Dec 15 20:45:31 2020 -0800
>
> kdump: append uts_namespace.name offset to VMCOREINFO


Are you all sure this is needed in 5.10.y?

thanks,

greg k-h

2021-01-11 10:09:57

by Baoquan He

[permalink] [raw]
Subject: Re: [PATCH v3 1/1] kdump: append uts_namespace.name offset to VMCOREINFO

On 01/11/21 at 10:16am, [email protected] wrote:
> On Fri, Jan 08, 2021 at 06:22:24PM +0800, Baoquan He wrote:
> > On 01/08/21 at 10:07am, HAGIO KAZUHITO(萩尾 一仁) wrote:
> > > Hi Baoquan,
> > >
> > > -----Original Message-----
> > > > On 09/30/20 at 12:23pm, Alexander Egorenkov wrote:
> > > > > The offset of the field 'init_uts_ns.name' has changed
> > > > > since commit 9a56493f6942 ("uts: Use generic ns_common::count").
> > > >
> > > > This patch is merged into 5.11-rc1, but we met the makedumpfile failure
> > > > of kdump test case in 5.10.0 kernel. Should affect 5.9 too since
> > > > commit 9a56493f6942 is merged into 5.9-rc2.
> > >
> > > Hmm, commit 9a56493f6942 should have been merged into 5.11-rc1
> > > together with commit ca4a9241cc5e.
> >
> > Checked on master branch of mainline kernel, commit 9a56493f6942 is in
> > 5.9-rc1.
>
>
> No, that commit is in 5.11-rc1, not 5.9-rc1:
> $ git describe --contains 9a56493f6942
> v5.11-rc1~182^2~9

Oh, then I was wrong about it. I add linux-next repo in my linux kernel
folder, so I can't get it with the above command on master branch of
mainline kernel:

[bhe@~ linux]$ git describe --contains 9a56493f6942
next-20200820~107^2~8

I just use 'git log --oneline' and found out commit 9a56493f6942 is
added before 5.9-rc1. Seems this is not right way to get the kernel
release. So please ignore the back porting request of stable tree.
Sorry about the confusion.

Thanks
Baoquan

>
> > commit ca4a9241cc5e is merged into 5.11-rc1.
> >
> > commit 9a56493f6942c0e2df1579986128721da96e00d8
> > Author: Kirill Tkhai <[email protected]>
> > Date: Mon Aug 3 13:16:21 2020 +0300
> >
> > uts: Use generic ns_common::count
> >
> >
> > commit ca4a9241cc5e718de86a34afd41972869546a5e3
> > Author: Alexander Egorenkov <[email protected]>
> > Date: Tue Dec 15 20:45:31 2020 -0800
> >
> > kdump: append uts_namespace.name offset to VMCOREINFO
>
>
> Are you all sure this is needed in 5.10.y?
>
> thanks,
>
> greg k-h
>
> _______________________________________________
> kexec mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/kexec