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 23F71EB64D8 for ; Wed, 14 Jun 2023 01:06:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241778AbjFNBG2 (ORCPT ); Tue, 13 Jun 2023 21:06:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbjFNBGW (ORCPT ); Tue, 13 Jun 2023 21:06:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C60631BE6; Tue, 13 Jun 2023 18:06:21 -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 4A2DE63B33; Wed, 14 Jun 2023 01:06:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53689C433C8; Wed, 14 Jun 2023 01:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686704779; bh=zhzrb0iO79rDeIfYMKbVMQbH6N3JHQjoiaodw6Vb1dk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tk0vDIyUq8DYbvefjPGnzL/vixx3I3lXSr/jlDWyHKinlSwtOpv9bxqlre5f7wcBc VNOdL7MNDfuZ1JkfIMJAew3azxsgzC2jCNNsrq/rz6lhCU5yiiV7jJkVO1ZUxP1lpV 9g+7quniO4i3EMkNdZt5IyxiIJZE67J+Dl7vUtgAYaxy420f3BV4VX0+Rkc+rszY/K nX3fodwN6JSlr0YJ2sLzTD56OcU94deo2faNqO8vruvwoD8fKBULTAxdMWwB69f+bh H/gLXT65s+oKAhQxENeSsHgt3N87WPavnkqfu7w1wSupqEdIHncwgvqgTZoODVEGCE ekkgUgEpnr6Zw== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id 723DD40692; Tue, 13 Jun 2023 22:06:15 -0300 (-03) Date: Tue, 13 Jun 2023 22:06:15 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Ravi Bangoria , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1] perf tool x86: Fix perf_env memory leak Message-ID: References: <20230613235416.1650755-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230613235416.1650755-1-irogers@google.com> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Tue, Jun 13, 2023 at 04:54:16PM -0700, Ian Rogers escreveu: > Found by leak sanitizer: > ``` > ==1632594==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 21 byte(s) in 1 object(s) allocated from: > #0 0x7f2953a7077b in __interceptor_strdup ../../../../src/libsanitizer/asan/asan_interceptors.cpp:439 > #1 0x556701d6fbbf in perf_env__read_cpuid util/env.c:369 > #2 0x556701d70589 in perf_env__cpuid util/env.c:465 > #3 0x55670204bba2 in x86__is_amd_cpu arch/x86/util/env.c:14 > #4 0x5567020487a2 in arch__post_evsel_config arch/x86/util/evsel.c:83 > #5 0x556701d8f78b in evsel__config util/evsel.c:1366 > #6 0x556701ef5872 in evlist__config util/record.c:108 > #7 0x556701cd6bcd in test__PERF_RECORD tests/perf-record.c:112 > #8 0x556701cacd07 in run_test tests/builtin-test.c:236 > #9 0x556701cacfac in test_and_print tests/builtin-test.c:265 > #10 0x556701cadddb in __cmd_test tests/builtin-test.c:402 > #11 0x556701caf2aa in cmd_test tests/builtin-test.c:559 > #12 0x556701d3b557 in run_builtin tools/perf/perf.c:323 > #13 0x556701d3bac8 in handle_internal_command tools/perf/perf.c:377 > #14 0x556701d3be90 in run_argv tools/perf/perf.c:421 > #15 0x556701d3c3f8 in main tools/perf/perf.c:537 > #16 0x7f2952a46189 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 > > SUMMARY: AddressSanitizer: 21 byte(s) leaked in 1 allocation(s). > ``` > > Fixes: daea405f5f06 ("perf tool x86: Consolidate is_amd check into single function") Its a fix, yes, but it is not for this daea405f5f06 patch, he just moved the perf_mem_is_amd_cpu(), that was leaky, to a different file, the fixes is for for: f7b58cbdb3ff36eb ("perf mem/c2c: Add load store event mappings for AMD"). Right? I'm fixing the fixes tag and applying the patch, thanks. - Arnaldo > Signed-off-by: Ian Rogers > --- > tools/perf/arch/x86/util/env.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/arch/x86/util/env.c b/tools/perf/arch/x86/util/env.c > index 33b87f8ac1cc..3e537ffb1353 100644 > --- a/tools/perf/arch/x86/util/env.c > +++ b/tools/perf/arch/x86/util/env.c > @@ -13,7 +13,7 @@ bool x86__is_amd_cpu(void) > > perf_env__cpuid(&env); > is_amd = env.cpuid && strstarts(env.cpuid, "AuthenticAMD") ? 1 : -1; > - > + perf_env__exit(&env); > ret: > return is_amd >= 1 ? true : false; > } > -- > 2.41.0.162.gfafddb0af9-goog > -- - Arnaldo