Commit 45f03574 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-5.6-20200201' of... 

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

 into perf/urgent

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

perf maps:

  Cengiz Can:

  - Add missing unlock to maps__insert() error case.

srcline:

  Changbin Du:

  - Make perf able to build with latest libbfd.

perf parse:

  Leo Yan:

  - Keep copy of string in perf_evsel_config_term() to fix sink terms
    processing in ARM CoreSight.

perf test:

  Thomas Richter:

  - Fix test case Merge cpu map, removing extra reference count drop that
    causes a segfault on s/390.

perf probe:

  Thomas Richter:

  - Add ustring support for perf probe command

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fdff7c21 85fc95d7

tools/perf/arch/arm/util/cs-etm.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int cs_etm_set_sink_attr(struct perf_pmu *pmu, 
		if (term->type != PERF_EVSEL__CONFIG_TERM_DRV_CFG)

			continue;



		sink = term->val.drv_cfg;

		sink = term->val.str;

		snprintf(path, PATH_MAX, "sinks/%s", sink);



		ret = perf_pmu__scan_file(pmu, path, "%x", &hash);

tools/perf/tests/cpumap.c

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ int test__cpu_map_merge(struct test *test __maybe_unused, int subtest __maybe_un 
	TEST_ASSERT_VAL("failed to merge map: bad nr", c->nr == 5);

	cpu_map__snprint(c, buf, sizeof(buf));

	TEST_ASSERT_VAL("failed to merge map: bad result", !strcmp(buf, "1-2,4-5,7"));

	perf_cpu_map__put(a);

	perf_cpu_map__put(b);

	perf_cpu_map__put(c);

	return 0;

tools/perf/util/evsel.c

+5 −3
Original line number Diff line number Diff line
@@ -808,12 +808,12 @@ static void apply_config_terms(struct evsel *evsel, 
				perf_evsel__reset_sample_bit(evsel, TIME);

			break;

		case PERF_EVSEL__CONFIG_TERM_CALLGRAPH:

			callgraph_buf = term->val.callgraph;

			callgraph_buf = term->val.str;

			break;

		case PERF_EVSEL__CONFIG_TERM_BRANCH:

			if (term->val.branch && strcmp(term->val.branch, "no")) {

			if (term->val.str && strcmp(term->val.str, "no")) {

				perf_evsel__set_sample_bit(evsel, BRANCH_STACK);

				parse_branch_str(term->val.branch,

				parse_branch_str(term->val.str,

						 &attr->branch_sample_type);

			} else

				perf_evsel__reset_sample_bit(evsel, BRANCH_STACK);
@@ -1265,6 +1265,8 @@ static void perf_evsel__free_config_terms(struct evsel *evsel) 


	list_for_each_entry_safe(term, h, &evsel->config_terms, list) {

		list_del_init(&term->list);

		if (term->free_str)

			zfree(&term->val.str);

		free(term);

	}

}

tools/perf/util/evsel_config.h

+2 −3
Original line number Diff line number Diff line
@@ -32,22 +32,21 @@ enum evsel_term_type { 
struct perf_evsel_config_term {

	struct list_head      list;

	enum evsel_term_type  type;

	bool		      free_str;

	union {

		u64	      period;

		u64	      freq;

		bool	      time;

		char	      *callgraph;

		char	      *drv_cfg;

		u64	      stack_user;

		int	      max_stack;

		bool	      inherit;

		bool	      overwrite;

		char	      *branch;

		unsigned long max_events;

		bool	      percore;

		bool	      aux_output;

		u32	      aux_sample_size;

		u64	      cfg_chg;

		char	      *str;

	} val;

	bool weak;

};

tools/perf/util/map.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ void maps__insert(struct maps *maps, struct map *map) 


			if (maps_by_name == NULL) {

				__maps__free_maps_by_name(maps);

				up_write(&maps->lock);

				return;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE