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

Pull perf/urgent fixes from Arnaldo Carvalho de Melo: perf trace: Arnaldo Carvalho de Melo: Fix handling of probe:vfs_getname when the probed routine is inlined in multiple places, fixing the collection of the 'filename' parameter in open syscalls. perf test: Gustavo A. R. Silva: Fix bitwise operator usage in evsel-tp-sched test, which made tat test always detect fields as signed. Jiri Olsa: Filter out hidden symbols from labels, added in systems where the annobin plugin is used, such as RHEL8, which, if left in place make the DWARF unwind 'perf test' to fail on PPC. Tony Jones: Fix 'perf_event_attr' tests when building with python3. perf mem/c2c: Ravi Bangoria: Fix perf_mem_events on PowerPC. tools headers UAPI: Arnaldo Carvalho de Melo: Sync linux/in.h copy from the kernel sources, silencing a perf build warning.

Ingo Molnar committed 7 years ago

Commit 3bb26002 parents 9dff0aa 8f2f35011 files · +88 −30Browse files

Unified · Split

11 files

tools/include/uapi/linux/in.h +1 −1
tools/perf/Documentation/perf-c2c.txt +12 −4
tools/perf/Documentation/perf-mem.txt +1 −1
tools/perf/arch/powerpc/util/Build +1 −0
tools/perf/arch/powerpc/util/mem-events.c +11 −0
tools/perf/builtin-trace.c +18 −7
tools/perf/tests/attr.py +19 −13
tools/perf/tests/evsel-tp-sched.c +1 −1
tools/perf/util/c++/clang.cpp +1 −1
tools/perf/util/mem-events.c +1 −1
tools/perf/util/symbol-elf.c +22 −1

tools/include/uapi/linux/in.h+1−1

