summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSrivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>2019-10-10 11:50:46 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-17 13:45:38 -0700
commit6271cbff9309b71a3c7a6411dd9bb96e1ccdc530 (patch)
tree7471e8038e7c3a90570b98feb8720c52d94f1d13 /kernel
parent3766c9d9c47c8545037db8c2ee911b3df51c830f (diff)
downloadlinux-stable-6271cbff9309b71a3c7a6411dd9bb96e1ccdc530.tar.gz
linux-stable-6271cbff9309b71a3c7a6411dd9bb96e1ccdc530.tar.bz2
linux-stable-6271cbff9309b71a3c7a6411dd9bb96e1ccdc530.zip
tracing/hwlat: Report total time spent in all NMIs during the sample
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) <srivatsa@csail.mit.edu> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_hwlat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
index 1e6db9cbe4dc..1e9a404cee2b 100644
--- a/kernel/trace/trace_hwlat.c
+++ b/kernel/trace/trace_hwlat.c
@@ -150,7 +150,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)