[Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

support/scripts/check-bin-arch has an option -i to exclude a path
(or many paths by using -i multiple times).

This was implemented in commit 01d90f0d093f ("spport/check-bin-arch:
accept arbitrary per-package ignore paths").

Looking at this feature (which hasn't changed since being added),
we can see that check-bin-arch automatically adds a trailing slash
to all entries specified using -i.

Thus, specifying a path to a file, e.g.
"/usr/libexec/perf-core/tests/pe-file.exe" will cause check-bin-arch
to add "/usr/libexec/perf-core/tests/pe-file.exe/" to the IGNORES array.

When running the main loop, the file
"/usr/libexec/perf-core/tests/pe-file.exe" will thus not be ignored,
since it will not trigger a match the pattern that was added to the
IGNORES array ("/usr/libexec/perf-core/tests/pe-file.exe/").

This means that the -i option in check-bin-arch only supports directories
and not files.

Fix the LINUX_TOOLS_BIN_ARCH_EXCLUDE in
package/linux-tools/linux-tool-perf.mk.in to specify a directory, as the
existing LINUX_TOOLS_BIN_ARCH_EXCLUDE can never have actually worked.

Fixes: a7ad7816262d ("package/linux-tools: Exclude checking PE binaries from perf test")
Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 package/linux-tools/linux-tool-perf.mk.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in
index df3030439e..d67318571a 100644
--- a/package/linux-tools/linux-tool-perf.mk.in
+++ b/package/linux-tools/linux-tool-perf.mk.in
@@ -180,8 +180,7 @@ define PERF_INSTALL_REMOVE_SCRIPTS
 endef
 
 LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
-	/usr/libexec/perf-core/tests/pe-file.exe \
-	/usr/libexec/perf-core/tests/pe-file.exe.debug
+	/usr/libexec/perf-core/tests/
 endif
 
 define PERF_INSTALL_TARGET_CMDS
-- 
2.48.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/linux-tools: selftests: Add path containing BPF binary to _BIN_ARCH_EXCLUDE

[Niklas Cassel via buildroot]

From: Niklas Cassel <cassel@kernel.org>

Enabling BR2_PACKAGE_LINUX_TOOLS_SELFTESTS (on rock5b_defconfig,
which uses kernel 6.12 at the time of writing), results in:

make[1]: Leaving directory '/br/output/build/linux-endpoint-test/tools/testing/selftests'
ERROR: architecture for "/usr/lib/kselftests/tc-testing/action-ebpf" is "Linux BPF", should be "AArch64"
make: *** [package/pkg-generic.mk:402: /br/output/build/linux-tools/.stamp_installed] Error 1

To solve this, add /usr/lib/kselftests/tc-testing/ to
LINUX_TOOLS_BIN_ARCH_EXCLUDE.

Signed-off-by: Niklas Cassel <cassel@kernel.org>
---
 package/linux-tools/linux-tool-selftests.mk.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in
index 0bcc47af0a..db7e4fa1a3 100644
--- a/package/linux-tools/linux-tool-selftests.mk.in
+++ b/package/linux-tools/linux-tool-selftests.mk.in
@@ -26,6 +26,9 @@ SELFTESTS_MAKE_FLAGS = \
 	ARCH=$(SELFTESTS_ARCH) \
 	KHDR_DIR=$(LINUX_DIR)/usr/include
 
+LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
+	/usr/lib/kselftests/tc-testing/
+
 # O must be redefined here to overwrite the one used by Buildroot for
 # out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and
 # not just $(LINUX_DIR) so that it isn't built in the root directory of the kernel
-- 
2.48.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/linux-tools: selftests: Add path containing BPF binary to _BIN_ARCH_EXCLUDE

[Florian Fainelli]

On 2/18/25 02:48, Niklas Cassel wrote:
> From: Niklas Cassel <cassel@kernel.org>
> 
> Enabling BR2_PACKAGE_LINUX_TOOLS_SELFTESTS (on rock5b_defconfig,
> which uses kernel 6.12 at the time of writing), results in:
> 
> make[1]: Leaving directory '/br/output/build/linux-endpoint-test/tools/testing/selftests'
> ERROR: architecture for "/usr/lib/kselftests/tc-testing/action-ebpf" is "Linux BPF", should be "AArch64"
> make: *** [package/pkg-generic.mk:402: /br/output/build/linux-tools/.stamp_installed] Error 1
> 
> To solve this, add /usr/lib/kselftests/tc-testing/ to
> LINUX_TOOLS_BIN_ARCH_EXCLUDE.
> 
> Signed-off-by: Niklas Cassel <cassel@kernel.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/linux-tools: selftests: Add path containing BPF binary to _BIN_ARCH_EXCLUDE

[Niklas Cassel via buildroot]

On Tue, Feb 18, 2025 at 11:48:07AM +0100, Niklas Cassel wrote:
> From: Niklas Cassel <cassel@kernel.org>
> 
> Enabling BR2_PACKAGE_LINUX_TOOLS_SELFTESTS (on rock5b_defconfig,
> which uses kernel 6.12 at the time of writing), results in:
> 
> make[1]: Leaving directory '/br/output/build/linux-endpoint-test/tools/testing/selftests'
> ERROR: architecture for "/usr/lib/kselftests/tc-testing/action-ebpf" is "Linux BPF", should be "AArch64"
> make: *** [package/pkg-generic.mk:402: /br/output/build/linux-tools/.stamp_installed] Error 1
> 
> To solve this, add /usr/lib/kselftests/tc-testing/ to
> LINUX_TOOLS_BIN_ARCH_EXCLUDE.
> 
> Signed-off-by: Niklas Cassel <cassel@kernel.org>
> ---
>  package/linux-tools/linux-tool-selftests.mk.in | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in
> index 0bcc47af0a..db7e4fa1a3 100644
> --- a/package/linux-tools/linux-tool-selftests.mk.in
> +++ b/package/linux-tools/linux-tool-selftests.mk.in
> @@ -26,6 +26,9 @@ SELFTESTS_MAKE_FLAGS = \
>  	ARCH=$(SELFTESTS_ARCH) \
>  	KHDR_DIR=$(LINUX_DIR)/usr/include
>  
> +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
> +	/usr/lib/kselftests/tc-testing/
> +
>  # O must be redefined here to overwrite the one used by Buildroot for
>  # out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and
>  # not just $(LINUX_DIR) so that it isn't built in the root directory of the kernel
> -- 
> 2.48.1

Hello Thomas, Romain, Julien,


Any chance to get this picked up?


Kind regards,
Niklas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/linux-tools: selftests: Add path containing BPF binary to _BIN_ARCH_EXCLUDE

[Arnout Vandecappelle via buildroot]

On 18/02/2025 11:48, Niklas Cassel via buildroot wrote:
> From: Niklas Cassel <cassel@kernel.org>
>
> Enabling BR2_PACKAGE_LINUX_TOOLS_SELFTESTS (on rock5b_defconfig,
> which uses kernel 6.12 at the time of writing), results in:
>
> make[1]: Leaving directory '/br/output/build/linux-endpoint-test/tools/testing/selftests'
> ERROR: architecture for "/usr/lib/kselftests/tc-testing/action-ebpf" is "Linux BPF", should be "AArch64"
> make: *** [package/pkg-generic.mk:402: /br/output/build/linux-tools/.stamp_installed] Error 1
>
> To solve this, add /usr/lib/kselftests/tc-testing/ to
> LINUX_TOOLS_BIN_ARCH_EXCLUDE.
>
> Signed-off-by: Niklas Cassel <cassel@kernel.org>

  Applied to 2025.02.x, 2024.11.x and 2024.02.x, thanks.

  Regards,
  Arnout

> ---
>   package/linux-tools/linux-tool-selftests.mk.in | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in
> index 0bcc47af0a..db7e4fa1a3 100644
> --- a/package/linux-tools/linux-tool-selftests.mk.in
> +++ b/package/linux-tools/linux-tool-selftests.mk.in
> @@ -26,6 +26,9 @@ SELFTESTS_MAKE_FLAGS = \
>   	ARCH=$(SELFTESTS_ARCH) \
>   	KHDR_DIR=$(LINUX_DIR)/usr/include
>   
> +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
> +	/usr/lib/kselftests/tc-testing/
> +
>   # O must be redefined here to overwrite the one used by Buildroot for
>   # out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and
>   # not just $(LINUX_DIR) so that it isn't built in the root directory of the kernel
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Niklas Cassel via buildroot]

Hello Yann,

Any chance to get a review from you on this series?

Kind regards,
Niklas


On Tue, Feb 18, 2025 at 11:48:06AM +0100, Niklas Cassel wrote:
> From: Niklas Cassel <cassel@kernel.org>
> 
> support/scripts/check-bin-arch has an option -i to exclude a path
> (or many paths by using -i multiple times).
> 
> This was implemented in commit 01d90f0d093f ("spport/check-bin-arch:
> accept arbitrary per-package ignore paths").
> 
> Looking at this feature (which hasn't changed since being added),
> we can see that check-bin-arch automatically adds a trailing slash
> to all entries specified using -i.
> 
> Thus, specifying a path to a file, e.g.
> "/usr/libexec/perf-core/tests/pe-file.exe" will cause check-bin-arch
> to add "/usr/libexec/perf-core/tests/pe-file.exe/" to the IGNORES array.
> 
> When running the main loop, the file
> "/usr/libexec/perf-core/tests/pe-file.exe" will thus not be ignored,
> since it will not trigger a match the pattern that was added to the
> IGNORES array ("/usr/libexec/perf-core/tests/pe-file.exe/").
> 
> This means that the -i option in check-bin-arch only supports directories
> and not files.
> 
> Fix the LINUX_TOOLS_BIN_ARCH_EXCLUDE in
> package/linux-tools/linux-tool-perf.mk.in to specify a directory, as the
> existing LINUX_TOOLS_BIN_ARCH_EXCLUDE can never have actually worked.
> 
> Fixes: a7ad7816262d ("package/linux-tools: Exclude checking PE binaries from perf test")
> Signed-off-by: Niklas Cassel <cassel@kernel.org>
> ---
>  package/linux-tools/linux-tool-perf.mk.in | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in
> index df3030439e..d67318571a 100644
> --- a/package/linux-tools/linux-tool-perf.mk.in
> +++ b/package/linux-tools/linux-tool-perf.mk.in
> @@ -180,8 +180,7 @@ define PERF_INSTALL_REMOVE_SCRIPTS
>  endef
>  
>  LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
> -	/usr/libexec/perf-core/tests/pe-file.exe \
> -	/usr/libexec/perf-core/tests/pe-file.exe.debug
> +	/usr/libexec/perf-core/tests/
>  endif
>  
>  define PERF_INSTALL_TARGET_CMDS
> -- 
> 2.48.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Florian Fainelli]

On 2/18/25 02:48, Niklas Cassel wrote:
> From: Niklas Cassel <cassel@kernel.org>
> 
> support/scripts/check-bin-arch has an option -i to exclude a path
> (or many paths by using -i multiple times).
> 
> This was implemented in commit 01d90f0d093f ("spport/check-bin-arch:
> accept arbitrary per-package ignore paths").
> 
> Looking at this feature (which hasn't changed since being added),
> we can see that check-bin-arch automatically adds a trailing slash
> to all entries specified using -i.
> 
> Thus, specifying a path to a file, e.g.
> "/usr/libexec/perf-core/tests/pe-file.exe" will cause check-bin-arch
> to add "/usr/libexec/perf-core/tests/pe-file.exe/" to the IGNORES array.
> 
> When running the main loop, the file
> "/usr/libexec/perf-core/tests/pe-file.exe" will thus not be ignored,
> since it will not trigger a match the pattern that was added to the
> IGNORES array ("/usr/libexec/perf-core/tests/pe-file.exe/").
> 
> This means that the -i option in check-bin-arch only supports directories
> and not files.
> 
> Fix the LINUX_TOOLS_BIN_ARCH_EXCLUDE in
> package/linux-tools/linux-tool-perf.mk.in to specify a directory, as the
> existing LINUX_TOOLS_BIN_ARCH_EXCLUDE can never have actually worked.
> 
> Fixes: a7ad7816262d ("package/linux-tools: Exclude checking PE binaries from perf test")
> Signed-off-by: Niklas Cassel <cassel@kernel.org>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Niklas Cassel via buildroot]

Hello all,


Considering that this series is Acked-by Florian,
any chance to get it picked up (on next branch)?


Kind regards,
Niklas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Julien Olivain]

On 18/02/2025 11:48, Niklas Cassel via buildroot wrote:
> From: Niklas Cassel <cassel@kernel.org>
[...]
> Signed-off-by: Niklas Cassel <cassel@kernel.org>

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/linux-tools: perf: Fix _BIN_ARCH_EXCLUDE

[Arnout Vandecappelle via buildroot]

On 18/02/2025 11:48, Niklas Cassel via buildroot wrote:
> From: Niklas Cassel <cassel@kernel.org>
>
> support/scripts/check-bin-arch has an option -i to exclude a path
> (or many paths by using -i multiple times).
>
> This was implemented in commit 01d90f0d093f ("spport/check-bin-arch:
> accept arbitrary per-package ignore paths").
>
> Looking at this feature (which hasn't changed since being added),
> we can see that check-bin-arch automatically adds a trailing slash
> to all entries specified using -i.
>
> Thus, specifying a path to a file, e.g.
> "/usr/libexec/perf-core/tests/pe-file.exe" will cause check-bin-arch
> to add "/usr/libexec/perf-core/tests/pe-file.exe/" to the IGNORES array.
>
> When running the main loop, the file
> "/usr/libexec/perf-core/tests/pe-file.exe" will thus not be ignored,
> since it will not trigger a match the pattern that was added to the
> IGNORES array ("/usr/libexec/perf-core/tests/pe-file.exe/").
>
> This means that the -i option in check-bin-arch only supports directories
> and not files.
>
> Fix the LINUX_TOOLS_BIN_ARCH_EXCLUDE in
> package/linux-tools/linux-tool-perf.mk.in to specify a directory, as the
> existing LINUX_TOOLS_BIN_ARCH_EXCLUDE can never have actually worked.
>
> Fixes: a7ad7816262d ("package/linux-tools: Exclude checking PE binaries from perf test")
> Signed-off-by: Niklas Cassel <cassel@kernel.org>

  Applied to 2025.02.x, 2024.11.x and 2024.02.x, thanks.

  Regards,
  Arnout

> ---
>   package/linux-tools/linux-tool-perf.mk.in | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in
> index df3030439e..d67318571a 100644
> --- a/package/linux-tools/linux-tool-perf.mk.in
> +++ b/package/linux-tools/linux-tool-perf.mk.in
> @@ -180,8 +180,7 @@ define PERF_INSTALL_REMOVE_SCRIPTS
>   endef
>   
>   LINUX_TOOLS_BIN_ARCH_EXCLUDE += \
> -	/usr/libexec/perf-core/tests/pe-file.exe \
> -	/usr/libexec/perf-core/tests/pe-file.exe.debug
> +	/usr/libexec/perf-core/tests/
>   endif
>   
>   define PERF_INSTALL_TARGET_CMDS
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot