tsan: fix leak of ThreadSignalContext memory mapping when destroying fibers

When creating and destroying fibers in tsan a thread state is created and destroyed. Currently, a memory mapping is leaked with each fiber (in __tsan_destroy_fiber). This causes applications with many short running fibers to crash or hang because of linux vm.max_map_count.

The root of this is that ThreadState holds a pointer to ThreadSignalContext for handling signals. The initialization and destruction of it is tied to platform specific events in tsan_interceptors_posix and missed when destroying a fiber (specifically, SigCtx is used to lazily create the ThreadSignalContext in tsan_interceptors_posix). This patch cleans up the memory by makinh the ThreadState create and destroy the ThreadSignalContext.

The relevant code causing the leak with fibers is the fiber destruction:

void FiberDestroy(ThreadState *thr, uptr pc, ThreadState *fiber) {
  FiberSwitchImpl(thr, fiber);
  ThreadFinish(fiber);
  FiberSwitchImpl(fiber, thr);
  internal_free(fiber);
}

Author: Florian
Reviewed-in: https://reviews.llvm.org/D76073
This commit is contained in:
Dmitry Vyukov 2020-04-11 09:52:13 +02:00
parent efeb35e195
commit 1624be938d
4 changed files with 80 additions and 2 deletions

View File

@ -891,13 +891,16 @@ void DestroyThreadState() {
ThreadFinish(thr);
ProcUnwire(proc, thr);
ProcDestroy(proc);
DTLS_Destroy();
cur_thread_finalize();
}
void PlatformCleanUpThreadState(ThreadState *thr) {
ThreadSignalContext *sctx = thr->signal_ctx;
if (sctx) {
thr->signal_ctx = 0;
UnmapOrDie(sctx, sizeof(*sctx));
}
DTLS_Destroy();
cur_thread_finalize();
}
} // namespace __tsan

View File

@ -1021,6 +1021,7 @@ int call_pthread_cancel_with_cleanup(int(*fn)(void *c, void *m,
void(*cleanup)(void *arg), void *arg);
void DestroyThreadState();
void PlatformCleanUpThreadState(ThreadState *thr);
} // namespace __tsan

View File

@ -144,6 +144,9 @@ void ThreadContext::OnFinished() {
thr->clock.ResetCached(&thr->proc()->clock_cache);
#if !SANITIZER_GO
thr->last_sleep_clock.ResetCached(&thr->proc()->clock_cache);
#endif
#if !SANITIZER_GO
PlatformCleanUpThreadState(thr);
#endif
thr->~ThreadState();
#if TSAN_COLLECT_STATS

View File

@ -0,0 +1,71 @@
// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
// REQUIRES: linux
#include "test.h"
#include <pthread.h>
#include <sys/types.h>
#include <unistd.h>
long count_memory_mappings() {
pid_t my_pid = getpid();
char proc_file_name[128];
snprintf(proc_file_name, sizeof(proc_file_name), "/proc/%ld/maps", my_pid);
FILE *proc_file = fopen(proc_file_name, "r");
long line_count = 0;
char c;
do {
c = fgetc(proc_file);
if (c == '\n') {
line_count++;
}
} while (c != EOF);
fclose(proc_file);
return line_count;
}
void fiber_iteration() {
void *orig_fiber = __tsan_get_current_fiber();
void *fiber = __tsan_create_fiber(0);
pthread_mutex_t mutex;
pthread_mutex_init(&mutex, NULL);
// Running some code on the fiber that triggers handling of pending signals.
__tsan_switch_to_fiber(fiber, 0);
pthread_mutex_lock(&mutex);
pthread_mutex_unlock(&mutex);
__tsan_switch_to_fiber(orig_fiber, 0);
// We expect the fiber to clean up all resources (here the sigcontext) when destroyed.
__tsan_destroy_fiber(fiber);
}
// Magic-Number for some warmup iterations,
// as tsan maps some memory for the first runs.
const size_t num_warmup = 100;
int main() {
for (size_t i = 0; i < num_warmup; i++) {
fiber_iteration();
}
long memory_mappings_before = count_memory_mappings();
fiber_iteration();
fiber_iteration();
long memory_mappings_after = count_memory_mappings();
// Is there a better way to detect a resource leak in the
// ThreadState object? (i.e. a mmap not being freed)
if (memory_mappings_before == memory_mappings_after) {
fprintf(stderr, "PASS\n");
} else {
fprintf(stderr, "FAILED\n");
}
return 0;
}
// CHECK-NOT: WARNING: ThreadSanitizer:
// CHECK: PASS