Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp232011ybg; Thu, 17 Oct 2019 22:03:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbYlo9OT1UqN9D6121e7FMWQxU1rh2qO/+0vwEYDXkZoa5H+FOP4Ty4B9H6rc1AnhfE1pQ X-Received: by 2002:a50:935d:: with SMTP id n29mr7542472eda.167.1571375005226; Thu, 17 Oct 2019 22:03:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375005; cv=none; d=google.com; s=arc-20160816; b=JLhdD+tMuW7Pxa2tDcrpn4EK0qx/FKcT9et4lqT6qB+Qq6yJOVXWFl8qkOdNr6u97a Iau2rP+BWxbuiSsXvxcDdvJhoDUjlypTd8wkPyqtcdBTkm0qsRjHuRrHyMu00W/fttr1 0j1PxouuBBdLbQkizrSCRN71X75lS846DYmXlxzM/2naHXwDlmaDQKkn+tiLZ/VKrfQv OeqbWlXY6Nq/ws8OuqW8wtB0xtjZysJ+oTybcJKwMm3nB6H7E07BUvAIcehlLTkOqaCM NzKo8xiLV127KRWB7c/6Cw5TrXBJNabwdC+4Jip1qJAtIZ4HufjpN1m8hGBFnjF+h2oK mRig== 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=EPao5Tor6JUVOMf6BP1XDiMUm5mtrcNijNkp/6z94rk=; b=ON74ODRgAYEl54Bt+eTBs7nsvs6y95kCy82RUjyrr5jPxOrMb2VAqe9u9m++jjqnC/ Pe6Bf9Ty0duqBW5sSRWiaJUptuVyPOrgRSf5+OSUsPE8iVTgFH5Ms5IsfphYOJ4oYZYC j9S67qeKl30LeMwcG4E/32QxJeRpw199XF7aXPTY/cIAXmKoTcs+vDDooEbnGWnmAqnM E0qjT0R2JPEkMlon9Rt9o8NXWOnkkPov4GoQNNNEBPHCcX+OXfbxn/+gqHtI9pgf1duc FScGi2KHEYHGuwgUuyXYW28MOt8SU4WH4ALcFeqjtOvhtMSVRDAiRFXj/XIR8n55/MHp NH4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bYbrk1fM; 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 d27si3126227ede.381.2019.10.17.22.03.01; Thu, 17 Oct 2019 22:03:25 -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=bYbrk1fM; 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 S2392580AbfJPWSk (ORCPT + 99 others); Wed, 16 Oct 2019 18:18:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:44234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394976AbfJPVyX (ORCPT ); Wed, 16 Oct 2019 17:54:23 -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 6D2FD21D7A; Wed, 16 Oct 2019 21:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262862; bh=1eNzkQKB/omEwyVgtMMgoDNH1lBHiCVbElxjt1odP9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bYbrk1fMQyVyuL6JJOVHzoB73d1WfTml+hYCm7fR6rquz9+SMFBU/LSP8TpIimeNB MhJv7flGlsqM9g6+WDfNtfoEPmnMVx1TLtJyoVrSfIipe/4xhS7ptXBhuG6/IVU/Pd V3GWP8i+3nxWg2f8wst7aySEO9SLQ6zAgyPh6h04= 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.9 28/92] perf stat: Fix a segmentation fault when using repeat forever Date: Wed, 16 Oct 2019 14:50:01 -0700 Message-Id: <20191016214822.754625413@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@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 43d5f35e90747..e55dbceadad6c 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2565,7 +2565,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