[Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Florian Fainelli via buildroot]

Since Linux 6.14, the PCI endpoint tests have moved from tools/pci to
tools/testing/selftests/pci_endpoint. The existing build commands still
use the old location, causing the build to fail with newer kernels.

Detect the selftests directory and fall back to tools/pci for older
kernels. Set OUTPUT and INSTALL_PATH to build and install the selftests
under /usr/lib/kselftests/pci_endpoint, and pass the required libraries
explicitly.

Add a threads dependency and update the help text to document the
binary names and installation paths. Keep the minimum kernel version
check for the legacy tools and report missing sources explicitly.

Fixes: 63e457639abb ("package/linux-tools: add support for pcitest tool")
---
 package/linux-tools/Config.in            |  9 +++++++--
 package/linux-tools/linux-tool-pci.mk.in | 22 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in
index b9adc25ad51d..19d54cbbe707 100644
--- a/package/linux-tools/Config.in
+++ b/package/linux-tools/Config.in
@@ -59,13 +59,18 @@ config BR2_PACKAGE_LINUX_TOOLS_MM
 
 config BR2_PACKAGE_LINUX_TOOLS_PCI
 	bool "pci"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LINUX_TOOLS
 	help
-	  pcitest is a tool for testing capabilities related to a
-	  PCI Endpoint (only works with specific Endpoints).
+	  Build the PCI endpoint tests (only work with specific Endpoints).
+	  Kernels before 6.14 provide pcitest in /usr/bin. Newer kernels
+	  provide pci_endpoint_test in /usr/lib/kselftests/pci_endpoint.
 
 	  These tools are available only from kernel version 4.20.
 
+comment "pci needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 comment "perf needs a toolchain w/ dynamic library, threads"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in
index 17246f5d7ed2..f9acf8f041d8 100644
--- a/package/linux-tools/linux-tool-pci.mk.in
+++ b/package/linux-tools/linux-tool-pci.mk.in
@@ -6,22 +6,36 @@
 
 LINUX_TOOLS += pci
 
-PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)"
+# Linux 6.14 moved the PCI endpoint tests into Kselftests.
+PCI_SRCDIR = $(strip $(if $(wildcard $(LINUX_DIR)/tools/testing/selftests/pci_endpoint/Makefile),\
+	$(LINUX_DIR)/tools/testing/selftests/pci_endpoint,$(LINUX_DIR)/tools/pci))
+
+PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
+	OUTPUT=$(PCI_SRCDIR)/ \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	LDLIBS="-lrt -lpthread -lm"
 
 define PCI_BUILD_CMDS
-	$(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \
+	$(Q)if test ! -f $(PCI_SRCDIR)/Makefile ; then \
+		echo "Your kernel sources do not contain the PCI endpoint tests." ; \
+		echo "Expected tools/pci or tools/testing/selftests/pci_endpoint." ; \
+		exit 1 ; \
+	fi
+	$(Q)if test "$(PCI_SRCDIR)" = "$(LINUX_DIR)/tools/pci" && \
+		! grep install $(PCI_SRCDIR)/Makefile >/dev/null 2>&1 ; then \
 		echo "Your kernel version is too old and does not have install section in the pci tools." ; \
 		echo "At least kernel 4.20 must be used." ; \
 		exit 1 ; \
 	fi
 
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/pci \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(PCI_SRCDIR) \
 		$(PCI_MAKE_OPTS)
 endef
 
 define PCI_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/pci \
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(PCI_SRCDIR) \
 		$(PCI_MAKE_OPTS) \
 		DESTDIR=$(TARGET_DIR) \
+		INSTALL_PATH=$(TARGET_DIR)/usr/lib/kselftests/pci_endpoint \
 		install
 endef
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Florian Fainelli via buildroot]

On 10/22/26 10:27, Florian Fainelli via buildroot wrote:
> Since Linux 6.14, the PCI endpoint tests have moved from tools/pci to
> tools/testing/selftests/pci_endpoint. The existing build commands still
> use the old location, causing the build to fail with newer kernels.
> 
> Detect the selftests directory and fall back to tools/pci for older
> kernels. Set OUTPUT and INSTALL_PATH to build and install the selftests
> under /usr/lib/kselftests/pci_endpoint, and pass the required libraries
> explicitly.
> 
> Add a threads dependency and update the help text to document the
> binary names and installation paths. Keep the minimum kernel version
> check for the legacy tools and report missing sources explicitly.
> 
> Fixes: 63e457639abb ("package/linux-tools: add support for pcitest tool")

