Commit 76ccd234 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf tooling fixes from Ingo Molnar:
 "A handful of tooling fixes all across the map, no kernel changes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools headers uapi: Update linux/in.h copy
  perf probe: Do not depend on dwfl_module_addrsym()
  perf probe: Fix to delete multiple probe event
  perf parse-events: Fix reading of invalid memory in event parsing
  perf python: Fix clang detection when using CC=clang-version
  perf map: Fix off by one in strncpy() size argument
  tools: Let O= makes handle a relative path with -C option
parents 3f3ee43a 564200ed

tools/include/uapi/linux/in.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ enum { 
#define IPPROTO_UDPLITE		IPPROTO_UDPLITE

  IPPROTO_MPLS = 137,		/* MPLS in IP (RFC 4023)		*/

#define IPPROTO_MPLS		IPPROTO_MPLS

  IPPROTO_ETHERNET = 143,	/* Ethernet-within-IPv6 Encapsulation	*/

#define IPPROTO_ETHERNET	IPPROTO_ETHERNET

  IPPROTO_RAW = 255,		/* Raw IP packets			*/

#define IPPROTO_RAW		IPPROTO_RAW

  IPPROTO_MPTCP = 262,		/* Multipath TCP connection		*/

tools/perf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ endif 
# Only pass canonical directory names as the output directory:

#

ifneq ($(O),)

  FULL_O := $(shell readlink -f $(O) || echo $(O))

  FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))

endif



#

tools/perf/util/map.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename) 
		return true;

	}



	if (!strncmp(filename, "/system/lib/", 11)) {

	if (!strncmp(filename, "/system/lib/", 12)) {

		char *ndk, *app;

		const char *arch;

		size_t ndk_length;

tools/perf/util/parse-events.c

+23 −23
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static int config_attr(struct perf_event_attr *attr, 
static int get_config_terms(struct list_head *head_config,

			    struct list_head *head_terms __maybe_unused)

{

#define ADD_CONFIG_TERM(__type)					\

#define ADD_CONFIG_TERM(__type, __weak)				\

	struct perf_evsel_config_term *__t;			\

								\

	__t = zalloc(sizeof(*__t));				\
@@ -1222,18 +1222,18 @@ static int get_config_terms(struct list_head *head_config, 
								\

	INIT_LIST_HEAD(&__t->list);				\

	__t->type       = PERF_EVSEL__CONFIG_TERM_ ## __type;	\

	__t->weak	= term->weak;				\

	__t->weak	= __weak;				\

	list_add_tail(&__t->list, head_terms)



#define ADD_CONFIG_TERM_VAL(__type, __name, __val)		\

#define ADD_CONFIG_TERM_VAL(__type, __name, __val, __weak)	\

do {								\

	ADD_CONFIG_TERM(__type);				\

	ADD_CONFIG_TERM(__type, __weak);			\

	__t->val.__name = __val;				\

} while (0)



#define ADD_CONFIG_TERM_STR(__type, __val)			\

#define ADD_CONFIG_TERM_STR(__type, __val, __weak)		\

do {								\

	ADD_CONFIG_TERM(__type);				\

	ADD_CONFIG_TERM(__type, __weak);			\

	__t->val.str = strdup(__val);				\

	if (!__t->val.str) {					\

		zfree(&__t);					\
@@ -1247,62 +1247,62 @@ do { \ 
	list_for_each_entry(term, head_config, list) {

		switch (term->type_term) {

		case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:

			ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num);

			ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:

			ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num);

			ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_TIME:

			ADD_CONFIG_TERM_VAL(TIME, time, term->val.num);

			ADD_CONFIG_TERM_VAL(TIME, time, term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_CALLGRAPH:

			ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str);

			ADD_CONFIG_TERM_STR(CALLGRAPH, term->val.str, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:

			ADD_CONFIG_TERM_STR(BRANCH, term->val.str);

			ADD_CONFIG_TERM_STR(BRANCH, term->val.str, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_STACKSIZE:

			ADD_CONFIG_TERM_VAL(STACK_USER, stack_user,

					    term->val.num);

					    term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_INHERIT:

			ADD_CONFIG_TERM_VAL(INHERIT, inherit,

					    term->val.num ? 1 : 0);

					    term->val.num ? 1 : 0, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_NOINHERIT:

			ADD_CONFIG_TERM_VAL(INHERIT, inherit,

					    term->val.num ? 0 : 1);

					    term->val.num ? 0 : 1, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_MAX_STACK:

			ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack,

					    term->val.num);

					    term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS:

			ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events,

					    term->val.num);

					    term->val.num, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_OVERWRITE:

			ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,

					    term->val.num ? 1 : 0);

					    term->val.num ? 1 : 0, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE:

			ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite,

					    term->val.num ? 0 : 1);

					    term->val.num ? 0 : 1, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_DRV_CFG:

			ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str);

			ADD_CONFIG_TERM_STR(DRV_CFG, term->val.str, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_PERCORE:

			ADD_CONFIG_TERM_VAL(PERCORE, percore,

					    term->val.num ? true : false);

					    term->val.num ? true : false, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:

			ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output,

					    term->val.num ? 1 : 0);

					    term->val.num ? 1 : 0, term->weak);

			break;

		case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE:

			ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size,

					    term->val.num);

					    term->val.num, term->weak);

			break;

		default:

			break;
@@ -1339,7 +1339,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config, 
	}



	if (bits)

		ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits);

		ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits, false);



#undef ADD_CONFIG_TERM

	return 0;

tools/perf/util/probe-file.c

+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,9 @@ static struct strlist *__probe_file__get_namelist(int fd, bool include_group) 
		} else

			ret = strlist__add(sl, tev.event);

		clear_probe_trace_event(&tev);

		/* Skip if there is same name multi-probe event in the list */

		if (ret == -EEXIST)

			ret = 0;

		if (ret < 0)

			break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE