Commit ec6dbcb7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  o Support S/390 in 'perf kvm stat' (Alexander Yarygin)

Developer Stuff:

  o Various fixes and prep work related to supporting Intel PT (Adrian Hunter)

  o Introduce multiple debug variables control (Jiri Olsa)

  o Add callchain and additional sample information for python scripts (Joseph Schuchart)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ff2ebe46 0b437860

arch/s390/include/uapi/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ header-y += ioctls.h 
header-y += ipcbuf.h

header-y += ipcbuf.h

header-y += kvm.h

header-y += kvm.h

header-y += kvm_para.h

header-y += kvm_para.h

header-y += kvm_perf.h

header-y += kvm_virtio.h

header-y += kvm_virtio.h

header-y += mman.h

header-y += mman.h

header-y += monwriter.h

header-y += monwriter.h

arch/s390/include/uapi/asm/kvm_perf.h

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
/*

 * Definitions for perf-kvm on s390

 *

 * Copyright 2014 IBM Corp.

 * Author(s): Alexander Yarygin <yarygin@linux.vnet.ibm.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 */



#ifndef __LINUX_KVM_PERF_S390_H

#define __LINUX_KVM_PERF_S390_H



#include <asm/sie.h>



#define DECODE_STR_LEN 40



#define VCPU_ID "id"



#define KVM_ENTRY_TRACE "kvm:kvm_s390_sie_enter"

#define KVM_EXIT_TRACE "kvm:kvm_s390_sie_exit"

#define KVM_EXIT_REASON "icptcode"



#endif

arch/x86/include/uapi/asm/Kbuild

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ header-y += ipcbuf.h 
header-y += ist.h

header-y += ist.h

header-y += kvm.h

header-y += kvm.h

header-y += kvm_para.h

header-y += kvm_para.h

header-y += kvm_perf.h

header-y += ldt.h

header-y += ldt.h

header-y += mce.h

header-y += mce.h

header-y += mman.h

header-y += mman.h

arch/x86/include/uapi/asm/kvm_perf.h

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_KVM_PERF_H

#define _ASM_X86_KVM_PERF_H



#include <asm/svm.h>

#include <asm/vmx.h>

#include <asm/kvm.h>



#define DECODE_STR_LEN 20



#define VCPU_ID "vcpu_id"



#define KVM_ENTRY_TRACE "kvm:kvm_entry"

#define KVM_EXIT_TRACE "kvm:kvm_exit"

#define KVM_EXIT_REASON "exit_reason"



#endif /* _ASM_X86_KVM_PERF_H */

tools/perf/Documentation/perf-kvm.txt

+9 −7
Original line number Original line Diff line number Diff line
@@ -51,9 +51,9 @@ There are a couple of variants of perf kvm: 
  'perf kvm stat <command>' to run a command and gather performance counter

  'perf kvm stat <command>' to run a command and gather performance counter

  statistics.

  statistics.

  Especially, perf 'kvm stat record/report' generates a statistical analysis

  Especially, perf 'kvm stat record/report' generates a statistical analysis

  of KVM events. Currently, vmexit, mmio and ioport events are supported.

  of KVM events. Currently, vmexit, mmio (x86 only) and ioport (x86 only)

  'perf kvm stat record <command>' records kvm events and the events between

  events are supported. 'perf kvm stat record <command>' records kvm events

  start and end <command>.

  and the events between start and end <command>.

  And this command produces a file which contains tracing results of kvm

  And this command produces a file which contains tracing results of kvm

  events.

  events.
@@ -103,8 +103,8 @@ STAT REPORT OPTIONS 
       analyze events which occures on this vcpu. (default: all vcpus)

       analyze events which occures on this vcpu. (default: all vcpus)





--event=<value>::

--event=<value>::

       event to be analyzed. Possible values: vmexit, mmio, ioport.

       event to be analyzed. Possible values: vmexit, mmio (x86 only),

       (default: vmexit)

       ioport (x86 only). (default: vmexit)

-k::

-k::

--key=<value>::

--key=<value>::

       Sorting key. Possible values: sample (default, sort by samples

       Sorting key. Possible values: sample (default, sort by samples
@@ -138,7 +138,8 @@ STAT LIVE OPTIONS 








--event=<value>::

--event=<value>::

       event to be analyzed. Possible values: vmexit, mmio, ioport.

       event to be analyzed. Possible values: vmexit,

       mmio (x86 only), ioport (x86 only).

       (default: vmexit)

       (default: vmexit)





-k::

-k::
@@ -147,7 +148,8 @@ STAT LIVE OPTIONS 
       number), time (sort by average time).

       number), time (sort by average time).





--duration=<value>::

--duration=<value>::

       Show events other than HLT that take longer than duration usecs.

       Show events other than HLT (x86 only) or Wait state (s390 only)

       that take longer than duration usecs.





SEE ALSO

SEE ALSO

--------

--------

CRA Git | Maintained and supported by SUSTech CRA and CCSE