From patchwork Wed Jun 7 01:43:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13269938 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 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 2C8AEC7EE2F for ; Wed, 7 Jun 2023 02:50:44 +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:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wBg8OUeTm3FUUvjIQTrLOMV5VJ/pZ/+cBtLdvZLaN3k=; b=q5kcrxaWldBG7O StBuf1OHTPGOznWx8lwwZHcD7HZ9vPUmd8JhESCrMW3P7w+TPFR4orpZjVqX0jBkFByGWuYc8kFe2 /OWFyrGEmj9tKkyPG0ClRrQ3pl1TXJC161LGkeSJqVW1fdPjK9gvzhaS1kzT/QprWV/+tVQrdJyNO I3M+QYN9xzYmOGLGu/687MNpFicfNHtrRYBrqJpQFNKwvfeB7cCr0JpHMK4UqzsTfBWf5hB1E1s7T pNp93YBUk9Y99RT81bYkL235DTIHX0wsvlRDz3AV8XkGi5AkeBAiY3ovScoQYtlONGLMFZYc8SwpN Db7mjQhzCCluVYTjM95Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6jFf-0043lU-34; Wed, 07 Jun 2023 02:50:23 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6jFd-0043jh-0F for linux-arm-kernel@bombadil.infradead.org; Wed, 07 Jun 2023 02:50:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description; bh=wUbHNYf/MJgzoTRlEaaugzHE4j52eJzTeoSuIJqBVp8=; b=Rl4UCk3wH9wmrTPqvhPWsZWs8u prj0BFv7ITPpa/vM+HGn6k0ph4fKWJ1niyYKueC8IUW68EXXC5Vo/nn47QfN4980vhgSVDAq+2p5J xQfMCCzr22TMQOSNdpWjWfqH8Akoq55fNCSNqNyUmKP7c/EByi6OtqDiXZM2gNp8ZBw95Emo5rEvp 9RoVa60s6eaWZTTRbgcGpS5atq7WpR18z2ahNNHU0kA3O4XELreLkwqxtNGOS3jiU5+Fi3Ir4mCAa bsqphmzAKSo01qmwZU2IpXlSPWTM9n1aI+5FL/C9w4fSaPHl3RLsdTggmOvbfYtN3a/6pxG523Ze4 5k6Hg4gg==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6iE0-004GzT-0b for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2023 01:44:40 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-babb78a3daaso9288472276.1 for ; Tue, 06 Jun 2023 18:44:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686102273; x=1688694273; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=wUbHNYf/MJgzoTRlEaaugzHE4j52eJzTeoSuIJqBVp8=; b=mDxFyn0QLcNsdiAzzx71y7UkQElsKG9LsfMOAKnDObqJJMZu0ZK1j0kIjqs0UOpm9N 0EFbZDkGlJa0hsar61LD7b/fh9s2uVuibl2RJgs0kmUuSFpGvN9ddolHCkyPzUP/Jpv6 Ys+lbFcAiZA6FsmmvDfoQpI1VR7oWaz++fm/4AUUzvQCUWLmIJT+kO5IP4yydQinNFxS mxyTO5kmtqH4FIAIHYNtnC4Y2BeRosZzvfTJSLgdV5leI60GpuCS8sR0f7RerhMVOYwW 0el61bZcUrMJIdRgqLjB0KzhXHNYgvdSqBxvez/VXTp49VZkM+V6gTIQ+vFYQMIfB0Uo a4iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686102273; x=1688694273; 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=wUbHNYf/MJgzoTRlEaaugzHE4j52eJzTeoSuIJqBVp8=; b=iX9Mse/X8yRXgzQlSXNqD60WV8wnhUX2ZYZrQO58+nnrXz9v5EqyVmqRU2OX5j2qSJ gOJeBpDGKhqBOmx9j2B8K/RXajNI12WDPlcRAJsomcHTuXGqNvbfsmN6BWVAaB2XDQMY Qik2aog/5bULj6x/eu8qhk9i53Q+mOu183ejN2UtQOOTTdKr6ycGvGtJtnHu3JhmUV6S dxbA/Eq0+dA3TRfnUS0wNT0AuFy2urN4oPMxVQYJfGBa7mGpsAIBI89HNKiJ7fZ4l0gu xFFbbbyTR3glK63pRnBt+X4+Zy8RAVHKmVFJYDyG6HBWBJnHo+7IZYjvtmqX2PlrayXl 01gQ== X-Gm-Message-State: AC+VfDzrSJIhtGJxA9xZU2+q6bnfve+cFeAjZipb+7rx58Z7nLptaBt8 6ll2TF0f+o/BlWogfBTFlZ8l0AnCWl4k X-Google-Smtp-Source: ACHHUZ5a+CpqfjKkQ7fqBxXnwKGqx/AECiFTCrwlTru0QiARSPI8xTMSovdhp5kwTAoMyL2CPyfnJ3qDtNpY X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:3c35:209f:5d38:b7a1]) (user=irogers job=sendgmr) by 2002:a05:6902:100c:b0:bad:155a:1004 with SMTP id w12-20020a056902100c00b00bad155a1004mr2290237ybt.2.1686102273011; Tue, 06 Jun 2023 18:44:33 -0700 (PDT) Date: Tue, 6 Jun 2023 18:43:43 -0700 In-Reply-To: <20230607014353.3172466-1-irogers@google.com> Message-Id: <20230607014353.3172466-11-irogers@google.com> Mime-Version: 1.0 References: <20230607014353.3172466-1-irogers@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH v1 10/20] perf header: Ensure bitmaps are freed From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Suzuki K Poulose , "Naveen N. Rao" , Kan Liang , German Gomez , Ali Saidi , Jing Zhang , " =?utf-8?q?Martin_Li=C5=A1ka?= " , Athira Rajeev , Miguel Ojeda , ye xingchen , Liam Howlett , Dmitrii Dolgov <9erthalion6@gmail.com>, "Shawn M. Chapla" , Yang Jihong , K Prateek Nayak , Changbin Du , Ravi Bangoria , Sean Christopherson , Raul Silvera , Andi Kleen , "Steinar H. Gunderson" , Yuan Can , Brian Robbins , liuwenyu , Ivan Babrou , Fangrui Song , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, coresight@lists.linaro.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230607_024437_150166_A6B035C6 X-CRM114-Status: GOOD ( 13.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org memory_node bitmaps need a bitmap_free to avoid memory leaks. Caught by leak sanitizer. Signed-off-by: Ian Rogers --- tools/perf/util/header.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index d85b39079c31..3db7c1fae71e 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1389,6 +1389,14 @@ static int memory_node__read(struct memory_node *n, unsigned long idx) return 0; } +static void memory_node__delete_nodes(struct memory_node *nodesp, u64 cnt) +{ + for (u64 i = 0; i < cnt; i++) + bitmap_free(nodesp[i].set); + + free(nodesp); +} + static int memory_node__sort(const void *a, const void *b) { const struct memory_node *na = a; @@ -1449,7 +1457,7 @@ static int build_mem_topology(struct memory_node **nodesp, u64 *cntp) *nodesp = nodes; qsort(nodes, cnt, sizeof(nodes[0]), memory_node__sort); } else - free(nodes); + memory_node__delete_nodes(nodes, cnt); return ret; } @@ -1516,7 +1524,7 @@ static int write_mem_topology(struct feat_fd *ff __maybe_unused, } out: - free(nodes); + memory_node__delete_nodes(nodes, nr); return ret; }