kbuild: add dependency from vmlinux to sorttable

[PATCH] kbuild: add dependency from vmlinux to sorttable

Posted by Xi Ruoyao 9 months, 3 weeks ago

Without this dependency it's really puzzling when we bisect for a "bad"
commit in a series of sorttable change: when "git bisect" switches to
another commit, "make" just does nothing to vmlinux.

Signed-off-by: Xi Ruoyao <xry111@xry111.site>
---
 scripts/Makefile.vmlinux | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
index 873caaa55313..fb79fd6b2465 100644
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF
 vmlinux: $(RESOLVE_BTFIDS)
 endif
 
+ifdef CONFIG_BUILDTIME_TABLE_SORT
+vmlinux: scripts/sorttable
+endif
+
 # module.builtin.ranges
 # ---------------------------------------------------------------------------
 ifdef CONFIG_BUILTIN_MODULE_RANGES
-- 
2.48.1

Re: [PATCH] kbuild: add dependency from vmlinux to sorttable

Posted by Masahiro Yamada 9 months, 2 weeks ago

On Wed, Feb 26, 2025 at 10:30 PM Xi Ruoyao <xry111@xry111.site> wrote:
>
> Without this dependency it's really puzzling when we bisect for a "bad"
> commit in a series of sorttable change: when "git bisect" switches to
> another commit, "make" just does nothing to vmlinux.
>
> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
> ---
>  scripts/Makefile.vmlinux | 4 ++++
>  1 file changed, 4 insertions(+)


Applied to linux-kbuild. Thanks.


> diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
> index 873caaa55313..fb79fd6b2465 100644
> --- a/scripts/Makefile.vmlinux
> +++ b/scripts/Makefile.vmlinux
> @@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF
>  vmlinux: $(RESOLVE_BTFIDS)
>  endif
>
> +ifdef CONFIG_BUILDTIME_TABLE_SORT
> +vmlinux: scripts/sorttable
> +endif
> +
>  # module.builtin.ranges
>  # ---------------------------------------------------------------------------
>  ifdef CONFIG_BUILTIN_MODULE_RANGES
> --
> 2.48.1
>
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH] kbuild: add dependency from vmlinux to sorttable

Posted by Steven Rostedt 9 months, 3 weeks ago

On Wed, 26 Feb 2025 21:30:14 +0800
Xi Ruoyao <xry111@xry111.site> wrote:

> Without this dependency it's really puzzling when we bisect for a "bad"
> commit in a series of sorttable change: when "git bisect" switches to
> another commit, "make" just does nothing to vmlinux.
> 
> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
> ---
>  scripts/Makefile.vmlinux | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux
> index 873caaa55313..fb79fd6b2465 100644
> --- a/scripts/Makefile.vmlinux
> +++ b/scripts/Makefile.vmlinux
> @@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF
>  vmlinux: $(RESOLVE_BTFIDS)
>  endif
>  
> +ifdef CONFIG_BUILDTIME_TABLE_SORT
> +vmlinux: scripts/sorttable
> +endif

Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>

I haven't tested this yet, but when working on the sorttable.c changes, it
definitely was an annoyance that the updates to sorttable.c didn't make any
changes without first modifying something in the kernel.

-- Steve


> +
>  # module.builtin.ranges
>  #
> ---------------------------------------------------------------------------
> ifdef CONFIG_BUILTIN_MODULE_RANGES