From patchwork Wed Jul 19 20:29:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 122817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2694821vqt; Wed, 19 Jul 2023 13:38:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlEmMJwislRAz7zHBAA7CENW6/fiTYGmsjQBacYoZbh9qx4qsserptLvEbu6Q2lwbjKmnBtY X-Received: by 2002:a17:906:76d5:b0:992:a618:c3c4 with SMTP id q21-20020a17090676d500b00992a618c3c4mr3732868ejn.66.1689799119538; Wed, 19 Jul 2023 13:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689799119; cv=none; d=google.com; s=arc-20160816; b=G+QHU8a8mAPGUPAREip2zMLWTPLC9LzmPk6Q9lMnaO/kaJWprT1wSXHWR3qgyLV1iZ Ju7lAWK7Uzfl97H56Hn3oAeK+PZ2bII/K8efkyaRtiaoq2hS6nfpa9C2q7gHh20L/jrI GxSNhkGGTCUk64Yeh8DgmtHlmrvUWlegJBgjDwl0ekd9bKfN9+Da2RRbvpgB4aHMKat/ snk3GPn5411df2PEUzX6MwRzvYYkXDyHVkraZDt9nNXQ8jTMn/BY6Hv5Mjow9USxz97t sgX6N9wOZ0UbNf68cbTsbJsaXJwT3EkPO4tqNbM+oAjZxHzkR6LV4331++Pkp31WT87Z a+sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=el7ECXdGcA5zXIx7KndHyPeorbVHDthOSGMTxMChfXk=; fh=GZ4eSIeu5yUrjQDUyFDhKHpL6itJkKQ8QAaBkaJW/mM=; b=JE9+e7wZdPSWt7+qhwcF6Nz3Dz7+yj4twnpcir/4WmefJAMz6p7vdcCNgCel+B2MnK npxn5o++5Xw1c4ox2oBFajbc9fskx/rWBhSv+QvOzMo+jZsDAJvl/PdGzv9wbE2RxevM B0R13FKYfr9ajXgvWUoCCfJN3sjud+ni/KVhhhH2fmUixwW5UT+66aKmwnLkC1BoLLVB wpP1/6wcY1ouRKxNv5hvwm9LGBmnLDwwygF7EAjzTlOVoz/0ko2yvmGf6cS6uuoL6XNC a/yXYeOUP27fPx2AppLN0qw8jibOximuZveuziIL2oYx2HLcLaINZoEyo5ZTV+9OO9z4 9i/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pOpuhOAI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gy21-20020a170906f25500b009903666fcd0si3121640ejb.384.2023.07.19.13.38.15; Wed, 19 Jul 2023 13:38:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pOpuhOAI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229926AbjGSUb6 (ORCPT + 99 others); Wed, 19 Jul 2023 16:31:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230500AbjGSUbw (ORCPT ); Wed, 19 Jul 2023 16:31:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26F531FFE; Wed, 19 Jul 2023 13:31:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 414716182C; Wed, 19 Jul 2023 20:30:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29EE3C433C9; Wed, 19 Jul 2023 20:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689798614; bh=Na90jgwrhK74RAguQcWtc6XkFOL8jLuOvNfJ2Q5L1OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pOpuhOAIG0e+iG62LTVp/tOhm8LzD0rRM3ibmk6yVo2hwFY4DhRRdPheSDbNtDfLM Bujg66J+7JICkSoBp8HPkMxK8Oz9qAIFFYgSA48TfTO622vnYlLwyj94nmtCQjaERL Ki6o1XPdvRhWJuJQU8gNFU0gqxGmVDi3SzDaz3L/MQaIMtVkdSZEDayVa9x6f6OI5P F42+Gsb7vi1AnoIObXd2JQ3OR/PYcLPk+k8Tza/Q2VAXpxFNEYZWUwKP32kqJJrqe/ BygHJnfOXWU0sQOHnWoByHfFO0TcbocwzUBIZVgP0CDKQ+1Eu7ro2EbL12/yP7SYXU QLyVqMMsrD/tw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , Kate Carcia , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 5/6] perf trace: Free thread_trace->files table Date: Wed, 19 Jul 2023 17:29:50 -0300 Message-ID: <20230719202951.534582-6-acme@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719202951.534582-1-acme@kernel.org> References: <20230719202951.534582-1-acme@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771882801727665275 X-GMAIL-MSGID: 1771882801727665275 From: Arnaldo Carvalho de Melo The fd->pathname table that is kept in 'struct thread_trace' and thus in thread->priv must be freed when a thread is deleted. This was also detected using -fsanitize=address. Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 56651d666480cc16..7ece2521efb69182 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1296,6 +1296,8 @@ static struct thread_trace *thread_trace__new(void) return ttrace; } +static void thread_trace__free_files(struct thread_trace *ttrace); + static void thread_trace__delete(void *pttrace) { struct thread_trace *ttrace = pttrace; @@ -1305,6 +1307,7 @@ static void thread_trace__delete(void *pttrace) intlist__delete(ttrace->syscall_stats); ttrace->syscall_stats = NULL; + thread_trace__free_files(ttrace); zfree(&ttrace->entry_str); free(ttrace); } @@ -1346,6 +1349,17 @@ void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg, static const size_t trace__entry_str_size = 2048; +static void thread_trace__free_files(struct thread_trace *ttrace) +{ + for (int i = 0; i < ttrace->files.max; ++i) { + struct file *file = ttrace->files.table + i; + zfree(&file->pathname); + } + + zfree(&ttrace->files.table); + ttrace->files.max = -1; +} + static struct file *thread_trace__files_entry(struct thread_trace *ttrace, int fd) { if (fd < 0)