@@ -268,7 +268,7 @@ struct sockaddr_in { · 267 unmodified lines
268	268	#define IN_MULTICAST(a) IN_CLASSD(a)
269	269	#define IN_MULTICAST_NET 0xe0000000
270	270
271		−#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff)
	271	+#define IN_BADCLASS(a) (((long int) (a) ) == (long int)0xffffffff)
272	272	#define IN_EXPERIMENTAL(a) IN_BADCLASS((a))
273	273
274	274	#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)

tools/perf/Documentation/perf-c2c.txt+12−4

@@ -19,8 +19,11 @@ C2C stands for Cache To Cache. · 18 unmodified lines
19	19	The perf c2c tool provides means for Shared Data C2C/HITM analysis. It allows
20	20	you to track down the cacheline contentions.
21	21
22		−The tool is based on x86's load latency and precise store facility events
23		−provided by Intel CPUs. These events provide:
	22	+On x86, the tool is based on load latency and precise store facility events
	23	+provided by Intel CPUs. On PowerPC, the tool uses random instruction sampling
	24	+with thresholding feature.
	25	+
	26	+These events provide:
24	27	- memory address of the access
25	28	- type of the access (load and store details)
26	29	- latency (in cycles) of the load access
@@ -46,7 +49,7 @@ RECORD OPTIONS · 19 unmodified lines
46	49
47	50	-l::
48	51	--ldlat::
49		− Configure mem-loads latency.
	52	+ Configure mem-loads latency. (x86 only)
50	53
51	54	-k::
52	55	--all-kernel::
@@ -119,11 +122,16 @@ Following perf record options are configured by default: · 66 unmodified lines
119	122	-W,-d,--phys-data,--sample-cpu
120	123
121	124	Unless specified otherwise with '-e' option, following events are monitored by
122		−default:
	125	+default on x86:
123	126
124	127	cpu/mem-loads,ldlat=30/P
125	128	cpu/mem-stores/P
126	129
	130	+and following on PowerPC:
	131	+
	132	+ cpu/mem-loads/
	133	+ cpu/mem-stores/
	134	+
127	135	User can pass any 'perf record' option behind '--' mark, like (to enable
128	136	callchains and system wide monitoring):
129	137

tools/perf/Documentation/perf-mem.txt+1−1

@@ -82,7 +82,7 @@ RECORD OPTIONS · 81 unmodified lines
82	82	Be more verbose (show counter open errors, etc)
83	83
84	84	--ldlat <n>::
85		− Specify desired latency for loads event.
	85	+ Specify desired latency for loads event. (x86 only)
86	86
87	87	In addition, for report all perf report options are valid, and for record
88	88	all perf record options.

tools/perf/arch/powerpc/util/Build+1−0

@@ -2,6 +2,7 @@ libperf-y += header.o · 1 unmodified line
2	2	libperf-y += sym-handling.o
3	3	libperf-y += kvm-stat.o
4	4	libperf-y += perf_regs.o
	5	+libperf-y += mem-events.o
5	6
6	7	libperf-$(CONFIG_DWARF) += dwarf-regs.o
7	8	libperf-$(CONFIG_DWARF) += skip-callchain-idx.o

tools/perf/arch/powerpc/util/mem-events.c+11−0

@@ -0,0 +1,11 @@
	1	+// SPDX-License-Identifier: GPL-2.0
	2	+#include "mem-events.h"
	3	+
	4	+/* PowerPC does not support 'ldlat' parameter. */
	5	+char *perf_mem_events__name(int i)
	6	+{
	7	+ if (i == PERF_MEM_EVENTS__LOAD)
	8	+ return (char *) "cpu/mem-loads/";
	9	+
	10	+ return (char *) "cpu/mem-stores/";
	11	+}

tools/perf/builtin-trace.c+18−7

@@ -2514,19 +2514,30 @@ static size_t trace__fprintf_thread_summary(struct trace trace, FILE fp); · 2513 unmodified lines
2514	2514
2515	2515	static bool perf_evlist__add_vfs_getname(struct perf_evlist *evlist)
2516	2516	{
2517		− struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname");
	2517	+ bool found = false;
	2518	+ struct perf_evsel evsel, tmp;
	2519	+ struct parse_events_error err = { .idx = 0, };
	2520	+ int ret = parse_events(evlist, "probe:vfs_getname*", &err);
2518	2521
2519		− if (IS_ERR(evsel))
	2522	+ if (ret)
2520	2523	return false;
2521	2524
2522		− if (perf_evsel__field(evsel, "pathname") == NULL) {
	2525	+ evlist__for_each_entry_safe(evlist, evsel, tmp) {
	2526	+ if (!strstarts(perf_evsel__name(evsel), "probe:vfs_getname"))
	2527	+ continue;
	2528	+
	2529	+ if (perf_evsel__field(evsel, "pathname")) {
	2530	+ evsel->handler = trace__vfs_getname;
	2531	+ found = true;
	2532	+ continue;
	2533	+ }
	2534	+
	2535	+ list_del_init(&evsel->node);
	2536	+ evsel->evlist = NULL;
2523	2537	perf_evsel__delete(evsel);
2524		− return false;
2525	2538	}
2526	2539
2527		− evsel->handler = trace__vfs_getname;
2528		− perf_evlist__add(evlist, evsel);
2529		− return true;
	2540	+ return found;
2530	2541	}
2531	2542
2532	2543	static struct perf_evsel *perf_evsel__new_pgfault(u64 config)

tools/perf/tests/attr.py+19−13

@@ -1,6 +1,8 @@
1	1	#! /usr/bin/python
2	2	# SPDX-License-Identifier: GPL-2.0
3	3
	4	+from __future__ import print_function
	5	+
4	6	import os
5	7	import sys
6	8	import glob
@@ -8,7 +10,11 @@ import optparse · 1 unmodified line
8	10	import tempfile
9	11	import logging
10	12	import shutil
11		−import ConfigParser
	13	+
	14	+try:
	15	+ import configparser
	16	+except ImportError:
	17	+ import ConfigParser as configparser
12	18
13	19	def data_equal(a, b):
14	20	# Allow multiple values in assignment separated by '\|'
@@ -100,20 +106,20 @@ class Event(dict): · 85 unmodified lines
100	106	def equal(self, other):
101	107	for t in Event.terms:
102	108	log.debug(" [%s] %s %s" % (t, self[t], other[t]));
103		− if not self.has_key(t) or not other.has_key(t):
	109	+ if t not in self or t not in other:
104	110	return False
105	111	if not data_equal(self[t], other[t]):
106	112	return False
107	113	return True
108	114
109	115	def optional(self):
110		− if self.has_key('optional') and self['optional'] == '1':
	116	+ if 'optional' in self and self['optional'] == '1':
111	117	return True
112	118	return False
113	119
114	120	def diff(self, other):
115	121	for t in Event.terms:
116		− if not self.has_key(t) or not other.has_key(t):
	122	+ if t not in self or t not in other:
117	123	continue
118	124	if not data_equal(self[t], other[t]):
119	125	log.warning("expected %s=%s, got %s" % (t, self[t], other[t]))
@@ -134,7 +140,7 @@ class Event(dict): · 14 unmodified lines
134	140	# - expected values assignments
135	141	class Test(object):
136	142	def __init__(self, path, options):
137		− parser = ConfigParser.SafeConfigParser()
	143	+ parser = configparser.SafeConfigParser()
138	144	parser.read(path)
139	145
140	146	log.warning("running '%s'" % path)
@@ -193,7 +199,7 @@ class Test(object): · 52 unmodified lines
193	199	return True
194	200
195	201	def load_events(self, path, events):
196		− parser_event = ConfigParser.SafeConfigParser()
	202	+ parser_event = configparser.SafeConfigParser()
197	203	parser_event.read(path)
198	204
199	205	# The event record section header contains 'event' word,
@@ -207,7 +213,7 @@ class Test(object): · 7 unmodified lines
207	213	# Read parent event if there's any
208	214	if (':' in section):
209	215	base = section[section.index(':') + 1:]
210		− parser_base = ConfigParser.SafeConfigParser()
	216	+ parser_base = configparser.SafeConfigParser()
211	217	parser_base.read(self.test_dir + '/' + base)
212	218	base_items = parser_base.items('event')
213	219
@@ -322,9 +328,9 @@ def run_tests(options): · 108 unmodified lines
322	328	for f in glob.glob(options.test_dir + '/' + options.test):
323	329	try:
324	330	Test(f, options).run()
325		− except Unsup, obj:
	331	+ except Unsup as obj:
326	332	log.warning("unsupp %s" % obj.getMsg())
327		− except Notest, obj:
	333	+ except Notest as obj:
328	334	log.warning("skipped %s" % obj.getMsg())
329	335
330	336	def setup_log(verbose):
@@ -363,7 +369,7 @@ def main(): · 32 unmodified lines
363	369	parser.add_option("-p", "--perf",
364	370	action="store", type="string", dest="perf")
365	371	parser.add_option("-v", "--verbose",
366		− action="count", dest="verbose")
	372	+ default=0, action="count", dest="verbose")
367	373
368	374	options, args = parser.parse_args()
369	375	if args:
@@ -373,7 +379,7 @@ def main(): · 3 unmodified lines
373	379	setup_log(options.verbose)
374	380
375	381	if not options.test_dir:
376		− print 'FAILED no -d option specified'
	382	+ print('FAILED no -d option specified')
377	383	sys.exit(-1)
378	384
379	385	if not options.test:
@@ -382,8 +388,8 @@ def main(): · 2 unmodified lines
382	388	try:
383	389	run_tests(options)
384	390
385		− except Fail, obj:
386		− print "FAILED %s" % obj.getMsg();
	391	+ except Fail as obj:
	392	+ print("FAILED %s" % obj.getMsg())
387	393	sys.exit(-1)
388	394
389	395	sys.exit(0)

tools/perf/tests/evsel-tp-sched.c+1−1

@@ -17,7 +17,7 @@ static int perf_evsel__test_field(struct perf_evsel evsel, const char name, · 16 unmodified lines
17	17	return -1;
18	18	}
19	19
20		− is_signed = !!(field->flags \| TEP_FIELD_IS_SIGNED);
	20	+ is_signed = !!(field->flags & TEP_FIELD_IS_SIGNED);
21	21	if (should_be_signed && !is_signed) {
22	22	pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",
23	23	evsel->name, name, is_signed, should_be_signed);

tools/perf/util/c++/clang.cpp+1−1

@@ -160,7 +160,7 @@ getBPFObjectFromModule(llvm::Module *Module) · 159 unmodified lines
160	160	}
161	161	PM.run(*Module);
162	162
163		− return std::move(Buffer);
	163	+ return Buffer;
