MAGIC_START("IKCFG_ST") and MAGIC_END("IKCFG_ED") are moved out
from the kernel_config_data variable [1].

Thus, we parse kernel_config_data directly instead of considering
offset of MAGIC_START and MAGIC_END.

[1] https://lore.kernel.org/lkml/1550108893-21226-1-git-send-email-yamada.masahiro@socionext.com/

Fixes: 13610aa908dc ("kernel/configs: use .incbin directive to embed config_data.gz")
Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
---
 scripts/gdb/linux/config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/gdb/linux/config.py b/scripts/gdb/linux/config.py
index 90e1565b1967..8843ab3cbadd 100644
--- a/scripts/gdb/linux/config.py
+++ b/scripts/gdb/linux/config.py
@@ -24,9 +24,9 @@ class LxConfigDump(gdb.Command):
             filename = arg
 
         try:
-            py_config_ptr = gdb.parse_and_eval("kernel_config_data + 8")
-            py_config_size = gdb.parse_and_eval(
-                    "sizeof(kernel_config_data) - 1 - 8 * 2")
+            py_config_ptr = gdb.parse_and_eval("&kernel_config_data")
+            py_config_ptr_end = gdb.parse_and_eval("&kernel_config_data_end")
+            py_config_size = py_config_ptr_end - py_config_ptr
         except gdb.error as e:
             raise gdb.GdbError("Can't find config, enable CONFIG_IKCONFIG?")
 
-- 
2.18.0

On Fri, Jun 10, 2022 at 4:15 PM Kuan-Ying Lee
<Kuan-Ying.Lee@mediatek.com> wrote:
>
> MAGIC_START("IKCFG_ST") and MAGIC_END("IKCFG_ED") are moved out
> from the kernel_config_data variable [1].
>
> Thus, we parse kernel_config_data directly instead of considering
> offset of MAGIC_START and MAGIC_END.
>
> [1] https://lore.kernel.org/lkml/1550108893-21226-1-git-send-email-yamada.masahiro@socionext.com/
>
> Fixes: 13610aa908dc ("kernel/configs: use .incbin directive to embed config_data.gz")
> Signed-off-by: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>


Thanks for the fix.

Applied to linux-kbuild/fixes.




> ---
>  scripts/gdb/linux/config.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/gdb/linux/config.py b/scripts/gdb/linux/config.py
> index 90e1565b1967..8843ab3cbadd 100644
> --- a/scripts/gdb/linux/config.py
> +++ b/scripts/gdb/linux/config.py
> @@ -24,9 +24,9 @@ class LxConfigDump(gdb.Command):
>              filename = arg
>
>          try:
> -            py_config_ptr = gdb.parse_and_eval("kernel_config_data + 8")
> -            py_config_size = gdb.parse_and_eval(
> -                    "sizeof(kernel_config_data) - 1 - 8 * 2")
> +            py_config_ptr = gdb.parse_and_eval("&kernel_config_data")
> +            py_config_ptr_end = gdb.parse_and_eval("&kernel_config_data_end")
> +            py_config_size = py_config_ptr_end - py_config_ptr
>          except gdb.error as e:
>              raise gdb.GdbError("Can't find config, enable CONFIG_IKCONFIG?")
>
> --
> 2.18.0
>


-- 
Best Regards
Masahiro Yamada