Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-19 17:10:24 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-19 22:44:48 +0200
commit2f2501c5e03c1b4027689a98d3fefaf6642f9bcc (patch)
tree9cde3d921d4d0659e3b2a387c9d74c0c483b7844
parentf423c06cd624ff2075892eb04303571ac16ddd3b (diff)
s390/cpum_cf: introduce kernel_cpumcf_avail() function
-rw-r--r--arch/s390/include/asm/cpu_mcf.h1
-rw-r--r--arch/s390/kernel/perf_cpum_cf.c20
2 files changed, 18 insertions, 3 deletions
diff --git a/arch/s390/include/asm/cpu_mcf.h b/arch/s390/include/asm/cpu_mcf.h
index 12a4224560bc..7121365a85d9 100644
--- a/arch/s390/include/asm/cpu_mcf.h
+++ b/arch/s390/include/asm/cpu_mcf.h
@@ -59,6 +59,7 @@ struct cpu_cf_events {
};
DECLARE_PER_CPU(struct cpu_cf_events, cpu_cf_events);
+bool kernel_cpumcf_avail(void);
int __kernel_cpumcf_begin(void);
unsigned long kernel_cpumcf_alert(int clear);
void __kernel_cpumcf_end(void);
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 75571ce49bb1..02b2da99d884 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -36,6 +36,9 @@ DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = {
.txn_flags = 0,
};
+/* Indicator whether the CPU-Measurement Counter Facility Support is ready */
+static bool cpum_cf_initalized;
+
static enum cpumf_ctr_set get_counter_set(u64 event)
{
int set = CPUMF_CTR_SET_MAX;
@@ -236,6 +239,12 @@ static void setup_pmc_cpu(void *flags)
lcctl(0);
}
+bool kernel_cpumcf_avail(void)
+{
+ return cpum_cf_initalized;
+}
+EXPORT_SYMBOL(kernel_cpumcf_avail);
+
/* Reserve/release functions for sharing perf hardware */
static DEFINE_SPINLOCK(cpumcf_owner_lock);
static void *cpumcf_owner;
@@ -712,8 +721,13 @@ static int __init cpumf_pmu_init(void)
cpumf_measurement_alert);
return rc;
}
- return cpuhp_setup_state(CPUHP_AP_PERF_S390_CF_ONLINE,
- "perf/s390/cf:online",
- s390_pmu_online_cpu, s390_pmu_offline_cpu);
+
+ rc = cpuhp_setup_state(CPUHP_AP_PERF_S390_CF_ONLINE,
+ "perf/s390/cf:online",
+ s390_pmu_online_cpu, s390_pmu_offline_cpu);
+ if (!rc)
+ cpum_cf_initalized = true;
+
+ return rc;
}
early_initcall(cpumf_pmu_init);