Skip to contentSkip to conversation

perf record: Do not fail with an exiting thread

PATCH Applied Namhyung Kim 3 participants 4 messages Nov 11 – Nov 12 perf events

lore
Share & tools
lore

Namhyung Kim

author maintainer
#0 lore raw

PATCH 1/1 perf record: Do not fail with an exiting thread

When a thread in the target process exits during the synthesize, it can fail due to the missing /proc entry. So __perf_event__synthesize_ thread() ignores the return value of __event__synthesize_thread().

Do the same in the perf_event__synthesize_thread_map() too.

---
 tools/perf/util/synthetic-events.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)
tools/perf/util/synthetic-events.c +16 -10
index b9dbd105cdc37f38..3c8d29f27fd91a2c 100644
@@ -991,6 +991,7 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
 	union perf_event *comm_event, *mmap_event, *fork_event;
 	union perf_event *namespaces_event;
 	int err = -1, thread, j;
+	int synthesized = 0;
 
 	comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
 	if (comm_event == NULL)
@@ -1010,16 +1011,19 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
 	if (namespaces_event == NULL)
 		goto out_free_fork;
 
-	err = 0;
 	for (thread = 0; thread < threads->nr; ++thread) {
+		/*
+		 * We may race with exiting thread, so don't stop just because
+		 * one thread couldn't be synthesized.
+		 */
 		if (__event__synthesize_thread(comm_event, mmap_event,
 					       fork_event, namespaces_event,
 					       perf_thread_map__pid(threads, thread), 0,
 					       process, tool, machine,
-					       needs_mmap, mmap_data)) {
-			err = -1;
-			break;
-		}
+					       needs_mmap, mmap_data))
+			continue;
+
+		synthesized++;
 
 		/*
 		 * comm.pid is set to thread group id by
@@ -1037,17 +1041,19 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
 			}
 
 			/* if not, generate events for it */
-			if (need_leader &&
-			    __event__synthesize_thread(comm_event, mmap_event,
+			if (need_leader) {
+				__event__synthesize_thread(comm_event, mmap_event,
 						       fork_event, namespaces_event,
 						       comm_event->comm.pid, 0,
 						       process, tool, machine,
-						       needs_mmap, mmap_data)) {
-				err = -1;
-				break;
+						       needs_mmap, mmap_data);
 			}
 		}
 	}
+
+	if (synthesized)
+		err = 0;
+
 	free(namespaces_event);
 out_free_fork:
 	free(fork_event);
Signature · 1 line
2.56.0.567.gdb80ae8cd5-goog
#1 lore raw
Sashiko has reviewed this patch and found no issues.
Quoted 7 lines

When a thread in the target process exits during the synthesize, it can fail due to the missing /proc entry. So __perf_event__synthesize_ thread() ignores the return value of __event__synthesize_thread().

Do the same in the perf_event__synthesize_thread_map() too.

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Namhyung Kim
Quoted 8 lines · Namhyung Kim

When a thread in the target process exits during the synthesize, it can fail due to the missing /proc entry. So __perf_event__synthesize_ thread() ignores the return value of __event__synthesize_thread().

Do the same in the perf_event__synthesize_thread_map() too.

Thanks,
Ian

Quoted 69 lines
---
 tools/perf/util/synthetic-events.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)
tools/perf/util/synthetic-events.c +16 -11
index b9dbd105cdc37f38..3c8d29f27fd91a2c 100644
@@ -991,6 +991,7 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
        union perf_event *comm_event, *mmap_event, *fork_event;
        union perf_event *namespaces_event;
        int err = -1, thread, j;
+       int synthesized = 0;
 
        comm_event = malloc(sizeof(comm_event->comm) + machine->id_hdr_size);
        if (comm_event == NULL)
@@ -1010,16 +1011,19 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
        if (namespaces_event == NULL)
                goto out_free_fork;
 
-       err = 0;
        for (thread = 0; thread < threads->nr; ++thread) {
+               /*
+                * We may race with exiting thread, so don't stop just because
+                * one thread couldn't be synthesized.
+                */
                if (__event__synthesize_thread(comm_event, mmap_event,
                                               fork_event, namespaces_event,
                                               perf_thread_map__pid(threads, thread), 0,
                                               process, tool, machine,
-                                              needs_mmap, mmap_data)) {
-                       err = -1;
-                       break;
-               }
+                                              needs_mmap, mmap_data))
+                       continue;
+
+               synthesized++;
 
                /*
                 * comm.pid is set to thread group id by
@@ -1037,17 +1041,19 @@ int perf_event__synthesize_thread_map(const struct perf_tool *tool,
                        }
 
                        /* if not, generate events for it */
-                       if (need_leader &&
-                           __event__synthesize_thread(comm_event, mmap_event,
+                       if (need_leader) {
+                               __event__synthesize_thread(comm_event, mmap_event,
                                                       fork_event, namespaces_event,
                                                       comm_event->comm.pid, 0,
                                                       process, tool, machine,
-                                                      needs_mmap, mmap_data)) {
-                               err = -1;
-                               break;
+                                                      needs_mmap, mmap_data);
                        }
                }
        }
+
+       if (synthesized)
+               err = 0;
+
        free(namespaces_event);
 out_free_fork:
        free(fork_event);
--

2.56.0.567.gdb80ae8cd5-goog

author maintainer Applied
#3 lore raw
In reply to Namhyung Kim
Quoted 8 lines · Namhyung Kim

When a thread in the target process exits during the synthesize, it can fail due to the missing /proc entry. So __perf_event__synthesize_ thread() ignores the return value of __event__synthesize_thread().

Do the same in the perf_event__synthesize_thread_map() too.

[...]

Applied to perf-tools-next, thanks!

Best regards
Namhyung