Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf/core fixes:

Browse Source 
Build fixes:
 
 - Create config.detected into OUTPUT directory, fixing parallel
   builds sharing the same source directory (Aaro Kiskinen)
 
 - Allow to specify custom linker command, fixing some MIPS64
   builds. (Aaro Kiskinen)
 
 Infrastructure:
 
 - Add missing break for PERF_RECORD_ITRACE_START, which caused those events
   samples to be parsed as well as PERF_RECORD_LOST_SAMPLES. ITRACE_START only
   appears when Intel PT or BTS are present, so  (Jiri Olsa)
 
 - Call the perf_session destructor when bailing out in the inject, kmem, report,
   kvm and mem tools (Taeung Song)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVlFhiAAoJENZQFvNTUqpA18IP/3/QBbaVH8H/SKqhNX+p/wCi
 r483BHoNjYMiVR5Ux0BDZAXdlv7MucDvpMfsQvmiYTenz/bPObG0CdjxXtUZ0hzw
 r/vQ1d9TBYm2zsiDvikzmJeL6gy4iSztSQCGwa2xJkmCOLTKiPnrKRtdLN6EXyV+
 5J1qAYapDGbr27iJsGsnTEcs+gzUDkg08YB6xcgDvsIfwhufV+qDDxP+SypLROSb
 4PbJ1m4IzZXlKToRZK/ZCYIMv2Pyqe1QW26Cs8+HkpnxJQWGIDqdcWSLt1kJdU1i
 7aeH8dDfi8Y+kXAEIUV1AY7c8B1HZ/LvLerz1QTuCtxify/T6Qtdk9rWRRkOIttG
 viaEZri07hSh/9/VL9GWOq76A5C6BPcwWc9saaFNt2oCNs40fJzpJj+/XZ2OeTlZ
 6fXt+p5vGWwUGrJ+SxlPHhAJXvl1J2oK9vEcqm+NZLQ1+VSHW56EHw0I6atXm2om
 yP7w6S631B0cQovP50vNga6luKq1ya1Ckn0cH8EANyA8qya/uuCvoeJ60ofENgz6
 6LqyHU/sT3zadV79OGXhYdfO2OmAfmtItRvnFIWdJ0hoXG9EajCqYzDwiAxGv53g
 j0U3vA6TyYc7QQagBWoYHZwR6yAcfwrVKDC3by0wTB9erjAcf0LOgOGnOWvPNbiM
 Oe2cY/T8rt8K4J+LHnFo
 =a8/d
 -----END PGP SIGNATURE-----

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

Pull perf/core fixes from Arnaldo Carvalho de Melo:

Build fixes:

  - Create config.detected into OUTPUT directory, fixing parallel
    builds sharing the same source directory (Aaro Kiskinen)

  - Allow to specify custom linker command, fixing some MIPS64
    builds. (Aaro Kiskinen)

Infrastructure fixes:

  - Add missing break for PERF_RECORD_ITRACE_START, which caused those events
    samples to be parsed as well as PERF_RECORD_LOST_SAMPLES. ITRACE_START only
    appears when Intel PT or BTS are present, so  (Jiri Olsa)

  - Call the perf_session destructor when bailing out in the inject, kmem, report,
    kvm and mem tools (Taeung 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-07-02 10:48:16 +02:00
commit b9df84fd7c
9 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/build/Makefile.build
View File

@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build
include $(build-dir)/Build.include
# do not force detected configuration
-include .config-detected
-include $(OUTPUT).config-detected
# Init all relevant variables used in build files so
# 1) they have correct type

4
tools/perf/Makefile.perf
View File

@ -110,7 +110,7 @@ $(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD
$(Q)touch $(OUTPUT)PERF-VERSION-FILE
CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)ld
LD ?= $(CROSS_COMPILE)ld
AR = $(CROSS_COMPILE)ar
PKG_CONFIG = $(CROSS_COMPILE)pkg-config
@ -545,7 +545,7 @@ config-clean:
clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
$(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
$(Q)$(RM) .config-detected
$(Q)$(RM) $(OUTPUT).config-detected
$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
$(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

7
tools/perf/builtin-inject.c
View File

@ -630,12 +630,13 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
if (inject.session == NULL)
return -1;
if (symbol__init(&inject.session->header.env) < 0)
return -1;
ret = symbol__init(&inject.session->header.env);
if (ret < 0)
goto out_delete;
ret = __cmd_inject(&inject);
out_delete:
perf_session__delete(inject.session);
return ret;
}

4
tools/perf/builtin-kmem.c
View File

@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
if (!perf_evlist__find_tracepoint_by_name(session->evlist,
"kmem:kmalloc")) {
pr_err(errmsg, "slab", "slab");
return -1;
goto out_delete;
}
}
@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
"kmem:mm_page_alloc");
if (evsel == NULL) {
pr_err(errmsg, "page", "page");
return -1;
goto out_delete;
}
kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);

