* [PATCH 1/2] kselftest/vm: override TARGETS from arguments
@ 2022-02-27 5:53 Chengming Zhou
2022-02-27 5:53 ` [PATCH 2/2] kselftest/vm: fix tests build with old libc Chengming Zhou
2022-03-03 19:17 ` [PATCH 1/2] kselftest/vm: override TARGETS from arguments Shuah Khan
0 siblings, 2 replies; 5+ messages in thread
From: Chengming Zhou @ 2022-02-27 5:53 UTC (permalink / raw)
To: akpm, shuah; +Cc: linux-mm, linux-kselftest, linux-kernel, Chengming Zhou
We can specify which testcases to build using TARGETS argument,
for example: make -C tools/testing/selftests TARGETS=vm, cause
the ordinary assignment of TARGETS in Makefile will be ignored.
So we need to use override directive to change that.
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
tools/testing/selftests/vm/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index 1607322a112c..0b330a5b1840 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -53,7 +53,7 @@ CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bit_progra
CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_64bit_program.c)
CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_program.c -no-pie)
-TARGETS := protection_keys
+override TARGETS := protection_keys
BINARIES_32 := $(TARGETS:%=%_32)
BINARIES_64 := $(TARGETS:%=%_64)
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] kselftest/vm: fix tests build with old libc
2022-02-27 5:53 [PATCH 1/2] kselftest/vm: override TARGETS from arguments Chengming Zhou
@ 2022-02-27 5:53 ` Chengming Zhou
2022-03-03 21:27 ` Shuah Khan
2022-03-03 19:17 ` [PATCH 1/2] kselftest/vm: override TARGETS from arguments Shuah Khan
1 sibling, 1 reply; 5+ messages in thread
From: Chengming Zhou @ 2022-02-27 5:53 UTC (permalink / raw)
To: akpm, shuah; +Cc: linux-mm, linux-kselftest, linux-kernel, Chengming Zhou
The error message when I build vm tests on debian10 (GLIBC 2.28):
userfaultfd.c: In function ‘userfaultfd_pagemap_test’:
userfaultfd.c:1393:37: error: ‘MADV_PAGEOUT’ undeclared (first use
in this function); did you mean ‘MADV_RANDOM’?
if (madvise(area_dst, test_pgsize, MADV_PAGEOUT))
^~~~~~~~~~~~
MADV_RANDOM
This patch includes these newer definitions from UAPI linux/mman.h,
is useful to fix tests build on systems without these definitions in
glibc sys/mman.h.
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
tools/testing/selftests/vm/userfaultfd.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 2f49c9af1b58..3fc1d2ee2948 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -46,6 +46,7 @@
#include <signal.h>
#include <poll.h>
#include <string.h>
+#include <linux/mman.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/ioctl.h>
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] kselftest/vm: override TARGETS from arguments
2022-02-27 5:53 [PATCH 1/2] kselftest/vm: override TARGETS from arguments Chengming Zhou
2022-02-27 5:53 ` [PATCH 2/2] kselftest/vm: fix tests build with old libc Chengming Zhou
@ 2022-03-03 19:17 ` Shuah Khan
2022-03-04 14:50 ` [External] " Chengming Zhou
1 sibling, 1 reply; 5+ messages in thread
From: Shuah Khan @ 2022-03-03 19:17 UTC (permalink / raw)
To: Chengming Zhou, akpm, shuah
Cc: linux-mm, linux-kselftest, linux-kernel, Shuah Khan
On 2/26/22 10:53 PM, Chengming Zhou wrote:
> We can specify which testcases to build using TARGETS argument,
> for example: make -C tools/testing/selftests TARGETS=vm, cause
> the ordinary assignment of TARGETS in Makefile will be ignored.
> So we need to use override directive to change that.
>
> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
> ---
> tools/testing/selftests/vm/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
> index 1607322a112c..0b330a5b1840 100644
> --- a/tools/testing/selftests/vm/Makefile
> +++ b/tools/testing/selftests/vm/Makefile
> @@ -53,7 +53,7 @@ CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bit_progra
> CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_64bit_program.c)
> CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_program.c -no-pie)
>
> -TARGETS := protection_keys
> +override TARGETS := protection_keys
> BINARIES_32 := $(TARGETS:%=%_32)
> BINARIES_64 := $(TARGETS:%=%_64)
>
>
Let's not override TARGETS - rename TARGETS in this file.
VM_TARGETS?
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] kselftest/vm: fix tests build with old libc
2022-02-27 5:53 ` [PATCH 2/2] kselftest/vm: fix tests build with old libc Chengming Zhou
@ 2022-03-03 21:27 ` Shuah Khan
0 siblings, 0 replies; 5+ messages in thread
From: Shuah Khan @ 2022-03-03 21:27 UTC (permalink / raw)
To: Chengming Zhou, akpm, shuah
Cc: linux-mm, linux-kselftest, linux-kernel, Shuah Khan
On 2/26/22 10:53 PM, Chengming Zhou wrote:
> The error message when I build vm tests on debian10 (GLIBC 2.28):
>
> userfaultfd.c: In function ‘userfaultfd_pagemap_test’:
> userfaultfd.c:1393:37: error: ‘MADV_PAGEOUT’ undeclared (first use
> in this function); did you mean ‘MADV_RANDOM’?
> if (madvise(area_dst, test_pgsize, MADV_PAGEOUT))
> ^~~~~~~~~~~~
> MADV_RANDOM
>
> This patch includes these newer definitions from UAPI linux/mman.h,
> is useful to fix tests build on systems without these definitions in
> glibc sys/mman.h.
>
> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
> ---
> tools/testing/selftests/vm/userfaultfd.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
> index 2f49c9af1b58..3fc1d2ee2948 100644
> --- a/tools/testing/selftests/vm/userfaultfd.c
> +++ b/tools/testing/selftests/vm/userfaultfd.c
> @@ -46,6 +46,7 @@
> #include <signal.h>
> #include <poll.h>
> #include <string.h>
> +#include <linux/mman.h>
> #include <sys/mman.h>
> #include <sys/syscall.h>
> #include <sys/ioctl.h>
>
Looks good to me.
Andrew,
If you want to take this through your tree or I can apply it.
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [External] Re: [PATCH 1/2] kselftest/vm: override TARGETS from arguments
2022-03-03 19:17 ` [PATCH 1/2] kselftest/vm: override TARGETS from arguments Shuah Khan
@ 2022-03-04 14:50 ` Chengming Zhou
0 siblings, 0 replies; 5+ messages in thread
From: Chengming Zhou @ 2022-03-04 14:50 UTC (permalink / raw)
To: Shuah Khan, akpm, shuah; +Cc: linux-mm, linux-kselftest, linux-kernel
On 2022/3/4 3:17 上午, Shuah Khan wrote:
> On 2/26/22 10:53 PM, Chengming Zhou wrote:
>> We can specify which testcases to build using TARGETS argument,
>> for example: make -C tools/testing/selftests TARGETS=vm, cause
>> the ordinary assignment of TARGETS in Makefile will be ignored.
>> So we need to use override directive to change that.
>>
>> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
>> ---
>> tools/testing/selftests/vm/Makefile | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
>> index 1607322a112c..0b330a5b1840 100644
>> --- a/tools/testing/selftests/vm/Makefile
>> +++ b/tools/testing/selftests/vm/Makefile
>> @@ -53,7 +53,7 @@ CAN_BUILD_I386 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_32bit_progra
>> CAN_BUILD_X86_64 := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_64bit_program.c)
>> CAN_BUILD_WITH_NOPIE := $(shell ./../x86/check_cc.sh $(CC) ../x86/trivial_program.c -no-pie)
>> -TARGETS := protection_keys
>> +override TARGETS := protection_keys
>> BINARIES_32 := $(TARGETS:%=%_32)
>> BINARIES_64 := $(TARGETS:%=%_64)
>>
>
> Let's not override TARGETS - rename TARGETS in this file.
> VM_TARGETS?
Looks like Andrew has already added this patch to the -mm tree. I think
both way is ok to solve this problem. Should I rename to VM_TARGETS and
send another patch?
Thanks.
>
> thanks,
> -- Shuah
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-04 14:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-27 5:53 [PATCH 1/2] kselftest/vm: override TARGETS from arguments Chengming Zhou
2022-02-27 5:53 ` [PATCH 2/2] kselftest/vm: fix tests build with old libc Chengming Zhou
2022-03-03 21:27 ` Shuah Khan
2022-03-03 19:17 ` [PATCH 1/2] kselftest/vm: override TARGETS from arguments Shuah Khan
2022-03-04 14:50 ` [External] " Chengming Zhou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).