From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98D37C7EE2F for ; Sun, 11 Jun 2023 23:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232495AbjFKXgp (ORCPT ); Sun, 11 Jun 2023 19:36:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232310AbjFKXgh (ORCPT ); Sun, 11 Jun 2023 19:36:37 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC87818B for ; Sun, 11 Jun 2023 16:36:36 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-5488dccfbdfso2593867a12.2 for ; Sun, 11 Jun 2023 16:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686526596; x=1689118596; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=YQ7dtGpCj1vKIn1MUVA2v5/9SJwzoX7naJdqhcByVkI=; b=jEgUrY4kEVtjeziBJfMRsOXP9p7miFhh0NqERxOwbhzWWQtmli2+Hoz3jquLp8JodJ bjH0SyVOzgVCwKLF9AcxmeSv6is1ooUjnBiEOtfljkArEtLAVN8mfwT/pmDuIpS9BTkN gG2rf9C9wBqDXFnvBCRsJ+ASYPVS9OlrGpD7QjxsU7+9K7X+jO+ssbnkYaW1Nx+zIF6r OrpEH6kU3nU869sU0aW8YV639FwcCUQ4dBboXcdZOF3r4c7nw5XcItOO42+DTQky2t4s NUtyFbzqCnKqImWu01nE1M7/uTPbS1CIseccSnQG4WNC3xBFO06D49MpbzR0nH51+sKA j9tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686526596; x=1689118596; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YQ7dtGpCj1vKIn1MUVA2v5/9SJwzoX7naJdqhcByVkI=; b=X2hoyH6w4Vk/NAgGbto3FAnwzL4TZ/SKPjJhwQ7WcxU4mBWAKHlElYsaNSzU6tyL26 55H1UC7OPGSM4ZbI61a98MjdeyEBirh2GxENnXRtc4rT5xcwEooVKN9ydZQIMMYBzESP HoDHEPArweOVbTw8jkmNqcVpJe5VECQdciD4YIbNNEECjePtvvHqk59Z+C+/0Hzs7k+k fw8ppdIgqxi9+6V+Gq7EgM+s+erFUlS0QfRkiuArFiFKFXlXpB1vtmzDmwBlhOIvkOph njw+nSWgX7l8RdkuWUt8b3f6SUUf1CFo/S7Dt1RbJ7r3KkSXg8HZvOfa+pjFNXkUpc7h BPLg== X-Gm-Message-State: AC+VfDyt1Ldff/LDzX16WGTgm9kXA5WNuzkYIF2DYPNQ9SVgR1W/CPpY K2yOAZoSjjW6CAGLGJ+LoNF61tm9h5hH X-Google-Smtp-Source: ACHHUZ6sqXaQ+/hnbbQI/i5tF0I9L3nbpl7Um13O7xwaQeTAtPD515Sa3VFg2BACuxwpvKkZUMy9LwqPp8sw X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:aca9:d7c7:ed17:e760]) (user=irogers job=sendgmr) by 2002:a63:db02:0:b0:53f:6f7c:554e with SMTP id e2-20020a63db02000000b0053f6f7c554emr1022251pgg.12.1686526596403; Sun, 11 Jun 2023 16:36:36 -0700 (PDT) Date: Sun, 11 Jun 2023 16:36:08 -0700 In-Reply-To: <20230611233610.953456-1-irogers@google.com> Message-Id: <20230611233610.953456-3-irogers@google.com> Mime-Version: 1.0 References: <20230611233610.953456-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog Subject: [PATCH v1 3/5] perf bench epoll: Fix missing frees/puts From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Thomas Gleixner , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Issues detected by leak sanitizer. Signed-off-by: Ian Rogers --- tools/perf/bench/epoll-ctl.c | 5 +++++ tools/perf/bench/epoll-wait.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/tools/perf/bench/epoll-ctl.c b/tools/perf/bench/epoll-ctl.c index 521d1ff97b06..6bfffe83dde9 100644 --- a/tools/perf/bench/epoll-ctl.c +++ b/tools/perf/bench/epoll-ctl.c @@ -421,6 +421,11 @@ int bench_epoll_ctl(int argc, const char **argv) print_summary(); close(epollfd); + perf_cpu_map__put(cpu); + for (i = 0; i < nthreads; i++) + free(worker[i].fdmap); + + free(worker); return ret; errmem: err(EXIT_FAILURE, "calloc"); diff --git a/tools/perf/bench/epoll-wait.c b/tools/perf/bench/epoll-wait.c index c1cdf03c075d..cb5174b53940 100644 --- a/tools/perf/bench/epoll-wait.c +++ b/tools/perf/bench/epoll-wait.c @@ -549,6 +549,11 @@ int bench_epoll_wait(int argc, const char **argv) print_summary(); close(epollfd); + perf_cpu_map__put(cpu); + for (i = 0; i < nthreads; i++) + free(worker[i].fdmap); + + free(worker); return ret; errmem: err(EXIT_FAILURE, "calloc"); -- 2.41.0.162.gfafddb0af9-goog