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

Commit 0a648150 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/cpum_sf: add diagnostic sampling event only if it is authorized 



The SF_CYCLES_BASIC_DIAG is always registered even if it is turned of in the
current hardware configuration.  Because diagnostic-sampling is typically not
turned on in the hardware configuration, do not register this perf event by
default.  Enable it only if the diagnostic-sampling function is authorized.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c202baf0

arch/s390/kernel/perf_cpum_sf.c

+5 −2
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC_DIAG, PERF_EVENT_CPUM_SF_DIAG); 


static struct attribute *cpumsf_pmu_events_attr[] = {

	CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC),

	CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC_DIAG),

	NULL,

	NULL,

};
@@ -1606,8 +1606,11 @@ static int __init init_cpum_sampling_pmu(void) 
		return -EINVAL;

	}



	if (si.ad)

	if (si.ad) {

		sfb_set_limits(CPUM_SF_MIN_SDB, CPUM_SF_MAX_SDB);

		cpumsf_pmu_events_attr[1] =

			CPUMF_EVENT_PTR(SF, SF_CYCLES_BASIC_DIAG);

	}



	sfdbg = debug_register(KMSG_COMPONENT, 2, 1, 80);

	if (!sfdbg)