History

Merge tag 'perf-urgent-for-mingo-5.6-20200309' 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 probe: Masami Hiramatsu: - Fix deletion of multiple probe events. - Fix userspace libraries handling by not depending on dwfl_module_addrsym(). Event parsing: Ian Rogers: - Fix reading of invalid memory in event parsing. python binding: Ilie Halip: - Fix clang detection when using CC=clang-version. build: Masami Hiramatsu: - Fix O= use with relative paths. Android: Dominik b. Czarnota: - Fix off by one in strncpy() size argument when handling Android libraries.

Ingo Molnar committed 6 years ago

Commit db5d85c2 parents ac309e7 1efde277 files · +44 −34Browse files

Unified · Split

7 files
  1. tools/perf/Makefile +1 −1
  2. tools/perf/util/map.c +1 −1
  3. tools/perf/util/parse-events.c +23 −23
  4. tools/perf/util/probe-file.c +3 −0
  5. tools/perf/util/probe-finder.c +8 −3
  6. tools/perf/util/setup.py +6 −4
  7. tools/scripts/Makefile.include +2 −2
tools/perf/Makefile+1−1
@@ -35,7 +35,7 @@ endif · 34 unmodified lines
35# Only pass canonical directory names as the output directory:35# Only pass canonical directory names as the output directory:
36#36#
37ifneq ($(O),)37ifneq ($(O),)
38 FULL_O := $(shell readlink -f $(O) || echo $(O))38 FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))
39endif39endif
40 40
41#41#
tools/perf/util/map.c+1−1
@@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename) · 88 unmodified lines
89 return true;89 return true;
90 }90 }
91 91
92 if (!strncmp(filename, "/system/lib/", 11)) {92 if (!strncmp(filename, "/system/lib/", 12)) {
93 char *ndk, *app;93 char *ndk, *app;
94 const char *arch;94 const char *arch;
95 size_t ndk_length;95 size_t ndk_length;
tools/perf/util/parse-events.c+23−23
@@ -1213,7 +1213,7 @@ static int config_attr(struct perf_event_attr *attr, · 1212 unmodified lines
1213static int get_config_terms(struct list_head *head_config,1213static int get_config_terms(struct list_head *head_config,
1214 struct list_head *head_terms __maybe_unused)1214 struct list_head *head_terms __maybe_unused)
1215{1215{
1216#define ADD_CONFIG_TERM(__type) \1216#define ADD_CONFIG_TERM(__type, __weak) \
1217 struct perf_evsel_config_term *__t; \1217 struct perf_evsel_config_term *__t; \
1218 \1218 \
1219 __t = zalloc(sizeof(*__t)); \1219 __t = zalloc(sizeof(*__t)); \
@@ -1222,18 +1222,18 @@ static int get_config_terms(struct list_head *head_config, · 2 unmodified lines
1222 \1222 \
1223 INIT_LIST_HEAD(&__t->list); \1223 INIT_LIST_HEAD(&__t->list); \
1224 __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \1224 __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
1225 __t->weak = term->weak; \1225 __t->weak = __weak; \
1226 list_add_tail(&__t->list, head_terms)1226 list_add_tail(&__t->list, head_terms)
1227 1227
1228#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \1228#define ADD_CONFIG_TERM_VAL(__type, __name, __val, __weak) \
1229do { \1229do { \
1230 ADD_CONFIG_TERM(__type); \1230 ADD_CONFIG_TERM(__type, __weak); \
1231 __t->val.__name = __val; \1231 __t->val.__name = __val; \
1232} while (0)1232} while (0)
1233 1233
1234#define ADD_CONFIG_TERM_STR(__type, __val) \1234#define ADD_CONFIG_TERM_STR(__type, __val, __weak) \
1235do { \1235do { \
1236 ADD_CONFIG_TERM(__type); \1236 ADD_CONFIG_TERM(__type, __weak); \
1237 __t->val.str = strdup(__val); \1237 __t->val.str = strdup(__val); \
1238 if (!__t->val.str) { \1238 if (!__t->val.str) { \
1239 zfree(&__t); \1239 zfree(&__t); \
@@ -1247,62 +1247,62 @@ do { \ · 7 unmodified lines
1247 list_for_each_entry(term, head_config, list) {1247 list_for_each_entry(term, head_config, list) {
1248 switch (term->type_term) {1248 switch (term->type_term) {
1249 case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:1249 case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
1250 ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num);1250 ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num, term->weak);
1251 break;1251 break;
1252 case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:1252 case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:
1253 ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num);1253 ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num, term->weak);
1254 break;1254 break;
1255 case PARSE_EVENTS__TERM_TYPE_TIME:1255 case PARSE_EVENTS__TERM_TYPE_TIME:
1256 ADD_CONFIG_TERM_VAL(TIME, time, term->val.num);1256 ADD_CONFIG_TERM_VAL(TIME, time, term->val.num, term->weak);
1257 break;1257 break;
1258 case PARSE_EVENTS__TERM_TYPE_CALLGRAPH:1258 case PARSE_EVENTS__TERM_TYPE_CALLGRAPH:
1259 ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str);1259 ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str, term->weak);
1260 break;1260 break;
1261 case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:1261 case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:
1262 ADD_CONFIG_TERM_STR(BRANCH, term->val.str);1262 ADD_CONFIG_TERM_STR(BRANCH, term->val.str, term->weak);
1263 break;1263 break;
1264 case PARSE_EVENTS__TERM_TYPE_STACKSIZE:1264 case PARSE_EVENTS__TERM_TYPE_STACKSIZE:
1265 ADD_CONFIG_TERM_VAL(STACK_USER, stack_user,1265 ADD_CONFIG_TERM_VAL(STACK_USER, stack_user,
1266 term->val.num);1266 term->val.num, term->weak);
1267 break;1267 break;
1268 case PARSE_EVENTS__TERM_TYPE_INHERIT:1268 case PARSE_EVENTS__TERM_TYPE_INHERIT:
1269 ADD_CONFIG_TERM_VAL(INHERIT, inherit,1269 ADD_CONFIG_TERM_VAL(INHERIT, inherit,
1270 term->val.num ? 1 : 0);1270 term->val.num ? 1 : 0, term->weak);
1271 break;1271 break;
1272 case PARSE_EVENTS__TERM_TYPE_NOINHERIT:1272 case PARSE_EVENTS__TERM_TYPE_NOINHERIT:
1273 ADD_CONFIG_TERM_VAL(INHERIT, inherit,1273 ADD_CONFIG_TERM_VAL(INHERIT, inherit,
1274 term->val.num ? 0 : 1);1274 term->val.num ? 0 : 1, term->weak);
1275 break;1275 break;
1276 case PARSE_EVENTS__TERM_TYPE_MAX_STACK:1276 case PARSE_EVENTS__TERM_TYPE_MAX_STACK:
1277 ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack,1277 ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack,
1278 term->val.num);1278 term->val.num, term->weak);
1279 break;1279 break;
1280 case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS:1280 case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS:
1281 ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events,1281 ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events,
1282 term->val.num);1282 term->val.num, term->weak);
1283 break;1283 break;
1284 case PARSE_EVENTS__TERM_TYPE_OVERWRITE:1284 case PARSE_EVENTS__TERM_TYPE_OVERWRITE:
1285 ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,1285 ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,
1286 term->val.num ? 1 : 0);1286 term->val.num ? 1 : 0, term->weak);
1287 break;1287 break;
1288 case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE:1288 case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE:
1289 ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,1289 ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,
1290 term->val.num ? 0 : 1);1290 term->val.num ? 0 : 1, term->weak);
1291 break;1291 break;
1292 case PARSE_EVENTS__TERM_TYPE_DRV_CFG:1292 case PARSE_EVENTS__TERM_TYPE_DRV_CFG:
1293 ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str);1293 ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str, term->weak);
1294 break;1294 break;
1295 case PARSE_EVENTS__TERM_TYPE_PERCORE:1295 case PARSE_EVENTS__TERM_TYPE_PERCORE:
1296 ADD_CONFIG_TERM_VAL(PERCORE, percore,1296 ADD_CONFIG_TERM_VAL(PERCORE, percore,
1297 term->val.num ? true : false);1297 term->val.num ? true : false, term->weak);
1298 break;1298 break;
1299 case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:1299 case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:
1300 ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output,1300 ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output,
1301 term->val.num ? 1 : 0);1301 term->val.num ? 1 : 0, term->weak);
1302 break;1302 break;
1303 case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE:1303 case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE:
1304 ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size,1304 ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size,
1305 term->val.num);1305 term->val.num, term->weak);
1306 break;1306 break;
1307 default:1307 default:
1308 break;1308 break;
@@ -1339,7 +1339,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config, · 30 unmodified lines
1339 }1339 }
1340 1340
1341 if (bits)1341 if (bits)
1342 ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits);1342 ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits, false);
1343 1343
1344#undef ADD_CONFIG_TERM1344#undef ADD_CONFIG_TERM
1345 return 0;1345 return 0;
tools/perf/util/probe-file.c+3−0
@@ -206,6 +206,9 @@ static struct strlist *__probe_file__get_namelist(int fd, bool include_group) · 205 unmodified lines
206 } else206 } else
207 ret = strlist__add(sl, tev.event);207 ret = strlist__add(sl, tev.event);
208 clear_probe_trace_event(&tev);208 clear_probe_trace_event(&tev);
209 /* Skip if there is same name multi-probe event in the list */
210 if (ret == -EEXIST)
211 ret = 0;
209 if (ret < 0)212 if (ret < 0)
210 break;213 break;
211 }214 }
tools/perf/util/probe-finder.c+8−3
@@ -637,14 +637,19 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwfl_Module *mod, · 636 unmodified lines
637 return -EINVAL;637 return -EINVAL;
638 }638 }
639 639
640 /* Try to get actual symbol name from symtab */640 if (dwarf_entrypc(sp_die, &eaddr) == 0) {
641 symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL);641 /* If the DIE has entrypc, use it. */
642 symbol = dwarf_diename(sp_die);
643 } else {
644 /* Try to get actual symbol name and address from symtab */
645 symbol = dwfl_module_addrsym(mod, paddr, &sym, NULL);
646 eaddr = sym.st_value;
647 }
642 if (!symbol) {648 if (!symbol) {
643 pr_warning("Failed to find symbol at 0x%lx\n",649 pr_warning("Failed to find symbol at 0x%lx\n",
644 (unsigned long)paddr);650 (unsigned long)paddr);
645 return -ENOENT;651 return -ENOENT;
646 }652 }
647 eaddr = sym.st_value;
648 653
649 tp->offset = (unsigned long)(paddr - eaddr);654 tp->offset = (unsigned long)(paddr - eaddr);
650 tp->address = (unsigned long)paddr;655 tp->address = (unsigned long)paddr;
tools/perf/util/setup.py+6−4
@@ -2,11 +2,13 @@ from os import getenv · 1 unmodified line
2from subprocess import Popen, PIPE2from subprocess import Popen, PIPE
3from re import sub3from re import sub
4 4
5cc = getenv("CC")
6cc_is_clang = b"clang version" in Popen([cc, "-v"], stderr=PIPE).stderr.readline()
7
5def clang_has_option(option):8def clang_has_option(option):
6 return [o for o in Popen(['clang', option], stderr=PIPE).stderr.readlines() if b"unknown argument" in o] == [ ]9 return [o for o in Popen([cc, option], stderr=PIPE).stderr.readlines() if b"unknown argument" in o] == [ ]
7 10
8cc = getenv("CC")11if cc_is_clang:
9if cc == "clang":
10 from distutils.sysconfig import get_config_vars12 from distutils.sysconfig import get_config_vars
11 vars = get_config_vars()13 vars = get_config_vars()
12 for var in ('CFLAGS', 'OPT'):14 for var in ('CFLAGS', 'OPT'):
@@ -40,7 +42,7 @@ class install_lib(_install_lib): · 27 unmodified lines
40cflags = getenv('CFLAGS', '').split()42cflags = getenv('CFLAGS', '').split()
41# switch off several checks (need to be at the end of cflags list)43# switch off several checks (need to be at the end of cflags list)
42cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls' ]44cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls' ]
43if cc != "clang":45if not cc_is_clang:
44 cflags += ['-Wno-cast-function-type' ]46 cflags += ['-Wno-cast-function-type' ]
45 47
46src_perf = getenv('srctree') + '/tools/perf'48src_perf = getenv('srctree') + '/tools/perf'
tools/scripts/Makefile.include+2−2
@@ -1,8 +1,8 @@
1# SPDX-License-Identifier: GPL-2.01# SPDX-License-Identifier: GPL-2.0
2ifneq ($(O),)2ifneq ($(O),)
3ifeq ($(origin O), command line)3ifeq ($(origin O), command line)
4 dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)4 dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
5 ABSOLUTE_O := $(shell cd $(O) ; pwd)5 ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd)
6 OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)6 OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)
7 COMMAND_O := O=$(ABSOLUTE_O)7 COMMAND_O := O=$(ABSOLUTE_O)
8ifeq ($(objtree),)8ifeq ($(objtree),)

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