That should have:

Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

I will resubmit shortly with that SoB unless there are other comments.
-- 
Florian

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Thomas Petazzoni via buildroot]

Hello Florian,

Nice, nice, I stumbled across this issue yesterday, and I was
precisely looking at cooking a patch, but you beat me at it! Some
review/questions below.

On Thu, Oct 22, 2026 at 10:27:52AM -0700, Florian Fainelli wrote:
> Since Linux 6.14, the PCI endpoint tests have moved from tools/pci to
> tools/testing/selftests/pci_endpoint. The existing build commands still
> use the old location, causing the build to fail with newer kernels.
> 
> Detect the selftests directory and fall back to tools/pci for older
> kernels. Set OUTPUT and INSTALL_PATH to build and install the selftests
> under /usr/lib/kselftests/pci_endpoint, and pass the required libraries
> explicitly.
> 
> Add a threads dependency and update the help text to document the
> binary names and installation paths. Keep the minimum kernel version
> check for the legacy tools and report missing sources explicitly.
> 
> Fixes: 63e457639abb ("package/linux-tools: add support for pcitest tool")

Technically it doesn't fix this commit. At the time of 63e457639abb,
Linux 6.14 was not a thing, so 63e457639abb was correct. It's really
Linux 6.14 that broke stuff, so I don't think we can really point to a
particular Buildroot commit that is fixed by this change.

> diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in
> index b9adc25ad51d..19d54cbbe707 100644
> --- a/package/linux-tools/Config.in
> +++ b/package/linux-tools/Config.in
> @@ -59,13 +59,18 @@ config BR2_PACKAGE_LINUX_TOOLS_MM
>  
>  config BR2_PACKAGE_LINUX_TOOLS_PCI
>  	bool "pci"
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	select BR2_PACKAGE_LINUX_TOOLS
>  	help
> -	  pcitest is a tool for testing capabilities related to a
> -	  PCI Endpoint (only works with specific Endpoints).
> +	  Build the PCI endpoint tests (only work with specific Endpoints).
> +	  Kernels before 6.14 provide pcitest in /usr/bin. Newer kernels
> +	  provide pci_endpoint_test in /usr/lib/kselftests/pci_endpoint.
>  
>  	  These tools are available only from kernel version 4.20.
>  
> +comment "pci needs a toolchain w/ threads"
> +	depends on !BR2_TOOLCHAIN_HAS_THREADS

Hm is this thread dependency new? With the Linux 6.14 change, or
unrelated?

>  comment "perf needs a toolchain w/ dynamic library, threads"
>  	depends on BR2_TOOLCHAIN_HAS_SYNC_4
>  	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in
> index 17246f5d7ed2..f9acf8f041d8 100644
> --- a/package/linux-tools/linux-tool-pci.mk.in
> +++ b/package/linux-tools/linux-tool-pci.mk.in
> @@ -6,22 +6,36 @@
>  
>  LINUX_TOOLS += pci
>  
> -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)"
> +# Linux 6.14 moved the PCI endpoint tests into Kselftests.
> +PCI_SRCDIR = $(strip $(if $(wildcard $(LINUX_DIR)/tools/testing/selftests/pci_endpoint/Makefile),\
> +	$(LINUX_DIR)/tools/testing/selftests/pci_endpoint,$(LINUX_DIR)/tools/pci))

Aaaah nice. I hadn't thought of doing it like this.

> +PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
> +	OUTPUT=$(PCI_SRCDIR)/ \
> +	LDFLAGS="$(TARGET_LDFLAGS)" \
> +	LDLIBS="-lrt -lpthread -lm"
>  
>  define PCI_BUILD_CMDS
> -	$(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \
> +	$(Q)if test ! -f $(PCI_SRCDIR)/Makefile ; then \
> +		echo "Your kernel sources do not contain the PCI endpoint tests." ; \
> +		echo "Expected tools/pci or tools/testing/selftests/pci_endpoint." ; \
> +		exit 1 ; \
> +	fi
> +	$(Q)if test "$(PCI_SRCDIR)" = "$(LINUX_DIR)/tools/pci" && \
> +		! grep install $(PCI_SRCDIR)/Makefile >/dev/null 2>&1 ; then \

I'm wondering if we really need to grep for "install" in the
Makefile. Can't we just do:

	$(Q)if test ! -f $(PCI_SRCDIR)/Makefile; then
  		echo "Your kernel version is too old and does not have install section in the pci tools." ; \
  		echo "At least kernel 4.20 must be used." ; \
	fi

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Florian Fainelli via buildroot]

