History

Merge branch 'linus' into perf/core

Conflicts: tools/perf/Makefile tools/perf/builtin-test.c tools/perf/perf.h tools/perf/tests/parse-events.c tools/perf/util/evsel.h

Ingo Molnar committed 13 years ago

Commit f0b9abf2 parents adc1ef1 1b3c3931115 files · +13259 −8000Browse files

Showing the changes to tools (20 of 1115 files). Show all

Unified · Split

20 files
  1. tools/perf/Makefile +29 −1
  2. tools/perf/arch/x86/include/perf_regs.h +1 −1
  3. tools/perf/builtin-kvm.c +67 −54
  4. tools/perf/perf.h +3 −12
  5. tools/perf/tests/parse-events.c +1 −1
  6. tools/perf/util/evsel.c +2 −2
  7. tools/perf/util/evsel.h +1 −1
  8. tools/perf/util/header.c +2 −0
  9. tools/perf/util/header.h +1 −1
  10. tools/perf/util/parse-events.c +1 −1
  11. tools/perf/util/parse-events.h +1 −1
  12. tools/perf/util/pmu.h +1 −1
  13. tools/perf/util/session.h +1 −1
  14. tools/perf/util/strbuf.c +4 −4
  15. tools/power/x86/turbostat/turbostat.c +19 −9
  16. tools/testing/ktest/ktest.pl +4 −2
  17. tools/testing/selftests/Makefile +1 −1
  18. tools/testing/selftests/epoll/Makefile +0 −11
  19. tools/testing/selftests/epoll/test_epoll.c +0 −344
  20. tools/vm/page-types.c +1 −1
