]> git.itanic.dy.fi Git - linux-stable/commitdiff
perf intel-pt: Simplify intel_pt_get_vmcs()
authorAdrian Hunter <adrian.hunter@intel.com>
Thu, 5 Oct 2023 19:04:48 +0000 (22:04 +0300)
committerNamhyung Kim <namhyung@kernel.org>
Tue, 17 Oct 2023 19:40:49 +0000 (12:40 -0700)
Simplify and remove unnecessary constant expressions.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20231005190451.175568-3-adrian.hunter@intel.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c

index af9710622a1fa9a1554911d6314862319804810a..249610cc928489d12bbabf58aafdc8eb28f6e690 100644 (file)
@@ -131,19 +131,14 @@ static int intel_pt_get_cbr(const unsigned char *buf, size_t len,
 static int intel_pt_get_vmcs(const unsigned char *buf, size_t len,
                             struct intel_pt_pkt *packet)
 {
-       unsigned int count = (52 - 5) >> 3;
-
-       if (count < 1 || count > 7)
-               return INTEL_PT_BAD_PACKET;
-
-       if (len < count + 2)
+       if (len < 7)
                return INTEL_PT_NEED_MORE_BYTES;
 
        packet->type = INTEL_PT_VMCS;
-       packet->count = count;
-       memcpy_le64(&packet->payload, buf + 2, count);
+       packet->count = 5;
+       memcpy_le64(&packet->payload, buf + 2, 5);
 
-       return count + 2;
+       return 7;
 }
 
 static int intel_pt_get_ovf(struct intel_pt_pkt *packet)