2022-06-14 11:56:06

by Yu Liao

Subject: [PATCH] selftests dma: fix compile error for dma_map_benchmark

When building selftests/dma:
$ make -C tools/testing/selftests TARGETS=dma
I hit the following compilation error:

dma_map_benchmark.c:13:10: fatal error: linux/map_benchmark.h: No such file or directory
#include <linux/map_benchmark.h>
^~~~~~~~~~~~~~~~~~~~~~~

dma/Makefile does not include the map_benchmark.h path, so add
more including path, and fix include order in dma_map_benchmark.c

Fixes: 8ddde07a3d28 ("dma-mapping: benchmark: extract a common header file for map_benchmark definition")
Signed-off-by: Yu Liao <[email protected]>
---
tools/testing/selftests/dma/Makefile | 1 +
tools/testing/selftests/dma/dma_map_benchmark.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/dma/Makefile b/tools/testing/selftests/dma/Makefile
index aa8e8b5b3864..cd8c5ece1cba 100644
--- a/tools/testing/selftests/dma/Makefile
+++ b/tools/testing/selftests/dma/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
CFLAGS += -I../../../../usr/include/
+CFLAGS += -I../../../../include/

TEST_GEN_PROGS := dma_map_benchmark

diff --git a/tools/testing/selftests/dma/dma_map_benchmark.c b/tools/testing/selftests/dma/dma_map_benchmark.c
index c3b3c09e995e..5c997f17fcbd 100644
--- a/tools/testing/selftests/dma/dma_map_benchmark.c
+++ b/tools/testing/selftests/dma/dma_map_benchmark.c
@@ -10,8 +10,8 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include <linux/map_benchmark.h>
#include <linux/types.h>
+#include <linux/map_benchmark.h>

#define NSEC_PER_MSEC 1000000L

--
2.25.1

2022-06-16 20:26:42

by Shuah Khan

Subject: Re: [PATCH] selftests dma: fix compile error for dma_map_benchmark

On 6/14/22 6:02 AM, Yu Liao wrote:
> When building selftests/dma:
> $ make -C tools/testing/selftests TARGETS=dma
> I hit the following compilation error:
>
> dma_map_benchmark.c:13:10: fatal error: linux/map_benchmark.h: No such file or directory
> #include <linux/map_benchmark.h>
> ^~~~~~~~~~~~~~~~~~~~~~~
>
> dma/Makefile does not include the map_benchmark.h path, so add
> more including path, and fix include order in dma_map_benchmark.c
>
> Fixes: 8ddde07a3d28 ("dma-mapping: benchmark: extract a common header file for map_benchmark definition")
> Signed-off-by: Yu Liao <[email protected]>
> ---
> tools/testing/selftests/dma/Makefile | 1 +
> tools/testing/selftests/dma/dma_map_benchmark.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/dma/Makefile b/tools/testing/selftests/dma/Makefile
> index aa8e8b5b3864..cd8c5ece1cba 100644
> --- a/tools/testing/selftests/dma/Makefile
> +++ b/tools/testing/selftests/dma/Makefile
> @@ -1,5 +1,6 @@
> # SPDX-License-Identifier: GPL-2.0
> CFLAGS += -I../../../../usr/include/
> +CFLAGS += -I../../../../include/
>
> TEST_GEN_PROGS := dma_map_benchmark
>
> diff --git a/tools/testing/selftests/dma/dma_map_benchmark.c b/tools/testing/selftests/dma/dma_map_benchmark.c
> index c3b3c09e995e..5c997f17fcbd 100644
> --- a/tools/testing/selftests/dma/dma_map_benchmark.c
> +++ b/tools/testing/selftests/dma/dma_map_benchmark.c
> @@ -10,8 +10,8 @@
> #include <unistd.h>
> #include <sys/ioctl.h>
> #include <sys/mman.h>
> -#include <linux/map_benchmark.h>
> #include <linux/types.h>
> +#include <linux/map_benchmark.h>
>
> #define NSEC_PER_MSEC 1000000L
>
>

Thank you for the fix. Applied to linux-kselftest fixes branch for
Linux 5.19-rc3 or rc4

thanks,
-- Shuah