Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96ad9999 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf, x86: Fix AMD family 15h FPU event constraints
  perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpus
  perf evsel: Fix use of inherit
  perf hists browser: Fix seg fault when annotate null symbol
parents 71460af5 855357a2

arch/x86/kernel/cpu/perf_event_amd.c

+18 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ static __initconst const u64 amd_hw_cache_event_ids 
 [ C(L1D) ] = {

	[ C(OP_READ) ] = {

		[ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses        */

		[ C(RESULT_MISS)   ] = 0x0041, /* Data Cache Misses          */

		[ C(RESULT_MISS)   ] = 0x0141, /* Data Cache Misses          */

	},

	[ C(OP_WRITE) ] = {

		[ C(RESULT_ACCESS) ] = 0x0142, /* Data Cache Refills :system */
@@ -427,7 +427,9 @@ static __initconst const struct x86_pmu amd_pmu = { 
 *

 * Exceptions:

 *

 * 0x000	FP	PERF_CTL[3], PERF_CTL[5:3] (*)

 * 0x003	FP	PERF_CTL[3]

 * 0x004	FP	PERF_CTL[3], PERF_CTL[5:3] (*)

 * 0x00B	FP	PERF_CTL[3]

 * 0x00D	FP	PERF_CTL[3]

 * 0x023	DE	PERF_CTL[2:0]
@@ -448,6 +450,8 @@ static __initconst const struct x86_pmu amd_pmu = { 
 * 0x0DF	LS	PERF_CTL[5:0]

 * 0x1D6	EX	PERF_CTL[5:0]

 * 0x1D8	EX	PERF_CTL[5:0]

 *

 * (*) depending on the umask all FPU counters may be used

 */



static struct event_constraint amd_f15_PMC0  = EVENT_CONSTRAINT(0, 0x01, 0);
@@ -460,18 +464,28 @@ static struct event_constraint amd_f15_PMC53 = EVENT_CONSTRAINT(0, 0x38, 0); 
static struct event_constraint *

amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, struct perf_event *event)

{

	unsigned int event_code = amd_get_event_code(&event->hw);

	struct hw_perf_event *hwc = &event->hw;

	unsigned int event_code = amd_get_event_code(hwc);



	switch (event_code & AMD_EVENT_TYPE_MASK) {

	case AMD_EVENT_FP:

		switch (event_code) {

		case 0x000:

			if (!(hwc->config & 0x0000F000ULL))

				break;

			if (!(hwc->config & 0x00000F00ULL))

				break;

			return &amd_f15_PMC3;

		case 0x004:

			if (hweight_long(hwc->config & ARCH_PERFMON_EVENTSEL_UMASK) <= 1)

				break;

			return &amd_f15_PMC3;

		case 0x003:

		case 0x00B:

		case 0x00D:

			return &amd_f15_PMC3;

		default:

			return &amd_f15_PMC53;

		}

		return &amd_f15_PMC53;

	case AMD_EVENT_LS:

	case AMD_EVENT_DC:

	case AMD_EVENT_EX_LS:

tools/perf/builtin-record.c

+5 −2
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static void config_attr(struct perf_evsel *evsel, struct perf_evlist *evlist) 
	struct perf_event_attr *attr = &evsel->attr;

	int track = !evsel->idx; /* only the first counter needs these */



	attr->inherit		= !no_inherit;

	attr->read_format	= PERF_FORMAT_TOTAL_TIME_ENABLED |

				  PERF_FORMAT_TOTAL_TIME_RUNNING |

				  PERF_FORMAT_ID;
@@ -251,6 +252,9 @@ static void open_counters(struct perf_evlist *evlist) 
{

	struct perf_evsel *pos;



	if (evlist->cpus->map[0] < 0)

		no_inherit = true;



	list_for_each_entry(pos, &evlist->entries, node) {

		struct perf_event_attr *attr = &pos->attr;

		/*
@@ -271,8 +275,7 @@ static void open_counters(struct perf_evlist *evlist) 
retry_sample_id:

		attr->sample_id_all = sample_id_all_avail ? 1 : 0;

try_again:

		if (perf_evsel__open(pos, evlist->cpus, evlist->threads, group,

				     !no_inherit) < 0) {

		if (perf_evsel__open(pos, evlist->cpus, evlist->threads, group) < 0) {

			int err = errno;



			if (err == EPERM || err == EACCES) {

tools/perf/builtin-stat.c

+4 −3
Original line number Diff line number Diff line
@@ -167,16 +167,17 @@ static int create_perf_stat_counter(struct perf_evsel *evsel) 
		attr->read_format = PERF_FORMAT_TOTAL_TIME_ENABLED |

				    PERF_FORMAT_TOTAL_TIME_RUNNING;



	attr->inherit = !no_inherit;



	if (system_wide)

		return perf_evsel__open_per_cpu(evsel, evsel_list->cpus, false, false);

		return perf_evsel__open_per_cpu(evsel, evsel_list->cpus, false);



	attr->inherit = !no_inherit;

	if (target_pid == -1 && target_tid == -1) {

		attr->disabled = 1;

		attr->enable_on_exec = 1;

	}



	return perf_evsel__open_per_thread(evsel, evsel_list->threads, false, false);

	return perf_evsel__open_per_thread(evsel, evsel_list->threads, false);

}



/*

tools/perf/builtin-test.c

+5 −5
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int test__open_syscall_event(void) 
		goto out_thread_map_delete;

	}



	if (perf_evsel__open_per_thread(evsel, threads, false, false) < 0) {

	if (perf_evsel__open_per_thread(evsel, threads, false) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));
@@ -303,7 +303,7 @@ static int test__open_syscall_event(void) 
	}



	if (perf_evsel__read_on_cpu(evsel, 0, 0) < 0) {

		pr_debug("perf_evsel__open_read_on_cpu\n");

		pr_debug("perf_evsel__read_on_cpu\n");

		goto out_close_fd;

	}
@@ -365,7 +365,7 @@ static int test__open_syscall_event_on_all_cpus(void) 
		goto out_thread_map_delete;

	}



	if (perf_evsel__open(evsel, cpus, threads, false, false) < 0) {

	if (perf_evsel__open(evsel, cpus, threads, false) < 0) {

		pr_debug("failed to open counter: %s, "

			 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

			 strerror(errno));
@@ -418,7 +418,7 @@ static int test__open_syscall_event_on_all_cpus(void) 
			continue;



		if (perf_evsel__read_on_cpu(evsel, cpu, 0) < 0) {

			pr_debug("perf_evsel__open_read_on_cpu\n");

			pr_debug("perf_evsel__read_on_cpu\n");

			err = -1;

			break;

		}
@@ -529,7 +529,7 @@ static int test__basic_mmap(void) 


		perf_evlist__add(evlist, evsels[i]);



		if (perf_evsel__open(evsels[i], cpus, threads, false, false) < 0) {

		if (perf_evsel__open(evsels[i], cpus, threads, false) < 0) {

			pr_debug("failed to open counter: %s, "

				 "tweak /proc/sys/kernel/perf_event_paranoid?\n",

				 strerror(errno));

tools/perf/builtin-top.c

+2 −1
Original line number Diff line number Diff line
@@ -845,9 +845,10 @@ static void start_counters(struct perf_evlist *evlist) 
		}



		attr->mmap = 1;

		attr->inherit = inherit;

try_again:

		if (perf_evsel__open(counter, top.evlist->cpus,

				     top.evlist->threads, group, inherit) < 0) {

				     top.evlist->threads, group) < 0) {

			int err = errno;



			if (err == EPERM || err == EACCES) {