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

Date: Wed, 15 Dec 2021 10:06:34 +0200

Subject: perf intel-pt: Fix parsing of VM time correlation arguments

Git-commit: a78abde220243d6f44a265fe36c49957f6fa9851

Patch-mainline: v5.16-rc8

References: git-fixes

​

Parser did not take ':' into account.

​

Example:

​

 Before:

​

  $ perf record -e intel_pt//u uname

  Linux

  [ perf record: Woken up 1 times to write data ]

  [ perf record: Captured and wrote 0.026 MB perf.data ]

  $ perf inject -i perf.data --vm-time-correlation="dry-run 123"

  $ perf inject -i perf.data --vm-time-correlation="dry-run 123:456"

  Failed to parse VM Time Correlation options

  0x620 [0x98]: failed to process type: 70 [Invalid argument]

  $

​

 After:

​

  $ perf inject -i perf.data --vm-time-correlation="dry-run 123:456"

  $

​

Fixes: e3ff42bdebcfeb5f ("perf intel-pt: Parse VM Time Correlation options and set up decoding")

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Cc: Jiri Olsa <jolsa@redhat.com>

Cc: Riccardo Mancini <rickyman7@gmail.com>

Cc: stable@vger.kernel.org

Link: https://lore.kernel.org/r/20211215080636.149562-2-adrian.hunter@intel.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 tools/perf/util/intel-pt.c | 1 +

 1 file changed, 1 insertion(+)

​

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c

index 10c3187e4c5a..e8613cbda331 100644

--- a/tools/perf/util/intel-pt.c

+++ b/tools/perf/util/intel-pt.c

@@ -3625,6 +3625,7 @@ static int intel_pt_parse_vm_tm_corr_arg(struct intel_pt *pt, char **args)

        *args = p;

        return 0;

    }

+   p += 1;

    while (1) {

        vmcs = strtoull(p, &p, 0);

        if (errno)

​

​