Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1408517ybp; Thu, 17 Oct 2019 12:20:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmRcCf7KPY5JFd33FbeLZYm6IqiORdUD1TISSOz7dH0GzInf1ufrvpeZHrg2EDe11qy5wQ X-Received: by 2002:a17:906:2cd4:: with SMTP id r20mr4938462ejr.307.1571340039954; Thu, 17 Oct 2019 12:20:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571340039; cv=none; d=google.com; s=arc-20160816; b=YKUPTAYirMKm4YuoLwuePCI3MKmMG+yxZpy4ZeBnW3meY9FDPyuHk3N4V036+7UN9C sUWxlsGHOCexoxQJLM9mEtoUURftJ/ZV8GsVhQrCBh9syN3DVxIDkxtyJBPZhHKklv22 LAy7NWhgyvA4JeBPXB5u0y6ZsbHdCxGYDTMRUsy8SxcRZtavoP/yA/nrzFWg2DT6xUzo OIa/GaF26I5rP6NdFITzBgFDAG8n80l5gg1ZYf43GJTVw6Z6+CtJsmVcOgG0RSmmJCC5 NEZJ/Evno/XsVOb4ZsmluUvUR+Gn9ap33saDF7xlnN93vvCGZZygWrHSN3bFqA3ECnM4 8mKQ== 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=4J89qVck8ZasVlttkOmIm+EqT4xP+SNmlf+b6EafFnc=; b=ChEZkyWz6prEpuK3Ld/W+m8YTeYsFS0wINUvENctu1ynxPmpsZxVCCLJcv4VGnnL+B ToUsfR9FF6zyEgD61J+cJAx52IG4EebdOVtifEB4/GYSwsx1oM3Cn6ASb2QXmRU+7ouY J27IqyqgF5U/D4vO9PusnL5K/JLZO49jlszAitjC3lEEvMCfQioUx3xTL8dTbZ0L4JBT Iks092nXpjxsjI+leAODVYNitIFrzChPWzvwUIOVaXAROrL1sm20uIGwvnfFMXzC2jqj MikemWXQxWfBnafxSai3HTPmbKnpx93Mi+eVex6ZV7JinDw7J6pJG4gKaCy4RKe8KNBy vJ3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qoAHQRIK; 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 w5si2065379eds.179.2019.10.17.12.20.16; Thu, 17 Oct 2019 12:20:39 -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=qoAHQRIK; 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 S2405370AbfJPWPQ (ORCPT + 99 others); Wed, 16 Oct 2019 18:15:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:46160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395220AbfJPVz2 (ORCPT ); Wed, 16 Oct 2019 17:55:28 -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 3674720872; Wed, 16 Oct 2019 21:55:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262928; bh=R7muj0ZQtz28cz8Rdo20VjZVXN0cWVxoYOowSW3clsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qoAHQRIKBAorgKbjy/GiIXiFR6JpQeBI3RgzCHSa5bcLJJDX1A6krKiCVTMCO/8sE dWYLA4scygYS3GFi0M6TX3D1tPhqdzl2Fd32T9+iONdA0TL+35kD6EjapnyWq0tAET PyKvrB4gfHSeasV1uy5mhhL7/3GF8U1txOQKk/zs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Srivatsa S. Bhat (VMware)" , "Steven Rostedt (VMware)" Subject: [PATCH 4.9 88/92] tracing/hwlat: Report total time spent in all NMIs during the sample Date: Wed, 16 Oct 2019 14:51:01 -0700 Message-Id: <20191016214848.472113499@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: Srivatsa S. Bhat (VMware) commit 98dc19c11470ee6048aba723d77079ad2cda8a52 upstream. nmi_total_ts is supposed to record the total time spent in *all* NMIs that occur on the given CPU during the (active portion of the) sampling window. However, the code seems to be overwriting this variable for each NMI, thereby only recording the time spent in the most recent NMI. Fix it by accumulating the duration instead. Link: http://lkml.kernel.org/r/157073343544.17189.13911783866738671133.stgit@srivatsa-ubuntu Fixes: 7b2c86250122 ("tracing: Add NMI tracing in hwlat detector") Cc: stable@vger.kernel.org Signed-off-by: Srivatsa S. Bhat (VMware) Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace_hwlat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/trace/trace_hwlat.c +++ b/kernel/trace/trace_hwlat.c @@ -151,7 +151,7 @@ void trace_hwlat_callback(bool enter) if (enter) nmi_ts_start = time_get(); else - nmi_total_ts = time_get() - nmi_ts_start; + nmi_total_ts += time_get() - nmi_ts_start; } if (enter)