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 X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C928DC433F1 for ; Mon, 20 Jul 2020 16:01:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A952F22CF7 for ; Mon, 20 Jul 2020 16:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260877; bh=1cKTQYmZkIm0/I/HoQVjC5LCdmtRY4Nu99Fyz0W9AE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JLVXkL4pLXQD/RGz00GwPsO6bEx7U0ZHX23hpdZRVN1yos1/XV7gbFy9Kh1d9f7Zb g38kPAa9+8U5tEVrCu3sIGlj5oU2KEWrIG00QXwvWjEhwp/lIjq7XFlafsakgfKSG7 VK3oVIRcmQs+pY0DBheRCQLmeIi8psAIcfA/eylA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732505AbgGTQBQ (ORCPT ); Mon, 20 Jul 2020 12:01:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:34492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731099AbgGTQBL (ORCPT ); Mon, 20 Jul 2020 12:01:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 0858D20672; Mon, 20 Jul 2020 16:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260871; bh=1cKTQYmZkIm0/I/HoQVjC5LCdmtRY4Nu99Fyz0W9AE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bhCN5WZGSXNAOxyb6NoBUscHya4+cs+FeyEj3W2C6nUd4rSbVnEEN8t56PxZfU1J+ 6UyPlfqvf7gi+kicZs+Bc34raZKghDQSW5E+qrVFTQND2EL+9ZKQqTfRkT0wrrnZmv ILxtrCYfn8QP2ja1GwRlMVmN7mE0HmJgBT4SR570= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jin Yao , Alexander Shishkin , Andi Kleen , Jin Yao , Jiri Olsa , Kan Liang , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 5.4 125/215] perf stat: Zero all the ena and run array slot stats for interval mode Date: Mon, 20 Jul 2020 17:36:47 +0200 Message-Id: <20200720152826.148267271@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@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: Jin Yao commit 0e0bf1ea1147fcf74eab19c2d3c853cc3740a72f upstream. As the code comments in perf_stat_process_counter() say, we calculate counter's data every interval, and the display code shows ps->res_stats avg value. We need to zero the stats for interval mode. But the current code only zeros the res_stats[0], it doesn't zero the res_stats[1] and res_stats[2], which are for ena and run of counter. This patch zeros the whole res_stats[] for interval mode. Fixes: 51fd2df1e882 ("perf stat: Fix interval output values") Signed-off-by: Jin Yao Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jin Yao Cc: Jiri Olsa Cc: Kan Liang Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200409070755.17261-1-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/stat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -367,8 +367,10 @@ int perf_stat_process_counter(struct per * interval mode, otherwise overall avg running * averages will be shown for each interval. */ - if (config->interval) - init_stats(ps->res_stats); + if (config->interval) { + for (i = 0; i < 3; i++) + init_stats(&ps->res_stats[i]); + } if (counter->per_pkg) zero_per_pkg(counter);