14
tools/perf/builtin-kvm.c
View File

@ -1061,8 +1061,10 @@ static int read_events(struct perf_kvm_stat *kvm)
symbol__init(&kvm->session->header.env);
if (!perf_session__has_traces(kvm->session, "kvm record"))
return -EINVAL;
if (!perf_session__has_traces(kvm->session, "kvm record")) {
ret = -EINVAL;
goto out_delete;
}
/*
* Do not use 'isa' recorded in kvm_exit tracepoint since it is not
@ -1070,9 +1072,13 @@ static int read_events(struct perf_kvm_stat *kvm)
*/
ret = cpu_isa_config(kvm);
if (ret < 0)
return ret;
goto out_delete;
return perf_session__process_events(kvm->session);
ret = perf_session__process_events(kvm->session);
out_delete:
perf_session__delete(kvm->session);
return ret;
}
static int parse_target_str(struct perf_kvm_stat *kvm)

16
tools/perf/builtin-mem.c
View File

@ -124,7 +124,6 @@ static int report_raw_events(struct perf_mem *mem)
.mode = PERF_DATA_MODE_READ,
.force = mem->force,
};
int err = -EINVAL;
int ret;
struct perf_session *session = perf_session__new(&file, false,
&mem->tool);
@ -135,24 +134,21 @@ static int report_raw_events(struct perf_mem *mem)
if (mem->cpu_list) {
ret = perf_session__cpu_bitmap(session, mem->cpu_list,
mem->cpu_bitmap);
if (ret)
if (ret < 0)
goto out_delete;
}
if (symbol__init(&session->header.env) < 0)
return -1;
ret = symbol__init(&session->header.env);
if (ret < 0)
goto out_delete;
printf("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n");
err = perf_session__process_events(session);
if (err)
return err;
return 0;
ret = perf_session__process_events(session);
out_delete:
perf_session__delete(session);
return err;
return ret;
}
static int report_events(int argc, const char **argv, struct perf_mem *mem)

6
tools/perf/builtin-report.c
View File

@ -839,8 +839,10 @@ repeat:
if (report.header || report.header_only) {
perf_session__fprintf_info(session, stdout,
report.show_full_info);
if (report.header_only)
return 0;
if (report.header_only) {
ret = 0;
goto error;
}
} else if (use_browser == 0) {
fputs("# To display the perf.data header info, please use --header/--header-only options.\n#\n",
stdout);

6
tools/perf/config/Makefile
View File

@ -11,9 +11,9 @@ ifneq ($(obj-perf),)
obj-perf := $(abspath $(obj-perf))/
endif
$(shell echo -n > .config-detected)
detected = $(shell echo "$(1)=y" >> .config-detected)
detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected)
$(shell echo -n > $(OUTPUT).config-detected)
detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected)
detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected)
CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)

3
tools/perf/util/machine.c
View File

@ -1448,10 +1448,9 @@ int machine__process_event(struct machine *machine, union perf_event *event,
case PERF_RECORD_AUX:
ret = machine__process_aux_event(machine, event); break;
case PERF_RECORD_ITRACE_START:
ret = machine__process_itrace_start_event(machine, event);
ret = machine__process_itrace_start_event(machine, event); break;
case PERF_RECORD_LOST_SAMPLES:
ret = machine__process_lost_samples_event(machine, event, sample); break;
break;
default:
ret = -1;
break;