tools/perf/Makefile+29−1
@@ -169,7 +169,35 @@ endif · 168 unmodified lines
169169
170170 ### --- END CONFIGURATION SECTION ---
171171
172−BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -Iutil -I. -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
172+ifeq ($(srctree),)
173+srctree := $(patsubst %/,%,$(dir $(shell pwd)))
174+srctree := $(patsubst %/,%,$(dir $(srctree)))
175+#$(info Determined 'srctree' to be $(srctree))
176+endif
177+
178+ifneq ($(objtree),)
179+#$(info Determined 'objtree' to be $(objtree))
180+endif
181+
182+ifneq ($(OUTPUT),)
183+#$(info Determined 'OUTPUT' to be $(OUTPUT))
184+endif
185+
186+BASIC_CFLAGS = \
187+ -Iutil/include \
188+ -Iarch/$(ARCH)/include \
189+ $(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
190+ -I$(srctree)/arch/$(ARCH)/include/uapi \
191+ -I$(srctree)/arch/$(ARCH)/include \
192+ $(if $(objtree),-I$(objtree)/include/generated/uapi) \
193+ -I$(srctree)/include/uapi \
194+ -I$(srctree)/include \
195+ -I$(OUTPUT)util \
196+ -Iutil \
197+ -I. \
198+ -I$(TRACE_EVENT_DIR) \
199+ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
200+
173201 BASIC_LDFLAGS =
174202
175203 ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y)
tools/perf/arch/x86/include/perf_regs.h+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33
44 #include <stdlib.h>
55 #include "../../util/types.h"
6−#include "../../../../../arch/x86/include/asm/perf_regs.h"
6+#include <asm/perf_regs.h>
77
88 #ifndef ARCH_X86_64
99 #define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1)
tools/perf/builtin-kvm.c+67−54
@@ -22,9 +22,10 @@ · 21 unmodified lines
2222 #include <pthread.h>
2323 #include <math.h>
2424
25−#include "../../arch/x86/include/asm/svm.h"
26−#include "../../arch/x86/include/asm/vmx.h"
27−#include "../../arch/x86/include/asm/kvm.h"
25+#if defined(__i386__) || defined(__x86_64__)
26+#include <asm/svm.h>
27+#include <asm/vmx.h>
28+#include <asm/kvm.h>
2829
2930 struct event_key {
3031 #define INVALID_KEY (~0ULL)
@@ -58,7 +59,7 @@ struct kvm_event_key { · 27 unmodified lines
5859 };
5960
6061
61−struct perf_kvm;
62+struct perf_kvm_stat;
6263
6364 struct kvm_events_ops {
6465 bool (*is_begin_event)(struct perf_evsel *evsel,
@@ -66,7 +67,7 @@ struct kvm_events_ops { · 1 unmodified line
6667 struct event_key *key);
6768 bool (*is_end_event)(struct perf_evsel *evsel,
6869 struct perf_sample *sample, struct event_key *key);
69− void (*decode_key)(struct perf_kvm *kvm, struct event_key *key,
70+ void (*decode_key)(struct perf_kvm_stat *kvm, struct event_key *key,
7071 char decode[20]);
7172 const char *name;
7273 };
@@ -79,7 +80,7 @@ struct exit_reasons_table { · 6 unmodified lines
7980 #define EVENTS_BITS 12
8081 #define EVENTS_CACHE_SIZE (1UL << EVENTS_BITS)
8182
82−struct perf_kvm {
83+struct perf_kvm_stat {
8384 struct perf_tool tool;
8485 struct perf_session *session;
8586
@@ -146,7 +147,7 @@ static struct exit_reasons_table svm_exit_reasons[] = { · 60 unmodified lines
146147 SVM_EXIT_REASONS
147148 };
148149
149−static const char *get_exit_reason(struct perf_kvm *kvm, u64 exit_code)
150+static const char *get_exit_reason(struct perf_kvm_stat *kvm, u64 exit_code)
150151 {
151152 int i = kvm->exit_reasons_size;
152153 struct exit_reasons_table *tbl = kvm->exit_reasons;
@@ -162,7 +163,7 @@ static const char *get_exit_reason(struct perf_kvm *kvm, u64 exit_code) · 9 unmodified lines
162163 return "UNKNOWN";
163164 }
164165
165−static void exit_event_decode_key(struct perf_kvm *kvm,
166+static void exit_event_decode_key(struct perf_kvm_stat *kvm,
166167 struct event_key *key,
167168 char decode[20])
168169 {
@@ -228,7 +229,7 @@ static bool mmio_event_end(struct perf_evsel *evsel, struct perf_sample *sample, · 59 unmodified lines
228229 return false;
229230 }
230231
231−static void mmio_event_decode_key(struct perf_kvm *kvm __maybe_unused,
232+static void mmio_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused,
232233 struct event_key *key,
233234 char decode[20])
234235 {
@@ -271,7 +272,7 @@ static bool ioport_event_end(struct perf_evsel *evsel, · 36 unmodified lines
271272 return kvm_entry_event(evsel);
272273 }
273274
274−static void ioport_event_decode_key(struct perf_kvm *kvm __maybe_unused,
275+static void ioport_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused,
275276 struct event_key *key,
276277 char decode[20])
277278 {
@@ -286,7 +287,7 @@ static struct kvm_events_ops ioport_events = { · 8 unmodified lines
286287 .name = "IO Port Access"
287288 };
288289
289−static bool register_kvm_events_ops(struct perf_kvm *kvm)
290+static bool register_kvm_events_ops(struct perf_kvm_stat *kvm)
290291 {
291292 bool ret = true;
292293
@@ -311,7 +312,7 @@ struct vcpu_event_record { · 18 unmodified lines
311312 };
312313
313314
314−static void init_kvm_event_record(struct perf_kvm *kvm)
315+static void init_kvm_event_record(struct perf_kvm_stat *kvm)
315316 {
316317 unsigned int i;
317318
@@ -360,7 +361,7 @@ static struct kvm_event *kvm_alloc_init_event(struct event_key *key) · 42 unmodified lines
360361 return event;
361362 }
362363
363−static struct kvm_event *find_create_kvm_event(struct perf_kvm *kvm,
364+static struct kvm_event *find_create_kvm_event(struct perf_kvm_stat *kvm,
364365 struct event_key *key)
365366 {
366367 struct kvm_event *event;
@@ -382,7 +383,7 @@ static struct kvm_event *find_create_kvm_event(struct perf_kvm *kvm, · 15 unmodified lines
382383 return event;
383384 }
384385
385−static bool handle_begin_event(struct perf_kvm *kvm,
386+static bool handle_begin_event(struct perf_kvm_stat *kvm,
386387 struct vcpu_event_record *vcpu_record,
387388 struct event_key *key, u64 timestamp)
388389 {
@@ -429,7 +430,7 @@ static bool update_kvm_event(struct kvm_event *event, int vcpu_id, · 40 unmodified lines
429430 return true;
430431 }
431432
432−static bool handle_end_event(struct perf_kvm *kvm,
433+static bool handle_end_event(struct perf_kvm_stat *kvm,
433434 struct vcpu_event_record *vcpu_record,
434435 struct event_key *key,
435436 u64 timestamp)
@@ -496,7 +497,7 @@ struct vcpu_event_record *per_vcpu_record(struct thread *thread, · 60 unmodified lines
496497 return thread->priv;
497498 }
498499
499−static bool handle_kvm_event(struct perf_kvm *kvm,
500+static bool handle_kvm_event(struct perf_kvm_stat *kvm,
500501 struct thread *thread,
501502 struct perf_evsel *evsel,
502503 struct perf_sample *sample)
@@ -556,7 +557,7 @@ static struct kvm_event_key keys[] = { · 53 unmodified lines
556557 { NULL, NULL }
557558 };
558559
559−static bool select_key(struct perf_kvm *kvm)
560+static bool select_key(struct perf_kvm_stat *kvm)
560561 {
561562 int i;
562563
@@ -592,7 +593,8 @@ static void insert_to_result(struct rb_root *result, struct kvm_event *event, · 29 unmodified lines
592593 rb_insert_color(&event->rb, result);
593594 }
594595
595−static void update_total_count(struct perf_kvm *kvm, struct kvm_event *event)
596+static void
597+update_total_count(struct perf_kvm_stat *kvm, struct kvm_event *event)
596598 {
597599 int vcpu = kvm->trace_vcpu;
598600
@@ -605,7 +607,7 @@ static bool event_is_valid(struct kvm_event *event, int vcpu) · 6 unmodified lines
605607 return !!get_event_count(event, vcpu);
606608 }
607609
608−static void sort_result(struct perf_kvm *kvm)
610+static void sort_result(struct perf_kvm_stat *kvm)
609611 {
610612 unsigned int i;
611613 int vcpu = kvm->trace_vcpu;
@@ -644,7 +646,7 @@ static void print_vcpu_info(int vcpu) · 32 unmodified lines
644646 pr_info("VCPU %d:\n\n", vcpu);
645647 }
646648
647−static void print_result(struct perf_kvm *kvm)
649+static void print_result(struct perf_kvm_stat *kvm)
648650 {
649651 char decode[20];
650652 struct kvm_event *event;
@@ -687,7 +689,8 @@ static int process_sample_event(struct perf_tool *tool, · 36 unmodified lines
687689 struct machine *machine)
688690 {
689691 struct thread *thread = machine__findnew_thread(machine, sample->tid);
690− struct perf_kvm *kvm = container_of(tool, struct perf_kvm, tool);
692+ struct perf_kvm_stat *kvm = container_of(tool, struct perf_kvm_stat,
693+ tool);
691694
692695 if (thread == NULL) {
693696 pr_debug("problem processing %d event, skipping it.\n",
@@ -718,7 +721,7 @@ static int get_cpu_isa(struct perf_session *session) · 24 unmodified lines
718721 return isa;
719722 }
720723
721−static int read_events(struct perf_kvm *kvm)
724+static int read_events(struct perf_kvm_stat *kvm)
722725 {
723726 int ret;
724727
@@ -767,7 +770,7 @@ static bool verify_vcpu(int vcpu) · 42 unmodified lines
767770 return true;
768771 }
769772
770−static int kvm_events_report_vcpu(struct perf_kvm *kvm)
773+static int kvm_events_report_vcpu(struct perf_kvm_stat *kvm)
771774 {
772775 int ret = -EINVAL;
773776 int vcpu = kvm->trace_vcpu;
@@ -815,7 +818,8 @@ static const char * const record_args[] = { · 41 unmodified lines
815818 _p; \
816819 })
817820
818−static int kvm_events_record(struct perf_kvm *kvm, int argc, const char **argv)
821+static int
822+kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
819823 {
820824 unsigned int rec_argc, i, j;
821825 const char **rec_argv;
@@ -838,7 +842,8 @@ static int kvm_events_record(struct perf_kvm *kvm, int argc, const char **argv) · 16 unmodified lines
838842 return cmd_record(i, rec_argv, NULL);
839843 }
840844
841−static int kvm_events_report(struct perf_kvm *kvm, int argc, const char **argv)
845+static int
846+kvm_events_report(struct perf_kvm_stat *kvm, int argc, const char **argv)
842847 {
843848 const struct option kvm_events_report_options[] = {
844849 OPT_STRING(0, "event", &kvm->report_event, "report event",
@@ -881,24 +886,37 @@ static void print_kvm_stat_usage(void) · 36 unmodified lines
881886 printf("\nOtherwise, it is the alias of 'perf stat':\n");
882887 }
883888
884−static int kvm_cmd_stat(struct perf_kvm *kvm, int argc, const char **argv)
889+static int kvm_cmd_stat(const char *file_name, int argc, const char **argv)
885890 {
891+ struct perf_kvm_stat kvm = {
892+ .file_name = file_name,
893+
894+ .trace_vcpu = -1,
895+ .report_event = "vmexit",
896+ .sort_key = "sample",
897+
898+ .exit_reasons = svm_exit_reasons,
899+ .exit_reasons_size = ARRAY_SIZE(svm_exit_reasons),
900+ .exit_reasons_isa = "SVM",
901+ };
902+
886903 if (argc == 1) {
887904 print_kvm_stat_usage();
888905 goto perf_stat;
889906 }
890907
891908 if (!strncmp(argv[1], "rec", 3))
892− return kvm_events_record(kvm, argc - 1, argv + 1);
909+ return kvm_events_record(&kvm, argc - 1, argv + 1);
893910
894911 if (!strncmp(argv[1], "rep", 3))
895− return kvm_events_report(kvm, argc - 1 , argv + 1);
912+ return kvm_events_report(&kvm, argc - 1 , argv + 1);
896913
897914 perf_stat:
898915 return cmd_stat(argc, argv, NULL);
899916 }
917+#endif
900918
901−static int __cmd_record(struct perf_kvm *kvm, int argc, const char **argv)
919+static int __cmd_record(const char *file_name, int argc, const char **argv)
902920 {
903921 int rec_argc, i = 0, j;
904922 const char **rec_argv;
@@ -907,7 +925,7 @@ static int __cmd_record(struct perf_kvm *kvm, int argc, const char **argv) · 2 unmodified lines
907925 rec_argv = calloc(rec_argc + 1, sizeof(char *));
908926 rec_argv[i++] = strdup("record");
909927 rec_argv[i++] = strdup("-o");
910− rec_argv[i++] = strdup(kvm->file_name);
928+ rec_argv[i++] = strdup(file_name);
911929 for (j = 1; j < argc; j++, i++)
912930 rec_argv[i] = argv[j];
913931
@@ -916,7 +934,7 @@ static int __cmd_record(struct perf_kvm *kvm, int argc, const char **argv) · 2 unmodified lines
916934 return cmd_record(i, rec_argv, NULL);
917935 }
918936
919−static int __cmd_report(struct perf_kvm *kvm, int argc, const char **argv)
937+static int __cmd_report(const char *file_name, int argc, const char **argv)
920938 {
921939 int rec_argc, i = 0, j;
922940 const char **rec_argv;
@@ -925,7 +943,7 @@ static int __cmd_report(struct perf_kvm *kvm, int argc, const char **argv) · 2 unmodified lines
925943 rec_argv = calloc(rec_argc + 1, sizeof(char *));
926944 rec_argv[i++] = strdup("report");
927945 rec_argv[i++] = strdup("-i");
928− rec_argv[i++] = strdup(kvm->file_name);
946+ rec_argv[i++] = strdup(file_name);
929947 for (j = 1; j < argc; j++, i++)
930948 rec_argv[i] = argv[j];
931949
@@ -934,7 +952,8 @@ static int __cmd_report(struct perf_kvm *kvm, int argc, const char **argv) · 2 unmodified lines
934952 return cmd_report(i, rec_argv, NULL);
935953 }
936954
937−static int __cmd_buildid_list(struct perf_kvm *kvm, int argc, const char **argv)
955+static int
956+__cmd_buildid_list(const char *file_name, int argc, const char **argv)
938957 {
939958 int rec_argc, i = 0, j;
940959 const char **rec_argv;
@@ -943,7 +962,7 @@ static int __cmd_buildid_list(struct perf_kvm *kvm, int argc, const char **argv) · 2 unmodified lines
943962 rec_argv = calloc(rec_argc + 1, sizeof(char *));
944963 rec_argv[i++] = strdup("buildid-list");
945964 rec_argv[i++] = strdup("-i");
946− rec_argv[i++] = strdup(kvm->file_name);
965+ rec_argv[i++] = strdup(file_name);
947966 for (j = 1; j < argc; j++, i++)
948967 rec_argv[i] = argv[j];
949968
@@ -954,20 +973,12 @@ static int __cmd_buildid_list(struct perf_kvm *kvm, int argc, const char **argv) · 4 unmodified lines
954973
955974 int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused)
956975 {
957− struct perf_kvm kvm = {
958− .trace_vcpu = -1,
959− .report_event = "vmexit",
960− .sort_key = "sample",
961−
962− .exit_reasons = svm_exit_reasons,
963− .exit_reasons_size = ARRAY_SIZE(svm_exit_reasons),
964− .exit_reasons_isa = "SVM",
965− };
976+ const char *file_name;
966977
967978 const struct option kvm_options[] = {
968− OPT_STRING('i', "input", &kvm.file_name, "file",
979+ OPT_STRING('i', "input", &file_name, "file",
969980 "Input file name"),
970− OPT_STRING('o', "output", &kvm.file_name, "file",
981+ OPT_STRING('o', "output", &file_name, "file",
971982 "Output file name"),
972983 OPT_BOOLEAN(0, "guest", &perf_guest,
973984 "Collect guest os data"),
@@ -1002,32 +1013,34 @@ int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused) · 28 unmodified lines
10021013 if (!perf_host)
10031014 perf_guest = 1;
10041015
1005− if (!kvm.file_name) {
1016+ if (!file_name) {
10061017 if (perf_host && !perf_guest)
1007− kvm.file_name = strdup("perf.data.host");
1018+ file_name = strdup("perf.data.host");
10081019 else if (!perf_host && perf_guest)
1009− kvm.file_name = strdup("perf.data.guest");
1020+ file_name = strdup("perf.data.guest");
10101021 else
1011− kvm.file_name = strdup("perf.data.kvm");
1022+ file_name = strdup("perf.data.kvm");
10121023
1013− if (!kvm.file_name) {
1024+ if (!file_name) {
10141025 pr_err("Failed to allocate memory for filename\n");
10151026 return -ENOMEM;
10161027 }
10171028 }
10181029
10191030 if (!strncmp(argv[0], "rec", 3))
1020− return __cmd_record(&kvm, argc, argv);
1031+ return __cmd_record(file_name, argc, argv);
10211032 else if (!strncmp(argv[0], "rep", 3))
1022− return __cmd_report(&kvm, argc, argv);
1033+ return __cmd_report(file_name, argc, argv);
10231034 else if (!strncmp(argv[0], "diff", 4))
10241035 return cmd_diff(argc, argv, NULL);
10251036 else if (!strncmp(argv[0], "top", 3))
10261037 return cmd_top(argc, argv, NULL);
10271038 else if (!strncmp(argv[0], "buildid-list", 12))
1028− return __cmd_buildid_list(&kvm, argc, argv);
1039+ return __cmd_buildid_list(file_name, argc, argv);
1040+#if defined(__i386__) || defined(__x86_64__)
10291041 else if (!strncmp(argv[0], "stat", 4))
1030− return kvm_cmd_stat(&kvm, argc, argv);
1042+ return kvm_cmd_stat(file_name, argc, argv);
1043+#endif
10311044 else
10321045 usage_with_options(kvm_usage, kvm_options);
10331046
tools/perf/perf.h+3−12
@@ -5,8 +5,9 @@ struct winsize; · 4 unmodified lines
55
66 void get_term_dimensions(struct winsize *ws);
77
8+#include <asm/unistd.h>
9+
810 #if defined(__i386__)
9−#include "../../arch/x86/include/asm/unistd.h"
1011 #define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
1112 #define cpu_relax() asm volatile("rep; nop" ::: "memory");
1213 #define CPUINFO_PROC "model name"
@@ -16,7 +17,6 @@ void get_term_dimensions(struct winsize *ws); · 3 unmodified lines
1617 #endif
1718
1819 #if defined(__x86_64__)
19−#include "../../arch/x86/include/asm/unistd.h"
2020 #define rmb() asm volatile("lfence" ::: "memory")
2121 #define cpu_relax() asm volatile("rep; nop" ::: "memory");
2222 #define CPUINFO_PROC "model name"
@@ -33,13 +33,11 @@ void get_term_dimensions(struct winsize *ws); · 10 unmodified lines
3333 #endif
3434
3535 #ifdef __s390__
36−#include "../../arch/s390/include/asm/unistd.h"
3736 #define rmb() asm volatile("bcr 15,0" ::: "memory")
3837 #define cpu_relax() asm volatile("" ::: "memory");
3938 #endif
4039
4140 #ifdef __sh__
42−#include "../../arch/sh/include/asm/unistd.h"
4341 #if defined(__SH4A__) || defined(__SH5__)
4442 # define rmb() asm volatile("synco" ::: "memory")
4543 #else
@@ -50,35 +48,30 @@ void get_term_dimensions(struct winsize *ws); · 4 unmodified lines
5048 #endif
5149
5250 #ifdef __hppa__
53−#include "../../arch/parisc/include/asm/unistd.h"
5451 #define rmb() asm volatile("" ::: "memory")
5552 #define cpu_relax() asm volatile("" ::: "memory");
5653 #define CPUINFO_PROC "cpu"
5754 #endif
5855
5956 #ifdef __sparc__
60−#include "../../arch/sparc/include/uapi/asm/unistd.h"
6157 #define rmb() asm volatile("":::"memory")
6258 #define cpu_relax() asm volatile("":::"memory")
6359 #define CPUINFO_PROC "cpu"
6460 #endif
6561
6662 #ifdef __alpha__
67−#include "../../arch/alpha/include/asm/unistd.h"
6863 #define rmb() asm volatile("mb" ::: "memory")
6964 #define cpu_relax() asm volatile("" ::: "memory")
7065 #define CPUINFO_PROC "cpu model"
7166 #endif
7267
7368 #ifdef __ia64__
74−#include "../../arch/ia64/include/asm/unistd.h"
7569 #define rmb() asm volatile ("mf" ::: "memory")
7670 #define cpu_relax() asm volatile ("hint @pause" ::: "memory")
7771 #define CPUINFO_PROC "model name"
7872 #endif
7973
8074 #ifdef __arm__
81−#include "../../arch/arm/include/asm/unistd.h"
8275 /*
8376 * Use the __kuser_memory_barrier helper in the CPU helper page. See
8477 * arch/arm/kernel/entry-armv.S in the kernel source for details.
@@ -89,13 +82,11 @@ void get_term_dimensions(struct winsize *ws); · 4 unmodified lines
8982 #endif
9083
9184 #ifdef __aarch64__
92−#include "../../arch/arm64/include/asm/unistd.h"
9385 #define rmb() asm volatile("dmb ld" ::: "memory")
9486 #define cpu_relax() asm volatile("yield" ::: "memory")
9587 #endif
9688
9789 #ifdef __mips__
98−#include "../../arch/mips/include/asm/unistd.h"
9990 #define rmb() asm volatile( \
10091 ".set mips2\n\t" \
10192 "sync\n\t" \
@@ -112,7 +103,7 @@ void get_term_dimensions(struct winsize *ws); · 10 unmodified lines
112103 #include <sys/types.h>
113104 #include <sys/syscall.h>
114105
115−#include "../../include/uapi/linux/perf_event.h"
106+#include <linux/perf_event.h>
116107 #include "util/types.h"
117108 #include <stdbool.h>
118109
tools/perf/tests/parse-events.c+1−1
@@ -3,8 +3,8 @@ · 2 unmodified lines
33 #include "evsel.h"
44 #include "evlist.h"
55 #include "sysfs.h"
6−#include "../../../include/linux/hw_breakpoint.h"
76 #include "tests.h"
7+#include <linux/hw_breakpoint.h>
88
99 #define TEST_ASSERT_VAL(text, cond) \
1010 do { \
tools/perf/util/evsel.c+2−2
@@ -18,8 +18,8 @@ · 17 unmodified lines
1818 #include "cpumap.h"
1919 #include "thread_map.h"
2020 #include "target.h"
21−#include "../../../include/linux/hw_breakpoint.h"
22−#include "../../../include/uapi/linux/perf_event.h"
21+#include <linux/hw_breakpoint.h>
22+#include <linux/perf_event.h>
2323 #include "perf_regs.h"
2424
2525 #define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
tools/perf/util/evsel.h+1−1
@@ -4,7 +4,7 @@ · 3 unmodified lines
44 #include <linux/list.h>
55 #include <stdbool.h>
66 #include <stddef.h>
7−#include "../../../include/uapi/linux/perf_event.h"
7+#include <linux/perf_event.h>
88 #include "types.h"
99 #include "xyarray.h"
1010 #include "cgroup.h"
tools/perf/util/header.c+2−0
@@ -1379,6 +1379,8 @@ static void print_numa_topology(struct perf_header *ph, int fd __maybe_unused, · 1378 unmodified lines
13791379
13801380 str = tmp + 1;
13811381 fprintf(fp, "# node%u cpu list : %s\n", c, str);
1382+
1383+ str += strlen(str) + 1;
13821384 }
13831385 return;
13841386 error:
tools/perf/util/header.h+1−1
@@ -1,7 +1,7 @@
11 #ifndef __PERF_HEADER_H
22 #define __PERF_HEADER_H
33
4−#include "../../../include/uapi/linux/perf_event.h"
4+#include <linux/perf_event.h>
55 #include <sys/types.h>
66 #include <stdbool.h>
77 #include "types.h"
tools/perf/util/parse-events.c+1−1
@@ -1,4 +1,4 @@
1−#include "../../../include/linux/hw_breakpoint.h"
1+#include <linux/hw_breakpoint.h>
22 #include "util.h"
33 #include "../perf.h"
44 #include "evlist.h"
tools/perf/util/parse-events.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 #include <linux/list.h>
88 #include <stdbool.h>
99 #include "types.h"
10−#include "../../../include/uapi/linux/perf_event.h"
10+#include <linux/perf_event.h>
1111 #include "types.h"
1212
1313 struct list_head;
tools/perf/util/pmu.h+1−1
@@ -2,7 +2,7 @@ · 1 unmodified line
22 #define __PMU_H
33
44 #include <linux/bitops.h>
5−#include "../../../include/uapi/linux/perf_event.h"
5+#include <linux/perf_event.h>
66
77 enum {
88 PERF_PMU_FORMAT_VALUE_CONFIG,
tools/perf/util/session.h+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #include "symbol.h"
99 #include "thread.h"
1010 #include <linux/rbtree.h>
11−#include "../../../include/uapi/linux/perf_event.h"
11+#include <linux/perf_event.h>
1212
1313 struct sample_queue;
1414 struct ip_callchain;
tools/perf/util/strbuf.c+4−4
@@ -90,17 +90,17 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...) · 89 unmodified lines
9090 if (!strbuf_avail(sb))
9191 strbuf_grow(sb, 64);
9292 va_start(ap, fmt);
93− len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
93+ len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
9494 va_end(ap);
9595 if (len < 0)
96− die("your vscnprintf is broken");
96+ die("your vsnprintf is broken");
9797 if (len > strbuf_avail(sb)) {
9898 strbuf_grow(sb, len);
9999 va_start(ap, fmt);
100− len = vscnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
100+ len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
101101 va_end(ap);
102102 if (len > strbuf_avail(sb)) {
103− die("this should not happen, your snprintf is broken");
103+ die("this should not happen, your vsnprintf is broken");
104104 }
105105 }
106106 strbuf_setlen(sb, sb->len + len);
tools/power/x86/turbostat/turbostat.c+19−9
@@ -206,8 +206,10 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr) · 205 unmodified lines
206206 retval = pread(fd, msr, sizeof *msr, offset);
207207 close(fd);
208208
209− if (retval != sizeof *msr)
209+ if (retval != sizeof *msr) {
210+ fprintf(stderr, "%s offset 0x%zx read failed\n", pathname, offset);
210211 return -1;
212+ }
211213
212214 return 0;
213215 }
@@ -1101,7 +1103,9 @@ void turbostat_loop() · 887 unmodified lines
11011103
11021104 restart:
11031105 retval = for_all_cpus(get_counters, EVEN_COUNTERS);
1104− if (retval) {
1106+ if (retval < -1) {
1107+ exit(retval);
1108+ } else if (retval == -1) {
11051109 re_initialize();
11061110 goto restart;
11071111 }
@@ -1114,7 +1118,9 @@ restart: · 6 unmodified lines
11141118 }
11151119 sleep(interval_sec);
11161120 retval = for_all_cpus(get_counters, ODD_COUNTERS);
1117− if (retval) {
1121+ if (retval < -1) {
1122+ exit(retval);
1123+ } else if (retval == -1) {
11181124 re_initialize();
11191125 goto restart;
11201126 }
@@ -1126,7 +1132,9 @@ restart: · 5 unmodified lines
11261132 flush_stdout();
11271133 sleep(interval_sec);
11281134 retval = for_all_cpus(get_counters, EVEN_COUNTERS);
1129− if (retval) {
1135+ if (retval < -1) {
1136+ exit(retval);
1137+ } else if (retval == -1) {
11301138 re_initialize();
11311139 goto restart;
11321140 }
@@ -1545,8 +1553,11 @@ void turbostat_init() · 412 unmodified lines
15451553 int fork_it(char **argv)
15461554 {
15471555 pid_t child_pid;
1556+ int status;
15481557
1549− for_all_cpus(get_counters, EVEN_COUNTERS);
1558+ status = for_all_cpus(get_counters, EVEN_COUNTERS);
1559+ if (status)
1560+ exit(status);
15501561 /* clear affinity side-effect of get_counters() */
15511562 sched_setaffinity(0, cpu_present_setsize, cpu_present_set);
15521563 gettimeofday(&tv_even, (struct timezone *)NULL);
@@ -1556,7 +1567,6 @@ int fork_it(char **argv) · 3 unmodified lines
15561567 /* child */
15571568 execvp(argv[0], argv);
15581569 } else {
1559− int status;
15601570
15611571 /* parent */
15621572 if (child_pid == -1) {
@@ -1568,7 +1578,7 @@ int fork_it(char **argv) · 5 unmodified lines
15681578 signal(SIGQUIT, SIG_IGN);
15691579 if (waitpid(child_pid, &status, 0) == -1) {
15701580 perror("wait");
1571− exit(1);
1581+ exit(status);
15721582 }
15731583 }
15741584 /*
@@ -1585,7 +1595,7 @@ int fork_it(char **argv) · 10 unmodified lines
15851595
15861596 fprintf(stderr, "%.6f sec\n", tv_delta.tv_sec + tv_delta.tv_usec/1000000.0);
15871597
1588− return 0;
1598+ return status;
15891599 }
15901600
15911601 void cmdline(int argc, char **argv)
@@ -1594,7 +1604,7 @@ void cmdline(int argc, char **argv) · 2 unmodified lines
15941604
15951605 progname = argv[0];
15961606
1597− while ((opt = getopt(argc, argv, "+pPSvisc:sC:m:M:")) != -1) {
1607+ while ((opt = getopt(argc, argv, "+pPSvi:sc:sC:m:M:")) != -1) {
15981608 switch (opt) {
15991609 case 'p':
16001610 show_core_only++;
tools/testing/ktest/ktest.pl+4−2
@@ -1740,8 +1740,10 @@ sub install { · 1739 unmodified lines
17401740 open(IN, "$output_config") or dodie("Can't read config file");
17411741 while (<IN>) {
17421742 if (/CONFIG_MODULES(=y)?/) {
1743− $install_mods = 1 if (defined($1));
1744− last;
1743+ if (defined($1)) {
1744+ $install_mods = 1;
1745+ last;
1746+ }
17451747 }
17461748 }
17471749 close(IN);
tools/testing/selftests/Makefile+1−1
@@ -1,4 +1,4 @@
1−TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug epoll
1+TARGETS = breakpoints kcmp mqueue vm cpu-hotplug memory-hotplug
22
33 all:
44 for TARGET in $(TARGETS); do \
tools/testing/selftests/epoll/Makefile+0−11
@@ -1,11 +0,0 @@
1−# Makefile for epoll selftests
2−
3−all: test_epoll
4−%: %.c
5− gcc -pthread -g -o $@ $^
6−
7−run_tests: all
8− ./test_epoll
9−
10−clean:
11− $(RM) test_epoll
tools/testing/selftests/epoll/test_epoll.c+0−344
@@ -1,344 +0,0 @@
1−/*
2− * tools/testing/selftests/epoll/test_epoll.c
3− *
4− * Copyright 2012 Adobe Systems Incorporated
5− *
6− * This program is free software; you can redistribute it and/or modify
7− * it under the terms of the GNU General Public License as published by
8− * the Free Software Foundation; either version 2 of the License, or
9− * (at your option) any later version.
10− *
11− * Paton J. Lewis <palewis@adobe.com>
12− *
13− */
14−
15−#include <errno.h>
16−#include <fcntl.h>
17−#include <pthread.h>
18−#include <stdio.h>
19−#include <stdlib.h>
20−#include <unistd.h>
21−#include <sys/epoll.h>
22−#include <sys/socket.h>
23−
24−/*
25− * A pointer to an epoll_item_private structure will be stored in the epoll
26− * item's event structure so that we can get access to the epoll_item_private
27− * data after calling epoll_wait:
28− */
29−struct epoll_item_private {
30− int index; /* Position of this struct within the epoll_items array. */
31− int fd;
32− uint32_t events;
33− pthread_mutex_t mutex; /* Guards the following variables... */
34− int stop;
35− int status; /* Stores any error encountered while handling item. */
36− /* The following variable allows us to test whether we have encountered
37− a problem while attempting to cancel and delete the associated
38− event. When the test program exits, 'deleted' should be exactly
39− one. If it is greater than one, then the failed test reflects a real
40− world situation where we would have tried to access the epoll item's
41− private data after deleting it: */
42− int deleted;
43−};
44−
45−struct epoll_item_private *epoll_items;
46−
47−/*
48− * Delete the specified item from the epoll set. In a real-world secneario this
49− * is where we would free the associated data structure, but in this testing
50− * environment we retain the structure so that we can test for double-deletion:
51− */
52−void delete_item(int index)
53−{
54− __sync_fetch_and_add(&epoll_items[index].deleted, 1);
55−}
56−
57−/*
58− * A pointer to a read_thread_data structure will be passed as the argument to
59− * each read thread:
60− */
61−struct read_thread_data {
62− int stop;
63− int status; /* Indicates any error encountered by the read thread. */
64− int epoll_set;
65−};
66−
67−/*
68− * The function executed by the read threads:
69− */
70−void *read_thread_function(void *function_data)
71−{
72− struct read_thread_data *thread_data =
73− (struct read_thread_data *)function_data;
74− struct epoll_event event_data;
75− struct epoll_item_private *item_data;
76− char socket_data;
77−
78− /* Handle events until we encounter an error or this thread's 'stop'
79− condition is set: */
80− while (1) {
81− int result = epoll_wait(thread_data->epoll_set,
82− &event_data,
83− 1, /* Number of desired events */
84− 1000); /* Timeout in ms */
85− if (result < 0) {
86− /* Breakpoints signal all threads. Ignore that while
87− debugging: */
88− if (errno == EINTR)
89− continue;
90− thread_data->status = errno;
91− return 0;
92− } else if (thread_data->stop)
93− return 0;
94− else if (result == 0) /* Timeout */
95− continue;
96−
97− /* We need the mutex here because checking for the stop
98− condition and re-enabling the epoll item need to be done
99− together as one atomic operation when EPOLL_CTL_DISABLE is
100− available: */
101− item_data = (struct epoll_item_private *)event_data.data.ptr;
102− pthread_mutex_lock(&item_data->mutex);
103−
104− /* Remove the item from the epoll set if we want to stop
105− handling that event: */
106− if (item_data->stop)
107− delete_item(item_data->index);
108− else {
109− /* Clear the data that was written to the other end of
110− our non-blocking socket: */
111− do {
112− if (read(item_data->fd, &socket_data, 1) < 1) {
113− if ((errno == EAGAIN) ||
114− (errno == EWOULDBLOCK))
115− break;
116− else
117− goto error_unlock;
118− }
119− } while (item_data->events & EPOLLET);
120−
121− /* The item was one-shot, so re-enable it: */
122− event_data.events = item_data->events;
123− if (epoll_ctl(thread_data->epoll_set,
124− EPOLL_CTL_MOD,
125− item_data->fd,
126− &event_data) < 0)
127− goto error_unlock;
128− }
129−
130− pthread_mutex_unlock(&item_data->mutex);
131− }
132−
133−error_unlock:
134− thread_data->status = item_data->status = errno;
135− pthread_mutex_unlock(&item_data->mutex);
136− return 0;
137−}
138−
139−/*
140− * A pointer to a write_thread_data structure will be passed as the argument to
141− * the write thread:
142− */
143−struct write_thread_data {
144− int stop;
145− int status; /* Indicates any error encountered by the write thread. */
146− int n_fds;
147− int *fds;
148−};
149−
150−/*
151− * The function executed by the write thread. It writes a single byte to each
152− * socket in turn until the stop condition for this thread is set. If writing to
153− * a socket would block (i.e. errno was EAGAIN), we leave that socket alone for
154− * the moment and just move on to the next socket in the list. We don't care
155− * about the order in which we deliver events to the epoll set. In fact we don't
156− * care about the data we're writing to the pipes at all; we just want to
157− * trigger epoll events:
158− */
159−void *write_thread_function(void *function_data)
160−{
161− const char data = 'X';
162− int index;
163− struct write_thread_data *thread_data =
164− (struct write_thread_data *)function_data;
165− while (!write_thread_data->stop)
166− for (index = 0;
167− !thread_data->stop && (index < thread_data->n_fds);
168− ++index)
169− if ((write(thread_data->fds[index], &data, 1) < 1) &&
170− (errno != EAGAIN) &&
171− (errno != EWOULDBLOCK)) {
172− write_thread_data->status = errno;
173− return;
174− }
175−}
176−
177−/*
178− * Arguments are currently ignored:
179− */
180−int main(int argc, char **argv)
181−{
182− const int n_read_threads = 100;
183− const int n_epoll_items = 500;
184− int index;
185− int epoll_set = epoll_create1(0);
186− struct write_thread_data write_thread_data = {
187− 0, 0, n_epoll_items, malloc(n_epoll_items * sizeof(int))
188− };
189− struct read_thread_data *read_thread_data =
190− malloc(n_read_threads * sizeof(struct read_thread_data));
191− pthread_t *read_threads = malloc(n_read_threads * sizeof(pthread_t));
192− pthread_t write_thread;
193−
194− printf("-----------------\n");
195− printf("Runing test_epoll\n");
196− printf("-----------------\n");
197−
198− epoll_items = malloc(n_epoll_items * sizeof(struct epoll_item_private));
199−
200− if (epoll_set < 0 || epoll_items == 0 || write_thread_data.fds == 0 ||
201− read_thread_data == 0 || read_threads == 0)
202− goto error;
203−
204− if (sysconf(_SC_NPROCESSORS_ONLN) < 2) {
205− printf("Error: please run this test on a multi-core system.\n");
206− goto error;
207− }
208−
209− /* Create the socket pairs and epoll items: */
210− for (index = 0; index < n_epoll_items; ++index) {
211− int socket_pair[2];
212− struct epoll_event event_data;
213− if (socketpair(AF_UNIX,
214− SOCK_STREAM | SOCK_NONBLOCK,
215− 0,
216− socket_pair) < 0)
217− goto error;
218− write_thread_data.fds[index] = socket_pair[0];
219− epoll_items[index].index = index;
220− epoll_items[index].fd = socket_pair[1];
221− if (pthread_mutex_init(&epoll_items[index].mutex, NULL) != 0)
222− goto error;
223− /* We always use EPOLLONESHOT because this test is currently
224− structured to demonstrate the need for EPOLL_CTL_DISABLE,
225− which only produces useful information in the EPOLLONESHOT
226− case (without EPOLLONESHOT, calling epoll_ctl with
227− EPOLL_CTL_DISABLE will never return EBUSY). If support for
228− testing events without EPOLLONESHOT is desired, it should
229− probably be implemented in a separate unit test. */
230− epoll_items[index].events = EPOLLIN | EPOLLONESHOT;
231− if (index < n_epoll_items / 2)
232− epoll_items[index].events |= EPOLLET;
233− epoll_items[index].stop = 0;
234− epoll_items[index].status = 0;
235− epoll_items[index].deleted = 0;
236− event_data.events = epoll_items[index].events;
237− event_data.data.ptr = &epoll_items[index];
238− if (epoll_ctl(epoll_set,
239− EPOLL_CTL_ADD,
240− epoll_items[index].fd,
241− &event_data) < 0)
242− goto error;
243− }
244−
245− /* Create and start the read threads: */
246− for (index = 0; index < n_read_threads; ++index) {
247− read_thread_data[index].stop = 0;
248− read_thread_data[index].status = 0;
249− read_thread_data[index].epoll_set = epoll_set;
250− if (pthread_create(&read_threads[index],
251− NULL,
252− read_thread_function,
253− &read_thread_data[index]) != 0)
254− goto error;
255− }
256−
257− if (pthread_create(&write_thread,
258− NULL,
259− write_thread_function,
260− &write_thread_data) != 0)
261− goto error;
262−
263− /* Cancel all event pollers: */
264−#ifdef EPOLL_CTL_DISABLE
265− for (index = 0; index < n_epoll_items; ++index) {
266− pthread_mutex_lock(&epoll_items[index].mutex);
267− ++epoll_items[index].stop;
268− if (epoll_ctl(epoll_set,
269− EPOLL_CTL_DISABLE,
270− epoll_items[index].fd,
271− NULL) == 0)
272− delete_item(index);
273− else if (errno != EBUSY) {
274− pthread_mutex_unlock(&epoll_items[index].mutex);
275− goto error;
276− }
277− /* EBUSY means events were being handled; allow the other thread
278− to delete the item. */
279− pthread_mutex_unlock(&epoll_items[index].mutex);
280− }
281−#else
282− for (index = 0; index < n_epoll_items; ++index) {
283− pthread_mutex_lock(&epoll_items[index].mutex);
284− ++epoll_items[index].stop;
285− pthread_mutex_unlock(&epoll_items[index].mutex);
286− /* Wait in case a thread running read_thread_function is
287− currently executing code between epoll_wait and
288− pthread_mutex_lock with this item. Note that a longer delay
289− would make double-deletion less likely (at the expense of
290− performance), but there is no guarantee that any delay would
291− ever be sufficient. Note also that we delete all event
292− pollers at once for testing purposes, but in a real-world
293− environment we are likely to want to be able to cancel event
294− pollers at arbitrary times. Therefore we can't improve this
295− situation by just splitting this loop into two loops
296− (i.e. signal 'stop' for all items, sleep, and then delete all
297− items). We also can't fix the problem via EPOLL_CTL_DEL
298− because that command can't prevent the case where some other
299− thread is executing read_thread_function within the region
300− mentioned above: */
301− usleep(1);
302− pthread_mutex_lock(&epoll_items[index].mutex);
303− if (!epoll_items[index].deleted)
304− delete_item(index);
305− pthread_mutex_unlock(&epoll_items[index].mutex);
306− }
307−#endif
308−
309− /* Shut down the read threads: */
310− for (index = 0; index < n_read_threads; ++index)
311− __sync_fetch_and_add(&read_thread_data[index].stop, 1);
312− for (index = 0; index < n_read_threads; ++index) {
313− if (pthread_join(read_threads[index], NULL) != 0)
314− goto error;
315− if (read_thread_data[index].status)
316− goto error;
317− }
318−
319− /* Shut down the write thread: */
320− __sync_fetch_and_add(&write_thread_data.stop, 1);
321− if ((pthread_join(write_thread, NULL) != 0) || write_thread_data.status)
322− goto error;
323−
324− /* Check for final error conditions: */
325− for (index = 0; index < n_epoll_items; ++index) {
326− if (epoll_items[index].status != 0)
327− goto error;
328− if (pthread_mutex_destroy(&epoll_items[index].mutex) < 0)
329− goto error;
330− }
331− for (index = 0; index < n_epoll_items; ++index)
332− if (epoll_items[index].deleted != 1) {
333− printf("Error: item data deleted %1d times.\n",
334− epoll_items[index].deleted);
335− goto error;
336− }
337−
338− printf("[PASS]\n");
339− return 0;
340−
341− error:
342− printf("[FAIL]\n");
343− return errno;
344−}
tools/vm/page-types.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 #include <sys/mount.h>
3636 #include <sys/statfs.h>
3737 #include "../../include/uapi/linux/magic.h"
38−#include "../../include/linux/kernel-page-flags.h"
38+#include "../../include/uapi/linux/kernel-page-flags.h"
3939
4040
4141 #ifndef MAX_PATH

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t