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 45201C433F5 for ; Mon, 13 Dec 2021 13:13:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237256AbhLMNNt (ORCPT ); Mon, 13 Dec 2021 08:13:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232266AbhLMNNs (ORCPT ); Mon, 13 Dec 2021 08:13:48 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D63CC061574 for ; Mon, 13 Dec 2021 05:13:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 5A930CE1020 for ; Mon, 13 Dec 2021 13:13:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69352C34601; Mon, 13 Dec 2021 13:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1639401224; bh=+H14nh2/sZ0LVCVrXezcSj2QeyM904bTsAn6bMsPTig=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sb0dpr6TwSBZACfF6GkoHi3NqvetedwQqwpymVw11z35Kbo+1p2VXZWApQACXQx7e bSCcOo7/ZEFmOu5nSTb4g5D7hggkaMlRZG9pjF+GvRqWYXAVCLFeMpWxeDr9cAx0Gr DBEhLPr2dcQiZuDcYNuZCcMSivgJut/WpnRGVAM1WWelDMI53khcw87qz6Yf8TGmYW ZrJMuNLI49w1oqhtLhrv+sx41KeNS3fF761/uROQqa+TkYz7ZIdQ9Yyu+bTwgyBMyn RzBWyoyqz/gwrpz2Dnv7UzkycKUYUCSHNQaWtT8/dR5ZBdHYA5W8eEXaXWdWWzTBW+ tk06VB/II0RWg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id E17C2405D8; Mon, 13 Dec 2021 10:13:42 -0300 (-03) Date: Mon, 13 Dec 2021 10:13:42 -0300 From: Arnaldo Carvalho de Melo To: Adrian Hunter Cc: Jiri Olsa , linux-kernel@vger.kernel.org, Riccardo Mancini , Namhyung Kim Subject: Re: [PATCH 2/2] perf inject: Fix segfault due to perf_data__fd() without open Message-ID: References: <20211213084829.114772-1-adrian.hunter@intel.com> <20211213084829.114772-3-adrian.hunter@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211213084829.114772-3-adrian.hunter@intel.com> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Dec 13, 2021 at 10:48:29AM +0200, Adrian Hunter escreveu: > The fixed commit attempts to get the output file descriptor even if the > file was never opened e.g. > > $ perf record uname > Linux > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.002 MB perf.data (7 samples) ] > $ perf inject -i perf.data --vm-time-correlation=dry-run > Segmentation fault (core dumped) > $ gdb --quiet perf > Reading symbols from perf... > (gdb) r inject -i perf.data --vm-time-correlation=dry-run > Starting program: /home/ahunter/bin/perf inject -i perf.data --vm-time-correlation=dry-run > [Thread debugging using libthread_db enabled] > Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". > > Program received signal SIGSEGV, Segmentation fault. > __GI___fileno (fp=0x0) at fileno.c:35 > 35 fileno.c: No such file or directory. > (gdb) bt > #0 __GI___fileno (fp=0x0) at fileno.c:35 > #1 0x00005621e48dd987 in perf_data__fd (data=0x7fff4c68bd08) at util/data.h:72 > #2 perf_data__fd (data=0x7fff4c68bd08) at util/data.h:69 > #3 cmd_inject (argc=, argv=0x7fff4c69c1f0) at builtin-inject.c:1017 > #4 0x00005621e4936783 in run_builtin (p=0x5621e4ee6878 , argc=4, argv=0x7fff4c69c1f0) at perf.c:313 > #5 0x00005621e4897d5c in handle_internal_command (argv=, argc=) at perf.c:365 > #6 run_argv (argcp=, argv=) at perf.c:409 > #7 main (argc=4, argv=0x7fff4c69c1f0) at perf.c:539 > (gdb) Thanks, applied. - Arnaldo > Fixes: 0ae03893623d ("perf tools: Pass a fd to perf_file_header__read_pipe()") > Cc: stable@vger.kernel.org > Signed-off-by: Adrian Hunter > --- > tools/perf/builtin-inject.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c > index af70f1c72052..409b721666cb 100644 > --- a/tools/perf/builtin-inject.c > +++ b/tools/perf/builtin-inject.c > @@ -755,12 +755,16 @@ static int parse_vm_time_correlation(const struct option *opt, const char *str, > return inject->itrace_synth_opts.vm_tm_corr_args ? 0 : -ENOMEM; > } > > +static int output_fd(struct perf_inject *inject) > +{ > + return inject->in_place_update ? -1 : perf_data__fd(&inject->output); > +} > + > static int __cmd_inject(struct perf_inject *inject) > { > int ret = -EINVAL; > struct perf_session *session = inject->session; > - struct perf_data *data_out = &inject->output; > - int fd = inject->in_place_update ? -1 : perf_data__fd(data_out); > + int fd = output_fd(inject); > u64 output_data_offset; > > signal(SIGINT, sig_handler); > @@ -1015,7 +1019,7 @@ int cmd_inject(int argc, const char **argv) > } > > inject.session = __perf_session__new(&data, repipe, > - perf_data__fd(&inject.output), > + output_fd(&inject), > &inject.tool); > if (IS_ERR(inject.session)) { > ret = PTR_ERR(inject.session); > -- > 2.25.1 -- - Arnaldo