selftests:dma: Fix compile error in user-space tool
PATCH 1/1 selftests:dma: Fix compile error in user-space tool
Since [1] the user-space program dma_map_benchmark shares the header file linux/map_benchmark.h with the kernel driver in kernel/dma/map_benchmark.c. With latest kernel version this does not compile anymore.
While https://kernelnewbies.org/KernelHeaders suggests otherwise, allow it to use kernel headers through the uapi/ include directory. I assume we can do so safely, since the controlling user-space program is distributed with the kernel.
With this change dma_map_benchmark compiles with just the obvious warning about uapi usage on ARCH=x86, arm64, and s390 and runs on ARCH=s390.
[1] commit 8ddde07a3d28 ("dma-mapping: benchmark: extract a common header file for map_benchmark definition")
--- tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/dma/dma_map_benchmark.c +1 -1
@@ -10,7 +10,7 @@#include <unistd.h> #include <sys/ioctl.h> #include <sys/mman.h> -#include <linux/types.h> +#include <uapi/linux/types.h> #include <linux/map_benchmark.h> #define NSEC_PER_MSEC 1000000L
base-commit: 1fe4fd6f5cad346e598593af36caeadc4f5d4fa9
Signature · 1 line
2.39.0
Shuah Khan
maintainerQuoted 35 lines · Gerd Bayer
Since [1] the user-space program
dma_map_benchmarkshares the header filelinux/map_benchmark.hwith the kernel driver inkernel/dma/map_benchmark.c. With latest kernel version this does not compile anymore.While https://kernelnewbies.org/KernelHeaders suggests otherwise, allow it to use kernel headers through the uapi/ include directory. I assume we can do so safely, since the controlling user-space program is distributed with the kernel.
With this change
dma_map_benchmarkcompiles with just the obvious warning about uapi usage on ARCH=x86, arm64, and s390 and runs on ARCH=s390.[1] commit
8ddde07a3d28("dma-mapping: benchmark: extract a common header file formap_benchmarkdefinition")Signed-off-by Gerd Bayer <[email protected]>Acked-by Xiang Chen <[email protected]>--- tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/testing/selftests/dma/dma_map_benchmark.c +1
-1@@ -10,7 +10,7 @@#include <unistd.h> #include <sys/ioctl.h> #include <sys/mman.h> -#include <linux/types.h> +#include <uapi/linux/types.h> #include <linux/map_benchmark.h> #define NSEC_PER_MSEC 1000000L
Quoted 1 line
base-commit:
1fe4fd6f5cad346e598593af36caeadc4f5d4fa9
On Linux 6.2-rc3, dma_map_benchmark compiles just fine. You do have to do "make headers_install" first as kselftest depends on headers being installed in the repo.
Please let me know if you are seeing compile problems even after installing headers.
thanks,
-- Shuah
Quoted 10 lines · Shuah Khan
Quoted 4 lines · Gerd Bayer
With this change
dma_map_benchmarkcompiles with just the obvious warning
about uapi usage on ARCH=x86, arm64, and s390 and runs on ARCH=s390.On Linux 6.2-rc3,
dma_map_benchmarkcompiles just fine. You do have to do "makeheaders_install" first as kselftest depends on headers being installed in the repo.
Quoted 5 lines
Please let me know if you are seeing compile problems even after installing headers.
thanks,
-- Shuah
Hi Shuah,
thank you for this clarification. Once I run "make headers_install" before attempting to build the dma_benchmark_test executable with
make -C tools/testing/selftests/ TARGETS="dma"
everything works out nicely - even w/o my patch.
I have to apologize for creating this fuzz. I was not aware that one of the dependencies for "make kselftest" was "make headers_install", since I was going straight for the interactive "dma_benchmark_test" control tool of the test that is implemented in kernel/dma/benchmark_test.c. I didn't intend to run the full "make kselftest" suite, primarily since I have distinct test and build systems - most often building cross- arch, even.
So please, disregard the PATCH.
Thank you,
Gerd
Shuah Khan
maintainerQuoted 24 lines · Gerd Bayer
Quoted 10 lines · Shuah Khan
Quoted 4 lines · Gerd Bayer
With this change
dma_map_benchmarkcompiles with just the obvious warning
about uapi usage on ARCH=x86, arm64, and s390 and runs on ARCH=s390.On Linux 6.2-rc3,
dma_map_benchmarkcompiles just fine. You do have to do "makeheaders_install" first as kselftest depends on headers being installed in the repo.Quoted 5 lines
Please let me know if you are seeing compile problems even after installing headers.
thanks,
-- ShuahHi Shuah,
thank you for this clarification. Once I run "make
headers_install" before attempting to build thedma_benchmark_testexecutable with
make -Ctools/testing/selftests/TARGETS="dma"
everything works out nicely - even w/o my patch.
Quoted 8 lines
I have to apologize for creating this fuzz. I was not aware that one of the dependencies for "make kselftest" was "make
headers_install", since I was going straight for the interactive "dma_benchmark_test" control tool of the test that is implemented inkernel/dma/benchmark_test.c. I didn't intend to run the full "make kselftest" suite, primarily since I have distinct test and build systems - most often building cross- arch, even.
No worries. The reason for this dependency is to ensure kselftest can test the kernel properly. Tests for new or enhanced kernel features depend on mew headers. headers_install has been dependency for kselftest from the beginning and some individual tests depend on it.
The main Makefile (make kselftest) enforces the dependency and installs headers first. You can use the following commands to compile/run dma test. This will install the headers and then compile/run dma test.
make kselftest-all TARGETS=dma (compile)
make kselftest TARGETS=dma (compile and run)
Quoted 1 line
So please, disregard the PATCH.
Done.
thanks,
-- Shuah