164	164	}
165	165
166	166	}

tools/perf/util/mem-events.c+1−1

@@ -28,7 +28,7 @@ struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = { · 27 unmodified lines
28	28	static char mem_loads_name[100];
29	29	static bool mem_loads_name__init;
30	30
31		−char *perf_mem_events__name(int i)
	31	+char * __weak perf_mem_events__name(int i)
32	32	{
33	33	if (i == PERF_MEM_EVENTS__LOAD) {
34	34	if (!mem_loads_name__init) {

tools/perf/util/symbol-elf.c+22−1

@@ -19,6 +19,20 @@ · 18 unmodified lines
19	19	#define EM_AARCH64 183 /* ARM 64 bit */
20	20	#endif
21	21
	22	+#ifndef ELF32_ST_VISIBILITY
	23	+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03)
	24	+#endif
	25	+
	26	+/* For ELF64 the definitions are the same. */
	27	+#ifndef ELF64_ST_VISIBILITY
	28	+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o)
	29	+#endif
	30	+
	31	+/* How to extract information held in the st_other field. */
	32	+#ifndef GELF_ST_VISIBILITY
	33	+#define GELF_ST_VISIBILITY(val) ELF64_ST_VISIBILITY (val)
	34	+#endif
	35	+
22	36	typedef Elf64_Nhdr GElf_Nhdr;
23	37
24	38	#ifdef HAVE_CPLUS_DEMANGLE_SUPPORT
@@ -87,6 +101,11 @@ static inline uint8_t elf_sym__type(const GElf_Sym *sym) · 62 unmodified lines
87	101	return GELF_ST_TYPE(sym->st_info);
88	102	}
89	103
	104	+static inline uint8_t elf_sym__visibility(const GElf_Sym *sym)
	105	+{
	106	+ return GELF_ST_VISIBILITY(sym->st_other);
	107	+}
	108	+
90	109	#ifndef STT_GNU_IFUNC
91	110	#define STT_GNU_IFUNC 10
92	111	#endif
@@ -111,7 +130,9 @@ static inline int elf_sym__is_label(const GElf_Sym *sym) · 18 unmodified lines
111	130	return elf_sym__type(sym) == STT_NOTYPE &&
112	131	sym->st_name != 0 &&
113	132	sym->st_shndx != SHN_UNDEF &&
114		− sym->st_shndx != SHN_ABS;
	133	+ sym->st_shndx != SHN_ABS &&
	134	+ elf_sym__visibility(sym) != STV_HIDDEN &&
	135	+ elf_sym__visibility(sym) != STV_INTERNAL;
115	136	}
116	137
117	138	static bool elf_sym__filter(GElf_Sym *sym)

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code