On 10/22/26 10:40, Thomas Petazzoni via buildroot wrote:
> Hello Florian,
> 
> Nice, nice, I stumbled across this issue yesterday, and I was
> precisely looking at cooking a patch, but you beat me at it! Some
> review/questions below.
> 
> On Thu, Oct 22, 2026 at 10:27:52AM -0700, Florian Fainelli wrote:
>> Since Linux 6.14, the PCI endpoint tests have moved from tools/pci to
>> tools/testing/selftests/pci_endpoint. The existing build commands still
>> use the old location, causing the build to fail with newer kernels.
>>
>> Detect the selftests directory and fall back to tools/pci for older
>> kernels. Set OUTPUT and INSTALL_PATH to build and install the selftests
>> under /usr/lib/kselftests/pci_endpoint, and pass the required libraries
>> explicitly.
>>
>> Add a threads dependency and update the help text to document the
>> binary names and installation paths. Keep the minimum kernel version
>> check for the legacy tools and report missing sources explicitly.
>>
>> Fixes: 63e457639abb ("package/linux-tools: add support for pcitest tool")
> 
> Technically it doesn't fix this commit. At the time of 63e457639abb,
> Linux 6.14 was not a thing, so 63e457639abb was correct. It's really
> Linux 6.14 that broke stuff, so I don't think we can really point to a
> particular Buildroot commit that is fixed by this change.

You're correct, a Fixes tag is a bit too much in that case.

> 
>> diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in
>> index b9adc25ad51d..19d54cbbe707 100644
>> --- a/package/linux-tools/Config.in
>> +++ b/package/linux-tools/Config.in
>> @@ -59,13 +59,18 @@ config BR2_PACKAGE_LINUX_TOOLS_MM
>>   
>>   config BR2_PACKAGE_LINUX_TOOLS_PCI
>>   	bool "pci"
>> +	depends on BR2_TOOLCHAIN_HAS_THREADS
>>   	select BR2_PACKAGE_LINUX_TOOLS
>>   	help
>> -	  pcitest is a tool for testing capabilities related to a
>> -	  PCI Endpoint (only works with specific Endpoints).
>> +	  Build the PCI endpoint tests (only work with specific Endpoints).
>> +	  Kernels before 6.14 provide pcitest in /usr/bin. Newer kernels
>> +	  provide pci_endpoint_test in /usr/lib/kselftests/pci_endpoint.
>>   
>>   	  These tools are available only from kernel version 4.20.
>>   
>> +comment "pci needs a toolchain w/ threads"
>> +	depends on !BR2_TOOLCHAIN_HAS_THREADS
> 
> Hm is this thread dependency new? With the Linux 6.14 change, or
> unrelated?

I looked at the Makefile and because it linked with libpthread I assumed 
it needed it, but the source code reveals that it does not actually, 
just sent this out:

https://lore.kernel.org/all/20261022180022.1282641-1-florian.fainelli@broadcom.com/

> 
>>   comment "perf needs a toolchain w/ dynamic library, threads"
>>   	depends on BR2_TOOLCHAIN_HAS_SYNC_4
>>   	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
>> diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in
>> index 17246f5d7ed2..f9acf8f041d8 100644
>> --- a/package/linux-tools/linux-tool-pci.mk.in
>> +++ b/package/linux-tools/linux-tool-pci.mk.in
>> @@ -6,22 +6,36 @@
>>   
>>   LINUX_TOOLS += pci
>>   
>> -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)"
>> +# Linux 6.14 moved the PCI endpoint tests into Kselftests.
>> +PCI_SRCDIR = $(strip $(if $(wildcard $(LINUX_DIR)/tools/testing/selftests/pci_endpoint/Makefile),\
>> +	$(LINUX_DIR)/tools/testing/selftests/pci_endpoint,$(LINUX_DIR)/tools/pci))
> 
> Aaaah nice. I hadn't thought of doing it like this.
> 
>> +PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
>> +	OUTPUT=$(PCI_SRCDIR)/ \
>> +	LDFLAGS="$(TARGET_LDFLAGS)" \
>> +	LDLIBS="-lrt -lpthread -lm"
>>   
>>   define PCI_BUILD_CMDS
>> -	$(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \
>> +	$(Q)if test ! -f $(PCI_SRCDIR)/Makefile ; then \
>> +		echo "Your kernel sources do not contain the PCI endpoint tests." ; \
>> +		echo "Expected tools/pci or tools/testing/selftests/pci_endpoint." ; \
>> +		exit 1 ; \
>> +	fi
>> +	$(Q)if test "$(PCI_SRCDIR)" = "$(LINUX_DIR)/tools/pci" && \
>> +		! grep install $(PCI_SRCDIR)/Makefile >/dev/null 2>&1 ; then \
> 
> I'm wondering if we really need to grep for "install" in the
> Makefile. Can't we just do:
> 
> 	$(Q)if test ! -f $(PCI_SRCDIR)/Makefile; then
>    		echo "Your kernel version is too old and does not have install section in the pci tools." ; \
>    		echo "At least kernel 4.20 must be used." ; \
> 	fi

Yes we certainly can do that, it's more concise, v2 on its way.

Thanks Thomas.
-- 
Florian

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Thomas Petazzoni via buildroot]

