On 6/11/25 5:40 PM, Dev Jain wrote:
If CONFIG_UPROBES is not set, a merge subtest fails:

Failure log:

   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

CONFIG_UPROBES is enabled by CONFIG_UPROBE_EVENTS, which gets enabled by
CONFIG_FTRACE. Therefore add this config to selftests/mm/config so that
CI systems can include this config in the kernel build.

Fixes: efe99fabeb11b ("selftests/mm: add test about uprobe pte be orphan during vma 
merge")
Reported-by: Aishwarya <[email protected]>
Closes: 
https://lore.kernel.org/all/[email protected]/
Signed-off-by: Dev Jain <[email protected]>
---
  tools/testing/selftests/mm/config | 1 +
  1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/mm/config 
b/tools/testing/selftests/mm/config
index a28baa536332..e600b41030c1 100644
--- a/tools/testing/selftests/mm/config
+++ b/tools/testing/selftests/mm/config
@@ -8,3 +8,4 @@ CONFIG_GUP_TEST=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_MEM_SOFT_DIRTY=y
  CONFIG_ANON_VMA_NAME=y
+CONFIG_FTRACE=y

I have tested this patch, and it is working fine.

ok 7 merge.forked_source_vma
#  RUN           merge.handle_uprobe_upon_merged_vma ...
#            OK  merge.handle_uprobe_upon_merged_vma
ok 8 merge.handle_uprobe_upon_merged_vma
# PASSED: 8 / 8 tests passed.


Tested-by : Donet Tom <[email protected]>



Reply via email to