Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1671883
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 07/25] perf intel-pt: Move decoder error setting into one condition |
| Date | 2017-06-21 20:10 +0200 |
| Message-ID | <tUSeK-1fP-43@gated-at.bofh.it> (permalink) |
| References | <tUSeJ-1fP-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Adrian Hunter <adrian.hunter@intel.com>
Move decoder error setting into one condition.
Cc'ed to stable because later fixes depend on it.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1495786658-18063-2-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 7cf7f7aca4d2..5a9676c6e23f 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -2130,15 +2130,18 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
}
} while (err == -ENOLINK);
- decoder->state.err = err ? intel_pt_ext_err(err) : 0;
+ if (err) {
+ decoder->state.err = intel_pt_ext_err(err);
+ decoder->state.from_ip = decoder->ip;
+ } else {
+ decoder->state.err = 0;
+ }
+
decoder->state.timestamp = decoder->timestamp;
decoder->state.est_timestamp = intel_pt_est_timestamp(decoder);
decoder->state.cr3 = decoder->cr3;
decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;
- if (err)
- decoder->state.from_ip = decoder->ip;
-
return &decoder->state;
}
--
2.9.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[GIT PULL 00/25] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 09/25] perf intel-pt: Fix missing stack clear Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 07/25] perf intel-pt: Move decoder error setting into one condition Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 23/25] perf intel-pt: Fix transactions_sample_type Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 04/25] tools lib api fs: Add sysfs__write_int function Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 05/25] perf stat: Add support to measure SMI cost Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 19/25] perf intel-pt: Add decoder support for ptwrite and power event packets Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 22/25] perf intel-pt: Remove redundant initial_skip checks Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 08/25] perf intel-pt: Improve sample timestamp Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 25/25] perf script: Fix message because field list option is -F not -f Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 20/25] perf intel-pt: Add reserved byte to CBR packet payload Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 11/25] perf intel-pt: Fix last_ip usage Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 14/25] perf intel-pt: Clear FUP flag on error Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 [PATCH 10/25] perf intel-pt: Ensure IP is zero when state is INTEL_PT_STATE_NO_IP Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-06-21 20:10 +0200 Re: [GIT PULL 00/25] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-06-21 20:20 +0200
csiph-web