From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B95FE296166 for ; Tue, 17 Jun 2025 22:34:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750199662; cv=none; b=Bxv7n3etxNeeKAFmoYY4GtrnHdZmjpVs9lieRk6FD9GjgbEFwf+vPk2CAkFcqfL4kReHMIwvkMNdamYZp7F7T3acFAjfArUHMAa58IT0GGXDXEoKWNUmjrjq4GZnUKiTe4SwNzJUF4fHlMqO8mPserQ50IfjxMeq5lELhSNVUyQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750199662; c=relaxed/simple; bh=DKWqAmVnI3GhwlYZzhOitEiQvCeNAsT71ZBhSUmrLho=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=ss5Axxh4BSSjqLkbE4025dsVIf7F/cq5HOBtVK4FVVo2VVFy8D6eVXcwt/eJNsvsvhI44913rFS9sHe5uzaJR8MA7Ep6IOxlNX5d5Ain9el86ExZSGfLErqcQn3jysrjO+Wahrh/LfVET8WtsOeKaC2tEz6or/+3gDFPeHCjeOM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gscKJxkT; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gscKJxkT" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-235842baba4so51324105ad.3 for ; Tue, 17 Jun 2025 15:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1750199660; x=1750804460; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=7NVdRomOVcTP2K2Aa3QZ6be5ElrMwK+HxvBHDmuw/Uo=; b=gscKJxkTOqo+J9APwZV2yDVLnYOlJoZgGIXVAKFRdrZkKittyA+KS7Kav+iSTPYDoy WNYCekVW9nFNvkN5fmAWnSSy3YBgSw1cA0FbYAjr5Ol2t1akeTaaDuHL/m4g1N8SyIF+ qkkVUTS60LlEixihFvwNDMyAn1gALMC47lDrfVvA6V3cTq1OvrAu6ZSyiThysqBiaHv1 Gg41RChBX4A38k4ll18HbaYMsuZK1yfJlcTkBpbPAiCCrXnLNSh74spiGP4yVj/vP5EZ 0gpxW+IBAsv/8Ja0wZyw4fyFn3F7tzOlh/V5EMpXTT50/HumzoQ9wAJtjMUxTFokTgzD W0FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750199660; x=1750804460; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7NVdRomOVcTP2K2Aa3QZ6be5ElrMwK+HxvBHDmuw/Uo=; b=D7oKcOnc04Ixa0fGXNnIzwpiMRli/a24r7ZwUPPrlhK7vO6IdgN8+cbJ7r+hvIUDzI bNcKCCYOmUfUw7emODiBGyAJ8wTCQkEV03JLCGTNxKBxfB+OFE0Kd0CBuzlLQ0/PC+1f 0/SdVJnSJl9tX+y3brA85xkfs10oohK5/fpubg2kUncU1BO7hNCTPwzHsGnwN8RSxNsi Iykarh5uL19ni4WuUh0jIElzv9Qlrc6z9SYNLfd2VPYbhWN8/iT+OExfiP+JkZVqFFyU otUeF/jSKbcvZjX1Q65SmoaIVmpkUNMuAYxrm2rJwOGlTgs3Hxb+HUo0T/1i0g+Tlbj+ CGOw== X-Forwarded-Encrypted: i=1; AJvYcCXTKDEOXThRo/wwIlcbkQzePAs5Cd3PADsJHFiWqh6BNn7xrcMsibcDDAAdM/eqgMAWYSDGQjthPIp2idg=@vger.kernel.org X-Gm-Message-State: AOJu0YzKOLiOb0FEnLFFOxvqALupEvwgYyp1u8Bew2LJ36Tby77JtMgP 3YeWv4ENVlhj8ME0jqc/lxKKmckn4qgzaaTB/yLbuw1n0WQj0pG15H1bqygLwUKJe1gwpFa6bZs AyWcs8rcuqA== X-Google-Smtp-Source: AGHT+IE8zs/nB6Hv+1AZHqCM7YWmAHfa0nQQJL++2TtoGouKHvd/x1WiGB2F9Nz1dWP5IiUzlZNkHFCgj5im X-Received: from plxd13.prod.google.com ([2002:a17:902:ef0d:b0:234:b2bd:b68f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ebc1:b0:235:f45f:ed49 with SMTP id d9443c01a7336-2366b12216fmr215565525ad.33.1750199660075; Tue, 17 Jun 2025 15:34:20 -0700 (PDT) Date: Tue, 17 Jun 2025 15:33:56 -0700 In-Reply-To: <20250617223356.2752099-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250617223356.2752099-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.rc2.761.g2dc52ea45b-goog Message-ID: <20250617223356.2752099-4-irogers@google.com> Subject: [PATCH v2 4/4] libperf evsel: In exit add missed puts and assert close, etc. were called From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Michael Petlan , Jiapeng Chong , Andi Kleen , Tiezhu Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" A missed evsel__close before evsel__delete was the source of leaking perf events due to a hybrid test. Add asserts in debug builds so that this shouldn't happen in the future. Add puts missing on the cpu map and thread maps. Signed-off-by: Ian Rogers --- tools/lib/perf/evsel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/lib/perf/evsel.c b/tools/lib/perf/evsel.c index c475319e2e41..2a85e0bfee1e 100644 --- a/tools/lib/perf/evsel.c +++ b/tools/lib/perf/evsel.c @@ -42,6 +42,12 @@ struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr) void perf_evsel__delete(struct perf_evsel *evsel) { + assert(evsel->fd == NULL); /* If not fds were not closed. */ + assert(evsel->mmap == NULL); /* If not munmap wasn't called. */ + assert(evsel->sample_id == NULL); /* If not free_id wasn't called. */ + perf_cpu_map__put(evsel->cpus); + perf_cpu_map__put(evsel->own_cpus); + perf_thread_map__put(evsel->threads); free(evsel); } -- 2.50.0.rc2.761.g2dc52ea45b-goog