Commit ce971233 authored by Thomas Richter's avatar Thomas Richter Committed by Alexander Gordeev
Browse files

s390/cpum_cf: Deny all sampling events by counter PMU 



Deny all sampling event by the CPUMF counter facility device driver
and return -ENOENT. This return value is used to try other PMUs.
Up to now events for type PERF_TYPE_HARDWARE were not tested for
sampling and returned later on -EOPNOTSUPP. This ends the search
for alternative PMUs. Change that behavior and try other PMUs
instead.

Fixes: 613a41b0 ("s390/cpum_cf: Reject request for sampling in event initialization")
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 85941afd

arch/s390/kernel/perf_cpum_cf.c

+2 −2
Original line number Diff line number Diff line
@@ -760,8 +760,6 @@ static int __hw_perf_event_init(struct perf_event *event, unsigned int type) 
		break;



	case PERF_TYPE_HARDWARE:

		if (is_sampling_event(event))	/* No sampling support */

			return -ENOENT;

		ev = attr->config;

		if (!attr->exclude_user && attr->exclude_kernel) {

			/*
@@ -859,6 +857,8 @@ static int cpumf_pmu_event_init(struct perf_event *event) 
	unsigned int type = event->attr.type;

	int err = -ENOENT;



	if (is_sampling_event(event))	/* No sampling support */

		return err;

	if (type == PERF_TYPE_HARDWARE || type == PERF_TYPE_RAW)

		err = __hw_perf_event_init(event, type);

	else if (event->pmu->type == type)