2023-10-31 13:49:17

by Daniel Gomez

[permalink] [raw]
Subject: [PATCH] scripts/gdb: fix usage of MOD_TEXT not defined when CONFIG_MODULES=n

From: Clément Léger <[email protected]>

MOD_TEXT is only defined if CONFIG_MODULES=y which lead to loading failure
of the gdb scripts when kernel is built without CONFIG_MODULES=y:

Reading symbols from vmlinux...
Traceback (most recent call last):
File "/foo/vmlinux-gdb.py", line 25, in <module>
import linux.constants
File "/foo/scripts/gdb/linux/constants.py", line 14, in <module>
LX_MOD_TEXT = gdb.parse_and_eval("MOD_TEXT")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
gdb.error: No symbol "MOD_TEXT" in current context.

Add a conditional check on CONFIG_MODULES to fix this error.

Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout to get the module address")
Signed-off-by: Clément Léger <[email protected]>
Tested-by: Daniel Gomez <[email protected]>
Signed-off-by: Daniel Gomez <[email protected]>
---
Hi,

I'm resending the patch [1] from Clement Leger with required changes to
make it work with latest linux-next.

[1] https://lore.kernel.org/all/[email protected]/

I hope it's acceptable that I've included my own Signed-of-by in
addition to the Tested-by due to the (minor) changes.

Daniel

scripts/gdb/linux/constants.py.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index e3517d4ab8ec..04c87b570aab 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -66,10 +66,11 @@ LX_GDBPARSED(IRQD_LEVEL)
LX_GDBPARSED(IRQ_HIDDEN)

/* linux/module.h */
-LX_GDBPARSED(MOD_TEXT)
-LX_GDBPARSED(MOD_DATA)
-LX_GDBPARSED(MOD_RODATA)
-LX_GDBPARSED(MOD_RO_AFTER_INIT)
+if IS_BUILTIN(CONFIG_MODULES):
+ LX_GDBPARSED(MOD_TEXT)
+ LX_GDBPARSED(MOD_DATA)
+ LX_GDBPARSED(MOD_RODATA)
+ LX_GDBPARSED(MOD_RO_AFTER_INIT)

/* linux/mount.h */
LX_VALUE(MNT_NOSUID)
--
2.39.2


2023-11-02 08:06:47

by Clément Léger

[permalink] [raw]
Subject: Re: [PATCH] scripts/gdb: fix usage of MOD_TEXT not defined when CONFIG_MODULES=n



On 31/10/2023 14:49, Daniel Gomez wrote:
> From: Clément Léger <[email protected]>
>
> MOD_TEXT is only defined if CONFIG_MODULES=y which lead to loading failure
> of the gdb scripts when kernel is built without CONFIG_MODULES=y:
>
> Reading symbols from vmlinux...
> Traceback (most recent call last):
> File "/foo/vmlinux-gdb.py", line 25, in <module>
> import linux.constants
> File "/foo/scripts/gdb/linux/constants.py", line 14, in <module>
> LX_MOD_TEXT = gdb.parse_and_eval("MOD_TEXT")
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> gdb.error: No symbol "MOD_TEXT" in current context.
>
> Add a conditional check on CONFIG_MODULES to fix this error.
>
> Fixes: b4aff7513df3 ("scripts/gdb: use mem instead of core_layout to get the module address")
> Signed-off-by: Clément Léger <[email protected]>
> Tested-by: Daniel Gomez <[email protected]>
> Signed-off-by: Daniel Gomez <[email protected]>
> ---
> Hi,
>
> I'm resending the patch [1] from Clement Leger with required changes to
> make it work with latest linux-next.
>
> [1] https://lore.kernel.org/all/[email protected]/
>
> I hope it's acceptable that I've included my own Signed-of-by in
> addition to the Tested-by due to the (minor) changes.

Hi Daniel,

And thanks for re-submitting it ! Totally ok for me that you added your SoB.

Clément

>
> Daniel
>
> scripts/gdb/linux/constants.py.in | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
> index e3517d4ab8ec..04c87b570aab 100644
> --- a/scripts/gdb/linux/constants.py.in
> +++ b/scripts/gdb/linux/constants.py.in
> @@ -66,10 +66,11 @@ LX_GDBPARSED(IRQD_LEVEL)
> LX_GDBPARSED(IRQ_HIDDEN)
>
> /* linux/module.h */
> -LX_GDBPARSED(MOD_TEXT)
> -LX_GDBPARSED(MOD_DATA)
> -LX_GDBPARSED(MOD_RODATA)
> -LX_GDBPARSED(MOD_RO_AFTER_INIT)
> +if IS_BUILTIN(CONFIG_MODULES):
> + LX_GDBPARSED(MOD_TEXT)
> + LX_GDBPARSED(MOD_DATA)
> + LX_GDBPARSED(MOD_RODATA)
> + LX_GDBPARSED(MOD_RO_AFTER_INIT)
>
> /* linux/mount.h */
> LX_VALUE(MNT_NOSUID)
> --
> 2.39.2