]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
tools arch x86: Sync the msr-index.h copy with the kernel sources
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 1 Apr 2020 15:12:19 +0000 (12:12 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 14 Apr 2020 11:42:56 +0000 (08:42 -0300)
commitbab1a501e6587590dda4c6cd92250cfedcd1553f
tree63cf2d51c6073bce41282526dfe0c6150a30fa8e
parent8f3d9f354286745c751374f5f1fcafee6b3f3136
tools arch x86: Sync the msr-index.h copy with the kernel sources

To pick up the changes in:

  6650cdd9a8cc ("x86/split_lock: Enable split lock detection by kernel")

  Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h'
  diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h

Which causes these changes in tooling:

  $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before
  $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h
  $ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after
  $ diff -u before after
  --- before 2020-04-01 12:11:14.789344795 -0300
  +++ after 2020-04-01 12:11:56.907798879 -0300
  @@ -10,6 +10,7 @@
    [0x00000029] = "KNC_EVNTSEL1",
    [0x0000002a] = "IA32_EBL_CR_POWERON",
    [0x0000002c] = "EBC_FREQUENCY_ID",
  + [0x00000033] = "TEST_CTRL",
    [0x00000034] = "SMI_COUNT",
    [0x0000003a] = "IA32_FEAT_CTL",
    [0x0000003b] = "IA32_TSC_ADJUST",
  @@ -27,6 +28,7 @@
    [0x000000c2] = "IA32_PERFCTR1",
    [0x000000cd] = "FSB_FREQ",
    [0x000000ce] = "PLATFORM_INFO",
  + [0x000000cf] = "IA32_CORE_CAPS",
    [0x000000e2] = "PKG_CST_CONFIG_CONTROL",
    [0x000000e7] = "IA32_MPERF",
    [0x000000e8] = "IA32_APERF",
  $

  $ make -C tools/perf O=/tmp/build/perf install-bin
  <SNIP>
    CC       /tmp/build/perf/trace/beauty/tracepoints/x86_msr.o
    LD       /tmp/build/perf/trace/beauty/tracepoints/perf-in.o
    LD       /tmp/build/perf/trace/beauty/perf-in.o
    LD       /tmp/build/perf/perf-in.o
    LINK     /tmp/build/perf/perf
  <SNIP>

Now one can do:

perf trace -e msr:* --filter=msr==IA32_CORE_CAPS

or:

perf trace -e msr:* --filter='msr==IA32_CORE_CAPS || msr==TEST_CTRL'

And see only those MSRs being accessed via:

  # perf trace -v -e msr:* --filter='msr==IA32_CORE_CAPS || msr==TEST_CTRL'
  New filter for msr:read_msr: (msr==0xcf || msr==0x33) && (common_pid != 8263 && common_pid != 23250)
  New filter for msr:write_msr: (msr==0xcf || msr==0x33) && (common_pid != 8263 && common_pid != 23250)
  New filter for msr:rdpmc: (msr==0xcf || msr==0x33) && (common_pid != 8263 && common_pid != 23250)

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/lkml/20200401153325.GC12534@kernel.org/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/arch/x86/include/asm/msr-index.h