On Thu, Oct 22, 2026 at 11:02:41AM -0700, Florian Fainelli wrote:

> > Hm is this thread dependency new? With the Linux 6.14 change, or
> > unrelated?
> 
> I looked at the Makefile and because it linked with libpthread I assumed it
> needed it, but the source code reveals that it does not actually, just sent
> this out:
> 
> https://lore.kernel.org/all/20261022180022.1282641-1-florian.fainelli@broadcom.com/

Saw your patch. Problem is that all kernels from 6.14 to 7.4 at least
will require pthread to build the pci endpoint tests. So in the end, I
suggest that we keep your thread dependency.

Not a big deal as 99.99% of people will use a configuration that has
threads enabled. Better that than having random build failures from
time to time in our autobuilders.

> Yes we certainly can do that, it's more concise, v2 on its way.

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Florian Fainelli via buildroot]

On 10/22/26 11:30, Thomas Petazzoni wrote:
> On Thu, Oct 22, 2026 at 11:02:41AM -0700, Florian Fainelli wrote:
> 
>>> Hm is this thread dependency new? With the Linux 6.14 change, or
>>> unrelated?
>>
>> I looked at the Makefile and because it linked with libpthread I assumed it
>> needed it, but the source code reveals that it does not actually, just sent
>> this out:
>>
>> https://lore.kernel.org/all/20261022180022.1282641-1-florian.fainelli@broadcom.com/
> 
> Saw your patch. Problem is that all kernels from 6.14 to 7.4 at least
> will require pthread to build the pci endpoint tests. So in the end, I
> suggest that we keep your thread dependency.
> 
> Not a big deal as 99.99% of people will use a configuration that has
> threads enabled. Better that than having random build failures from
> time to time in our autobuilders.

v2 explicitly passes the libraries to link against, so that should avoid 
the dependency upon the patch above.

> 
>> Yes we certainly can do that, it's more concise, v2 on its way.
> 
> Thanks a lot!
> 
> Thomas


-- 
Florian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/linux-tools: fix PCI endpoint tests build with recent kernels

[Thomas Petazzoni via buildroot]

On Thu, Oct 22, 2026 at 11:35:08AM -0700, Florian Fainelli wrote:

> v2 explicitly passes the libraries to link against, so that should avoid the
> dependency upon the patch above.

Ah, indeed, thanks!

I've got some other issues with linux-tools:

ERROR: architecture for "/usr/lib/kselftests/net/lib/ynl/lib/ynl.o" is "Advanced Micro Devices X86-64", should be "AArch64"
ERROR: architecture for "/usr/lib/kselftests/net/lib/ynl/lib/ynl.a" is "Advanced Micro Devices X86-64", should be "AArch64"
ERROR: architecture for "/usr/lib/kselftests/net/lib/xdp_dummy.bpf.o" is "Linux BPF", should be "AArch64"
ERROR: architecture for "/usr/lib/kselftests/net/lib/xdp_metadata.bpf.o" is "Linux BPF", should be "AArch64"
ERROR: architecture for "/usr/lib/kselftests/net/lib/xdp_native.bpf.o" is "Linux BPF", should be "AArch64"
make[1]: *** [package/pkg-generic.mk:386: /home/thomas/buildroot/all/output-all/build/linux-tools/.stamp_installed] Error 1
make: *** [Makefile:83: _all] Error 2

But these are not related to the pci endpoint test, so I'll
investigate :)

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot