Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1671893

[PATCH 20/25] perf intel-pt: Add reserved byte to CBR packet payload

Show all headers | View raw

From: Adrian Hunter <adrian.hunter@intel.com>

Future proof CBR packet decoding by passing through also the undefined
'reserved' byte in the packet payload.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1495786658-18063-15-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     | 2 +-
 tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +-
 2 files changed, 2 insertions(+), 2 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 e42804d10001..96bf8d8e83c0 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -1444,7 +1444,7 @@ static void intel_pt_calc_mtc_timestamp(struct intel_pt_decoder *decoder)
 
 static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder)
 {
-	unsigned int cbr = decoder->packet.payload;
+	unsigned int cbr = decoder->packet.payload & 0xff;
 
 	if (decoder->cbr == cbr)
 		return;
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
index accdb646a03d..ba4c9dd18643 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c
@@ -130,7 +130,7 @@ static int intel_pt_get_cbr(const unsigned char *buf, size_t len,
 	if (len < 4)
 		return INTEL_PT_NEED_MORE_BYTES;
 	packet->type = INTEL_PT_CBR;
-	packet->payload = buf[2];
+	packet->payload = le16_to_cpu(*(uint16_t *)(buf + 2));
 	return 4;
 }
 
-- 
2.9.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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