* Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled
2025-06-10 12:22 [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Pedro Falcato
@ 2025-06-10 13:55 ` Lorenzo Stoakes
2025-06-11 7:12 ` Pu Lehui
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Lorenzo Stoakes @ 2025-06-10 13:55 UTC (permalink / raw)
To: Pedro Falcato
Cc: Andrew Morton, Liam R. Howlett, Shuah Khan, Vlastimil Babka,
Jann Horn, Pu Lehui, linux-mm, linux-kselftest, Aishwarya,
broonie
On Tue, Jun 10, 2025 at 01:22:09PM +0100, Pedro Falcato wrote:
> If uprobes are not enabled, the test currently fails with:
>
> 7151 12:46:54.627936 # # # RUN merge.handle_uprobe_upon_merged_vma ...
> 7152 12:46:54.639014 # # f /sys/bus/event_source/devices/uprobe/type
> 7153 12:46:54.639306 # # fopen: No such file or directory
> 7154 12:46:54.650451 # # # merge.c:473:handle_uprobe_upon_merged_vma:Expected
> read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) (1) == 0 (0)
> 7155 12:46:54.650730 # # # handle_uprobe_upon_merged_vma: Test terminated by assertion
> 7156 12:46:54.661750 # # # FAIL merge.handle_uprobe_upon_merged_vma
> 7157 12:46:54.662030 # # not ok 8 merge.handle_uprobe_upon_merged_vma
>
> Skipping is a more sane and friendly behavior here.
>
> Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma merge")
> Reported-by: Aishwarya <aishwarya.tcv@arm.com>
> Closes: https://lore.kernel.org/linux-mm/20250610103729.72440-1-aishwarya.tcv@arm.com/
> Signed-off-by: Pedro Falcato <pfalcato@suse.de>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> ---
> tools/testing/selftests/mm/merge.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c
> index bbae66fc5038..cc26480098ae 100644
> --- a/tools/testing/selftests/mm/merge.c
> +++ b/tools/testing/selftests/mm/merge.c
> @@ -470,7 +470,9 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_GE(fd, 0);
>
> ASSERT_EQ(ftruncate(fd, page_size), 0);
> - ASSERT_EQ(read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type), 0);
> + if (read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) != 0) {
> + SKIP(goto out, "Failed to read uprobe sysfs file, skipping");
> + }
Thanks this seems like a saner option!
>
> memset(&attr, 0, attr_sz);
> attr.size = attr_sz;
> @@ -491,6 +493,7 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_NE(mremap(ptr2, page_size, page_size,
> MREMAP_MAYMOVE | MREMAP_FIXED, ptr1), MAP_FAILED);
>
> +out:
> close(fd);
> remove(probe_file);
> }
> --
> 2.49.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled
2025-06-10 12:22 [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Pedro Falcato
2025-06-10 13:55 ` Lorenzo Stoakes
@ 2025-06-11 7:12 ` Pu Lehui
2025-06-11 12:52 ` Dev Jain
2025-06-11 14:23 ` Donet Tom
3 siblings, 0 replies; 5+ messages in thread
From: Pu Lehui @ 2025-06-11 7:12 UTC (permalink / raw)
To: Pedro Falcato, Andrew Morton, Liam R. Howlett, Lorenzo Stoakes,
Shuah Khan
Cc: Vlastimil Babka, Jann Horn, linux-mm, linux-kselftest, Aishwarya,
broonie
On 2025/6/10 20:22, Pedro Falcato wrote:
> If uprobes are not enabled, the test currently fails with:
>
> 7151 12:46:54.627936 # # # RUN merge.handle_uprobe_upon_merged_vma ...
> 7152 12:46:54.639014 # # f /sys/bus/event_source/devices/uprobe/type
> 7153 12:46:54.639306 # # fopen: No such file or directory
> 7154 12:46:54.650451 # # # merge.c:473:handle_uprobe_upon_merged_vma:Expected
> read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) (1) == 0 (0)
> 7155 12:46:54.650730 # # # handle_uprobe_upon_merged_vma: Test terminated by assertion
> 7156 12:46:54.661750 # # # FAIL merge.handle_uprobe_upon_merged_vma
> 7157 12:46:54.662030 # # not ok 8 merge.handle_uprobe_upon_merged_vma
>
> Skipping is a more sane and friendly behavior here.
>
> Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma merge")
> Reported-by: Aishwarya <aishwarya.tcv@arm.com>
> Closes: https://lore.kernel.org/linux-mm/20250610103729.72440-1-aishwarya.tcv@arm.com/
> Signed-off-by: Pedro Falcato <pfalcato@suse.de>
> ---
> tools/testing/selftests/mm/merge.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c
> index bbae66fc5038..cc26480098ae 100644
> --- a/tools/testing/selftests/mm/merge.c
> +++ b/tools/testing/selftests/mm/merge.c
> @@ -470,7 +470,9 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_GE(fd, 0);
>
> ASSERT_EQ(ftruncate(fd, page_size), 0);
> - ASSERT_EQ(read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type), 0);
> + if (read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) != 0) {
> + SKIP(goto out, "Failed to read uprobe sysfs file, skipping");
> + }
>
> memset(&attr, 0, attr_sz);
> attr.size = attr_sz;
> @@ -491,6 +493,7 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_NE(mremap(ptr2, page_size, page_size,
> MREMAP_MAYMOVE | MREMAP_FIXED, ptr1), MAP_FAILED);
>
> +out:
> close(fd);
> remove(probe_file);
> }
Thanks, feel free to add:
Reviewed-by: Pu Lehui <pulehui@huawei.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled
2025-06-10 12:22 [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Pedro Falcato
2025-06-10 13:55 ` Lorenzo Stoakes
2025-06-11 7:12 ` Pu Lehui
@ 2025-06-11 12:52 ` Dev Jain
2025-06-11 14:23 ` Donet Tom
3 siblings, 0 replies; 5+ messages in thread
From: Dev Jain @ 2025-06-11 12:52 UTC (permalink / raw)
To: Pedro Falcato, Andrew Morton, Liam R. Howlett, Lorenzo Stoakes,
Shuah Khan
Cc: Vlastimil Babka, Jann Horn, Pu Lehui, linux-mm, linux-kselftest,
Aishwarya, broonie
On 10/06/25 5:52 pm, Pedro Falcato wrote:
> If uprobes are not enabled, the test currently fails with:
>
> 7151 12:46:54.627936 # # # RUN merge.handle_uprobe_upon_merged_vma ...
> 7152 12:46:54.639014 # # f /sys/bus/event_source/devices/uprobe/type
> 7153 12:46:54.639306 # # fopen: No such file or directory
> 7154 12:46:54.650451 # # # merge.c:473:handle_uprobe_upon_merged_vma:Expected
> read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) (1) == 0 (0)
> 7155 12:46:54.650730 # # # handle_uprobe_upon_merged_vma: Test terminated by assertion
> 7156 12:46:54.661750 # # # FAIL merge.handle_uprobe_upon_merged_vma
> 7157 12:46:54.662030 # # not ok 8 merge.handle_uprobe_upon_merged_vma
>
> Skipping is a more sane and friendly behavior here.
>
> Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma merge")
> Reported-by: Aishwarya <aishwarya.tcv@arm.com>
> Closes: https://lore.kernel.org/linux-mm/20250610103729.72440-1-aishwarya.tcv@arm.com/
> Signed-off-by: Pedro Falcato <pfalcato@suse.de>
> ---
>
Reviewed-by: Dev Jain <dev.jain@arm.com>
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled
2025-06-10 12:22 [PATCH] selftests/mm: Skip uprobe vma merge test if uprobes are not enabled Pedro Falcato
` (2 preceding siblings ...)
2025-06-11 12:52 ` Dev Jain
@ 2025-06-11 14:23 ` Donet Tom
3 siblings, 0 replies; 5+ messages in thread
From: Donet Tom @ 2025-06-11 14:23 UTC (permalink / raw)
To: Pedro Falcato, Andrew Morton, Liam R. Howlett, Lorenzo Stoakes,
Shuah Khan
Cc: Vlastimil Babka, Jann Horn, Pu Lehui, linux-mm, linux-kselftest,
Aishwarya, broonie
On 6/10/25 5:52 PM, Pedro Falcato wrote:
> If uprobes are not enabled, the test currently fails with:
>
> 7151 12:46:54.627936 # # # RUN merge.handle_uprobe_upon_merged_vma ...
> 7152 12:46:54.639014 # # f /sys/bus/event_source/devices/uprobe/type
> 7153 12:46:54.639306 # # fopen: No such file or directory
> 7154 12:46:54.650451 # # # merge.c:473:handle_uprobe_upon_merged_vma:Expected
> read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) (1) == 0 (0)
> 7155 12:46:54.650730 # # # handle_uprobe_upon_merged_vma: Test terminated by assertion
> 7156 12:46:54.661750 # # # FAIL merge.handle_uprobe_upon_merged_vma
> 7157 12:46:54.662030 # # not ok 8 merge.handle_uprobe_upon_merged_vma
>
> Skipping is a more sane and friendly behavior here.
>
> Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma merge")
> Reported-by: Aishwarya <aishwarya.tcv@arm.com>
> Closes: https://lore.kernel.org/linux-mm/20250610103729.72440-1-aishwarya.tcv@arm.com/
> Signed-off-by: Pedro Falcato <pfalcato@suse.de>
> ---
> tools/testing/selftests/mm/merge.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/mm/merge.c
> index bbae66fc5038..cc26480098ae 100644
> --- a/tools/testing/selftests/mm/merge.c
> +++ b/tools/testing/selftests/mm/merge.c
> @@ -470,7 +470,9 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_GE(fd, 0);
>
> ASSERT_EQ(ftruncate(fd, page_size), 0);
> - ASSERT_EQ(read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type), 0);
> + if (read_sysfs("/sys/bus/event_source/devices/uprobe/type", &type) != 0) {
> + SKIP(goto out, "Failed to read uprobe sysfs file, skipping");
> + }
This looks good to me.
# RUN merge.handle_uprobe_upon_merged_vma ...
f /sys/bus/event_source/devices/uprobe/type
fopen: No such file or directory
# SKIP Failed to read uprobe sysfs file, skipping
# OK merge.handle_uprobe_upon_merged_vma
ok 8 merge.handle_uprobe_upon_merged_vma # SKIP Failed to read uprobe
sysfs file, skipping
# PASSED: 8 / 8 tests passed.
# 1 skipped test(s) detected. Consider enabling relevant config options
to improve coverage.
# Totals: pass:7 fail:0 xfail:0 xpass:0 skip:1 error:0
Tested-by : Donet Tom <donettom@linux.ibm.com>
Reviewed-by : Donet Tom <donettom@linux.ibm.com>
>
> memset(&attr, 0, attr_sz);
> attr.size = attr_sz;
> @@ -491,6 +493,7 @@ TEST_F(merge, handle_uprobe_upon_merged_vma)
> ASSERT_NE(mremap(ptr2, page_size, page_size,
> MREMAP_MAYMOVE | MREMAP_FIXED, ptr1), MAP_FAILED);
>
> +out:
> close(fd);
> remove(probe_file);
> }
^ permalink raw reply [flat|nested] 5+ messages in thread