test

Author: olsajiri

tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c

@@ -623,19 +623,29 @@ static void *worker_trigger(void *arg)
 static void *worker_attach(void *arg)
 {
 	struct uprobe_syscall_executed *skel;
-	unsigned long rounds = 0;
+	unsigned long rounds = 0, offset;
+	void *addr;
+
+	addr = find_nop5(&uprobe_test);
+	if (!ASSERT_OK_PTR(addr, "find_nop5"))
+		return NULL;
+
+	offset = get_uprobe_offset(addr);
+	if (!ASSERT_GE(offset, 0, "get_uprobe_offset"))
+		return NULL;
 
 	skel = uprobe_syscall_executed__open_and_load();
 	if (!ASSERT_OK_PTR(skel, "uprobe_syscall_executed__open_and_load"))
 		return NULL;
 
 	while (!race_stop) {
-		skel->links.test_uprobe_multi = bpf_program__attach_uprobe_multi(skel->progs.test_uprobe_multi,
-						-1, "/proc/self/exe", "uprobe_test", NULL);
-		if (!ASSERT_OK_PTR(skel->links.test_uprobe_multi, "bpf_program__attach_uprobe_multi"))
+		skel->links.test_uprobe = bpf_program__attach_uprobe_opts(skel->progs.test_uprobe,
+					0, "/proc/self/exe", offset, NULL);
+		if (!ASSERT_OK_PTR(skel->links.test_uprobe, "bpf_program__attach_uprobe_opts"))
 			break;
-		bpf_link__destroy(skel->links.test_uprobe_multi);
-		skel->links.test_uprobe_multi = NULL;
+
+		bpf_link__destroy(skel->links.test_uprobe);
+		skel->links.test_uprobe = NULL;
 		rounds++;
 	}
 
@@ -653,6 +663,7 @@ static void test_uprobe_race(void)
 	if (!ASSERT_GE(nr_cpus, 0, "nr_cpus"))
 		return;
 
+	nr_cpus /= 2;
 	nr = nr_cpus * 2;
 	threads = malloc(sizeof(*threads) * nr);
 	if (!ASSERT_OK_PTR(threads, "malloc"))