Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp236125ybg; Thu, 17 Oct 2019 22:07:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+67KOhytUF6PqoNYFBRetD/z+Th0CuNf1e9eEM+21LpEMaY99vSDFN13yV8WiveI6Qodc X-Received: by 2002:a50:f395:: with SMTP id g21mr7484748edm.223.1571375260903; Thu, 17 Oct 2019 22:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375260; cv=none; d=google.com; s=arc-20160816; b=0aObjXgP0rUHy++cY6ngknExa3gU7+1+2lkB9r1gcCdHKhd1c2BdDEQWSoGEA60hrY AiIhHURJ2DIK9MJI7r9MFcfoBHDdXyVMkB41C1GWK7xjfpDd9r8r1fmZmSN+aKFh5Sjn CqWXRvQFhDTI8qGxg+T3hZeepIx0iOarq0KVz9h5uvqlPCIsL8Jbr1SK0EDECK3cvAhz C3Bhp2Gt7PbMpLljAxnIT64uSW/88PW7OQDQcQDQrcpJW1igmf3c5oe26m6uWAL00lQv tapSWD249pT2cs08qdueCCXFW3BgFWcED/QGDu39Wja22cYEFoJ5A5kHHl0tHTshcJU0 IdiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X8RNeUqLovNKSQ6GpTDn00bTTBHK3DN8dJwU2B33GJM=; b=Blu/bI6Y+SAN7Txy/O74cghMAKeEbRXf4+fEIjgJ2ubQaolldi29UNCw05/9LtrYj7 JrZQy+SkbLlNTfQTEOiITtoJxd9yMySRxAhIcYHitg7ETKQF1fI2gNzRwQrTDotPPfT5 mi84kbnYXl+eynsdqv4pMPR0QCpTSJSPuBMqvIv36Wf5rrM8Ara0mlSofagvpdJUDveP xBX5OYIkiiq2I+Z4BGkeaeDGanTq6MLU6r39q+/kUgx9VSVfVlzJmZ8MZVN87FAsSpVq mjvFRcrb3mlpDq84A2CeGxmdUKYnXDPjAnregfW7FG0cxk/NAJLvlhBe2OSVlxHyp9B8 6X1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3JzgZsF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i9si2694552ejy.106.2019.10.17.22.07.17; Thu, 17 Oct 2019 22:07:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=c3JzgZsF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394109AbfJPWXJ (ORCPT + 99 others); Wed, 16 Oct 2019 18:23:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394765AbfJPVxC (ORCPT ); Wed, 16 Oct 2019 17:53:02 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6E3CA21925; Wed, 16 Oct 2019 21:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262781; bh=7PZGtIV8pUjbgU6gth72dxv5B0tbvccGyLsGcxsm5ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c3JzgZsFInpcVh6WPupe0oMpTQEf84ffh24vCi5rDq08r0KY4YGC0P+G6P8po7+We z8eKcRJxAdDH9tFDQp10erLv8r7JXZNVM7XcLjasCZlhcyrY8yM/sWaybrPqt5ZRPe dJAzVJCXB0ULkUVTPp1w6nV5dMF00BGhZxRcCAYI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srikar Dronamraju , Jiri Olsa , Arnaldo Carvalho de Melo , Ravi Bangoria , Namhyung Kim , "Naveen N. Rao" , Sasha Levin Subject: [PATCH 4.4 22/79] perf stat: Fix a segmentation fault when using repeat forever Date: Wed, 16 Oct 2019 14:49:57 -0700 Message-Id: <20191016214751.367078730@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srikar Dronamraju [ Upstream commit 443f2d5ba13d65ccfd879460f77941875159d154 ] Observe a segmentation fault when 'perf stat' is asked to repeat forever with the interval option. Without fix: # perf stat -r 0 -I 5000 -e cycles -a sleep 10 # time counts unit events 5.000211692 3,13,89,82,34,157 cycles 10.000380119 1,53,98,52,22,294 cycles 10.040467280 17,16,79,265 cycles Segmentation fault This problem was only observed when we use forever option aka -r 0 and works with limited repeats. Calling print_counter with ts being set to NULL, is not a correct option when interval is set. Hence avoid print_counter(NULL,..) if interval is set. With fix: # perf stat -r 0 -I 5000 -e cycles -a sleep 10 # time counts unit events 5.019866622 3,15,14,43,08,697 cycles 10.039865756 3,15,16,31,95,261 cycles 10.059950628 1,26,05,47,158 cycles 5.009902655 3,14,52,62,33,932 cycles 10.019880228 3,14,52,22,89,154 cycles 10.030543876 66,90,18,333 cycles 5.009848281 3,14,51,98,25,437 cycles 10.029854402 3,15,14,93,04,918 cycles 5.009834177 3,14,51,95,92,316 cycles Committer notes: Did the 'git bisect' to find the cset introducing the problem to add the Fixes tag below, and at that time the problem reproduced as: (gdb) run stat -r0 -I500 sleep 1 Program received signal SIGSEGV, Segmentation fault. print_interval (prefix=prefix@entry=0x7fffffffc8d0 "", ts=ts@entry=0x0) at builtin-stat.c:866 866 sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep); (gdb) bt #0 print_interval (prefix=prefix@entry=0x7fffffffc8d0 "", ts=ts@entry=0x0) at builtin-stat.c:866 #1 0x000000000041860a in print_counters (ts=ts@entry=0x0, argc=argc@entry=2, argv=argv@entry=0x7fffffffd640) at builtin-stat.c:938 #2 0x0000000000419a7f in cmd_stat (argc=2, argv=0x7fffffffd640, prefix=) at builtin-stat.c:1411 #3 0x000000000045c65a in run_builtin (p=p@entry=0x6291b8 , argc=argc@entry=5, argv=argv@entry=0x7fffffffd640) at perf.c:370 #4 0x000000000045c893 in handle_internal_command (argc=5, argv=0x7fffffffd640) at perf.c:429 #5 0x000000000045c8f1 in run_argv (argcp=argcp@entry=0x7fffffffd4ac, argv=argv@entry=0x7fffffffd4a0) at perf.c:473 #6 0x000000000045cac9 in main (argc=, argv=) at perf.c:588 (gdb) Mostly the same as just before this patch: Program received signal SIGSEGV, Segmentation fault. 0x00000000005874a7 in print_interval (config=0xa1f2a0 , evlist=0xbc9b90, prefix=0x7fffffffd1c0 "`", ts=0x0) at util/stat-display.c:964 964 sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, config->csv_sep); (gdb) bt #0 0x00000000005874a7 in print_interval (config=0xa1f2a0 , evlist=0xbc9b90, prefix=0x7fffffffd1c0 "`", ts=0x0) at util/stat-display.c:964 #1 0x0000000000588047 in perf_evlist__print_counters (evlist=0xbc9b90, config=0xa1f2a0 , _target=0xa1f0c0 , ts=0x0, argc=2, argv=0x7fffffffd670) at util/stat-display.c:1172 #2 0x000000000045390f in print_counters (ts=0x0, argc=2, argv=0x7fffffffd670) at builtin-stat.c:656 #3 0x0000000000456bb5 in cmd_stat (argc=2, argv=0x7fffffffd670) at builtin-stat.c:1960 #4 0x00000000004dd2e0 in run_builtin (p=0xa30e00 , argc=5, argv=0x7fffffffd670) at perf.c:310 #5 0x00000000004dd54d in handle_internal_command (argc=5, argv=0x7fffffffd670) at perf.c:362 #6 0x00000000004dd694 in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:406 #7 0x00000000004dda11 in main (argc=5, argv=0x7fffffffd670) at perf.c:531 (gdb) Fixes: d4f63a4741a8 ("perf stat: Introduce print_counters function") Signed-off-by: Srikar Dronamraju Acked-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Tested-by: Ravi Bangoria Cc: Namhyung Kim Cc: Naveen N. Rao Cc: stable@vger.kernel.org # v4.2+ Link: http://lore.kernel.org/lkml/20190904094738.9558-3-srikar@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index e77880b5094de..65a6922db7223 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1416,7 +1416,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) run_idx + 1); status = run_perf_stat(argc, argv); - if (forever && status != -1) { + if (forever && status != -1 && !interval) { print_counters(NULL, argc, argv); perf_stat__reset_stats(); } -- 2.20.1