Message ID | 20211208024607.1784932-23-irogers@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91593C433F5 for <linux-arm-kernel@archiver.kernel.org>; Wed, 8 Dec 2021 03:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/bTB2u5cCsLUCzy1uR2SUk+8Jxdeb/b/ttRYLE+mL2o=; b=nZte+S2F3RCUUhWmVeIVyypqO6 YQXOicYBKe3Dbc9rxo3G2ipcNLUc41r/wxZ6a6PgnYdNgGTns99wiPnTPcBZh61sjRlYn7Q14k5UD 0sv+oZSLRNF+D4N491S5cYgTma2Dmkbil8S25G6V4tlm1OZJXD0QANSY5FaYppJQ16QLMFqupQGK1 bZ8/uiIU5oSkFO9fN3k+TSejPjIsSPxqhqnY5DdaZX+Bx0SIh5V0kWO6kbbQiFnJOikM6ZyczwgsF MgVbYDn+UAKFHR1wOexGzKKP5FUh+cWDNXxFXvGo0sIqzIFNoFXLjHtNXMg3mIt0nb2u0tdzsD/b3 1JEo1okA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1munGC-00Aqd3-P9; Wed, 08 Dec 2021 03:04:51 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mumz4-00Ajb8-SV for linux-arm-kernel@lists.infradead.org; Wed, 08 Dec 2021 02:47:08 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id t24-20020a252d18000000b005c225ae9e16so2060919ybt.15 for <linux-arm-kernel@lists.infradead.org>; Tue, 07 Dec 2021 18:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=NkX3KvDSHRuiAq+LRg9aiI3XOvvC67NwXsfw+Gc/9l4=; b=VBMi5n0xn14QikZgO1V2df5AmaIlpCWXK5U6dqgZQ+lhdKffn6J4Sj5e21OR8ZY0ix QFixu8Hy0X/O8ZQBfBADSfLPJyMOGYy4306E3nA5C9zu+KALzWHHK42XD29Imq04W/Ac sWPTVB/DKbXtsRQUEOn0iY1Wr/9EQ1g2tugTwxryT9jvhiulbQafyGOqpJIXpbq49v+L cS2h0zy9vhuDo8qwFodW6LaU0ZtaI7EZs62tpjXxE9itf6GWhdE5Hy5NTPAMGnWUfsWm hIRvqLxW0gKw8VECXCMMyE4TAnTNNYvh5wP+OI7Oie7x8/Pjju/YR/5oiCrLUvVv68Ci 7Q6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=NkX3KvDSHRuiAq+LRg9aiI3XOvvC67NwXsfw+Gc/9l4=; b=U9ZdcIBp4/ct3AnDlcxi7sGT0f3+tIzRDyZkBkGkjXee26XpMEYB5xm0OZEu36xsW6 7fU813n7KBhQSF4jkPDt5J6iHbAbNWQE8xoBfG6rAfUOdMIuCSrRsVijQnxxSA8VfzGZ PJA33JBjtaGu960eLqwp9mdH8QDjzOGigT/r8zgFxu7Ud1vFEkEtX0xP5eaY47W+px7G 1ZaIolKr4CYFIJ860RH3gwdh+TGJVfuYdu0qVu9rRU3p/XGM7F1r7S5qU7YR30TY7/PY 4a67daQZUnvhmq/I5Xhj7sqO9L9icIdCLrBMytmsVQeyKDFDtxSVPtE4HdMZJiho2RZ6 ueAA== X-Gm-Message-State: AOAM530XWOjmg7Y1GY+AnJ72C4YKdG8KOwf39v+GGLhadjSdAEpYz+r5 3GpDOFxzYRGMUpNGRpwd8ETFh4lPyL7l X-Google-Smtp-Source: ABdhPJyoGRMQihsAu/draf45ckQVcDZHcW0RnmZO7HeS2qA9TqQPXK7+X1r6RHgehf0o7BYpInuzrMLTox9D X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:57e:1dbb:34b4:8257]) (user=irogers job=sendgmr) by 2002:a25:ad27:: with SMTP id y39mr55896029ybi.494.1638931625357; Tue, 07 Dec 2021 18:47:05 -0800 (PST) Date: Tue, 7 Dec 2021 18:46:07 -0800 In-Reply-To: <20211208024607.1784932-1-irogers@google.com> Message-Id: <20211208024607.1784932-23-irogers@google.com> Mime-Version: 1.0 References: <20211208024607.1784932-1-irogers@google.com> X-Mailer: git-send-email 2.34.1.400.ga245620fadb-goog Subject: [PATCH 22/22] perf stat: Fix memory leak in check_per_pkg From: Ian Rogers <irogers@google.com> To: Andi Kleen <ak@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, John Garry <john.garry@huawei.com>, Kajol Jain <kjain@linux.ibm.com>, "Paul A . Clarke" <pc@us.ibm.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Riccardo Mancini <rickyman7@gmail.com>, Kan Liang <kan.liang@linux.intel.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Vineet Singh <vineet.singh@intel.com>, James Clark <james.clark@arm.com>, Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, Mike Leach <mike.leach@linaro.org>, Leo Yan <leo.yan@linaro.org>, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org Cc: eranian@google.com, Ian Rogers <irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_184706_961792_F5797F16 X-CRM114-Status: GOOD ( 12.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
Refactor perf cpumap
|
expand
|
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 5c24aca0968c..c69b221f5e3e 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -345,9 +345,10 @@ static int check_per_pkg(struct evsel *counter, return -ENOMEM; *key = (uint64_t)d << 32 | s; - if (hashmap__find(mask, (void *)key, NULL)) + if (hashmap__find(mask, (void *)key, NULL)) { *skip = true; - else + free(key); + } else ret = hashmap__add(mask, (void *)key, (void *)1); return ret;
If the key is already present then free the key used for lookup. Found with: $ perf stat -M IO_Read_BW /bin/true ==1749112==ERROR: LeakSanitizer: detected memory leaks Direct leak of 32 byte(s) in 4 object(s) allocated from: #0 0x7f6f6fa7d7cf in __interceptor_malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:145 #1 0x55acecd9d7a6 in check_per_pkg util/stat.c:343 #2 0x55acecd9d9c5 in process_counter_values util/stat.c:365 #3 0x55acecd9e0ab in process_counter_maps util/stat.c:421 #4 0x55acecd9e292 in perf_stat_process_counter util/stat.c:443 #5 0x55aceca8553e in read_counters ./tools/perf/builtin-stat.c:470 #6 0x55aceca88fe3 in __run_perf_stat ./tools/perf/builtin-stat.c:1023 #7 0x55aceca89146 in run_perf_stat ./tools/perf/builtin-stat.c:1048 #8 0x55aceca90858 in cmd_stat ./tools/perf/builtin-stat.c:2555 #9 0x55acecc05fa5 in run_builtin ./tools/perf/perf.c:313 #10 0x55acecc064fe in handle_internal_command ./tools/perf/perf.c:365 #11 0x55acecc068bb in run_argv ./tools/perf/perf.c:409 #12 0x55acecc070aa in main ./tools/perf/perf.c:539 Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/util/stat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)