mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

perf/core improvements and fixes:

Browse source 
User visible:
 
 - Print branch filter state with verbose mode (Andi Kleen)
 
 - Fix core dump caused by per-socket/core system-wide stat (Kan Liang)
 
 - Update libtraceevent KVM plugin (Paolo Bonzini)
 
 Developer stuff:
 
 - Add fixdep to 'tools/build' .gitignore (Yunlong Song)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWKAOxAAoJENZQFvNTUqpAOScP/0RaPckyHJX+ftspzR7vY46s
 YsNpbbVgwqnITQJNTM9Tb9J4wkt3T71UEgoCQy+O9dZzpqkSJpsXA4OOCSh+tkvf
 LhkXgYLSnbymA5HiqBww9xo8nU87H4UcHOxJsgH1STATIfjaUfEyPTJ8SHItKGiF
 YzhPZF2v/eAgRRGKGhH23yzjeyVnNZHF4svZY7HPVDWSniOPcyvjX0BIQgOWo+wj
 xK4Av1ihu0w19YNJPQeoV82SR8TkhRG/vyzsH49JaduTrTWASFLKWJNPb1XLCgCB
 kFDJjmlsoZ2Vk3SXJYV2yC9Y4tekjdjX6FCIdDqO8MPygukF6rVIc6XBYYZOSYP6
 byjaHiofHNIvcqCB4Xolu4ebKvLbNTygUAI3zHcSPAC53dYa8KAVR/GgXnDHAbAu
 1eDG1GMrQefx+FNf5F1JI7JBiA0RBJU5gjY74qEQdA9Adlqs5KA4Y8JtNAfITHq/
 eENmWLoiFkKSFh1DUlkng9sr3ON8HVFRyW953GtqNXqWi3dUmB+syum/xVPqFj92
 TsZx+tzBfrqNTO1YpKPSoAugO/KuUgCVeHm3azXDh8UwGho5VunbMOI/M9MXa0S2
 cS3ZJDQIwaYMH8pc2NIYFUAmmmTeQ/agrsyZk7hmCyKzaszUaK4Kc1ge2SzbUyo8
 HbLixQ3JbFV5KQu1phDL
 =w7sv
 -----END PGP SIGNATURE-----

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:

  - Print branch filter state in verbose mode. (Andi Kleen)

  - Fix core dump caused by per-socket/core system-wide stat. (Kan Liang)

  - Update libtraceevent KVM plugin. (Paolo Bonzini)

Infrastructure changes:

  - Add fixdep to 'tools/build' .gitignore. (Yunlong Song)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2015-10-22 09:33:46 +02:00
commit 4ba792e303
5 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/build/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
fixdep

25
tools/lib/traceevent/plugin_kvm.c
View file

@ -124,7 +124,10 @@ static const char *disassemble(unsigned char *insn, int len, uint64_t rip,
_ER(WBINVD, 54) \
_ER(XSETBV, 55) \
_ER(APIC_WRITE, 56) \
_ER(INVPCID, 58)
_ER(INVPCID, 58) \
_ER(PML_FULL, 62) \
_ER(XSAVES, 63) \
_ER(XRSTORS, 64)
#define SVM_EXIT_REASONS \
_ER(EXIT_READ_CR0, 0x000) \
@ -352,15 +355,18 @@ static int kvm_nested_vmexit_handler(struct trace_seq *s, struct pevent_record *
union kvm_mmu_page_role {
unsigned word;
struct {
unsigned glevels:4;
unsigned level:4;
unsigned cr4_pae:1;
unsigned quadrant:2;
unsigned pad_for_nice_hex_output:6;
unsigned direct:1;
unsigned access:3;
unsigned invalid:1;
unsigned cr4_pge:1;
unsigned nxe:1;
unsigned cr0_wp:1;
unsigned smep_and_not_wp:1;
unsigned smap_and_not_wp:1;
unsigned pad_for_nice_hex_output:8;
unsigned smm:8;
};
};
@ -385,15 +391,18 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct pevent_record *record,
if (pevent_is_file_bigendian(event->pevent) ==
pevent_is_host_bigendian(event->pevent)) {
trace_seq_printf(s, "%u/%u q%u%s %s%s %spge %snxe",
trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s",
role.level,
role.glevels,
role.quadrant,
role.direct ? " direct" : "",
access_str[role.access],
role.invalid ? " invalid" : "",
role.cr4_pge ? "" : "!",
role.nxe ? "" : "!");
role.cr4_pae ? "" : "!",
role.nxe ? "" : "!",
role.cr0_wp ? "" : "!",
role.smep_and_not_wp ? " smep" : "",
role.smap_and_not_wp ? " smap" : "",
role.smm ? " smm" : "");
} else
trace_seq_printf(s, "WORD: %08x", role.word);

5
tools/perf/util/annotate.c
View file

@ -548,8 +548,11 @@ static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map,
pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));
if (addr < sym->start || addr >= sym->end)
if (addr < sym->start || addr >= sym->end) {
pr_debug("%s(%d): ERANGE! sym->name=%s, start=%#" PRIx64 ", addr=%#" PRIx64 ", end=%#" PRIx64 "\n",
__func__, __LINE__, sym->name, sym->start, addr, sym->end);
return -ERANGE;
}
offset = addr - sym->start;
h = annotation__histogram(notes, evidx);

2
tools/perf/util/cpumap.c
View file

@ -285,7 +285,7 @@ int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
/* ensure we process id in increasing order */
qsort(c->map, c->nr, sizeof(int), cmp_ids);
atomic_set(&cpus->refcnt, 1);
atomic_set(&c->refcnt, 1);
*res = c;
return 0;
}

1
tools/perf/util/evsel.c
View file

@ -1262,6 +1262,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
PRINT_ATTRf(bp_type, p_unsigned);
PRINT_ATTRn("{ bp_addr, config1 }", bp_addr, p_hex);
PRINT_ATTRn("{ bp_len, config2 }", bp_len, p_hex);
PRINT_ATTRf(branch_sample_type, p_unsigned);
PRINT_ATTRf(sample_regs_user, p_hex);
PRINT_ATTRf(sample_stack_user, p_unsigned);
PRINT_ATTRf(clockid, p_signed);