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:47 +0200
commitf8b1268a0146cd1daef8a9959b5dbcf43c56455d (patch)
tree62de73a63cdf1625419a99bd61420d46b8e3a727
parent23edb1e0d129e925a13c0e6528a3684508730786 (diff)
s390/cpum_cf: rename per-CPU counter facility structure and
variables (jsc#SLE-6904 FATE#327581).
-rw-r--r--patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables186
-rw-r--r--series.conf1
2 files changed, 187 insertions, 0 deletions
diff --git a/patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables b/patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables
new file mode 100644
index 0000000000..08660ddecb
--- /dev/null
+++ b/patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables
@@ -0,0 +1,186 @@
+From: Hendrik Brueckner <brueckner@linux.ibm.com>
+Date: Wed, 8 Aug 2018 10:04:23 +0200
+Subject: s390/cpum_cf: rename per-CPU counter facility structure and variables
+Git-commit: f1c0b83173e59c34daec48de92c0c2934e7417b2
+Patch-mainline: v5.1-rc1
+References: jsc#SLE-6904 FATE#327581
+
+Rename the struct cpu_hw_events to cpu_cf_events and also the respective
+per-CPU variable to make its name more clear. No functional changes.
+
+Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/kernel/perf_cpum_cf.c | 40 ++++++++++++++++++++--------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+--- a/arch/s390/kernel/perf_cpum_cf.c
++++ b/arch/s390/kernel/perf_cpum_cf.c
+@@ -22,14 +22,14 @@
+ #include <asm/cpu_mcf.h>
+
+ /* Local CPUMF event structure */
+-struct cpu_hw_events {
++struct cpu_cf_events {
+ struct cpumf_ctr_info info;
+ atomic_t ctr_set[CPUMF_CTR_SET_MAX];
+ u64 state, tx_state;
+ unsigned int flags;
+ unsigned int txn_flags;
+ };
+-static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = {
++static DEFINE_PER_CPU(struct cpu_cf_events, cpu_cf_events) = {
+ .ctr_set = {
+ [CPUMF_CTR_SET_BASIC] = ATOMIC_INIT(0),
+ [CPUMF_CTR_SET_USER] = ATOMIC_INIT(0),
+@@ -62,11 +62,11 @@ static enum cpumf_ctr_set get_counter_se
+
+ static int validate_ctr_version(const struct hw_perf_event *hwc)
+ {
+- struct cpu_hw_events *cpuhw;
++ struct cpu_cf_events *cpuhw;
+ int err = 0;
+ u16 mtdiag_ctl;
+
+- cpuhw = &get_cpu_var(cpu_hw_events);
++ cpuhw = &get_cpu_var(cpu_cf_events);
+
+ /* check required version for counter sets */
+ switch (hwc->config_base) {
+@@ -107,17 +107,17 @@ static int validate_ctr_version(const st
+ break;
+ }
+
+- put_cpu_var(cpu_hw_events);
++ put_cpu_var(cpu_cf_events);
+ return err;
+ }
+
+ static int validate_ctr_auth(const struct hw_perf_event *hwc)
+ {
+- struct cpu_hw_events *cpuhw;
++ struct cpu_cf_events *cpuhw;
+ u64 ctrs_state;
+ int err = 0;
+
+- cpuhw = &get_cpu_var(cpu_hw_events);
++ cpuhw = &get_cpu_var(cpu_cf_events);
+
+ /* Check authorization for cpu counter sets.
+ * If the particular CPU counter set is not authorized,
+@@ -128,7 +128,7 @@ static int validate_ctr_auth(const struc
+ if (!(ctrs_state & cpuhw->info.auth_ctl))
+ err = -ENOENT;
+
+- put_cpu_var(cpu_hw_events);
++ put_cpu_var(cpu_cf_events);
+ return err;
+ }
+
+@@ -139,7 +139,7 @@ static int validate_ctr_auth(const struc
+ */
+ static void cpumf_pmu_enable(struct pmu *pmu)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+ int err;
+
+ if (cpuhw->flags & PMU_F_ENABLED)
+@@ -162,7 +162,7 @@ static void cpumf_pmu_enable(struct pmu
+ */
+ static void cpumf_pmu_disable(struct pmu *pmu)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+ int err;
+ u64 inactive;
+
+@@ -190,13 +190,13 @@ static DEFINE_MUTEX(pmc_reserve_mutex);
+ static void cpumf_measurement_alert(struct ext_code ext_code,
+ unsigned int alert, unsigned long unused)
+ {
+- struct cpu_hw_events *cpuhw;
++ struct cpu_cf_events *cpuhw;
+
+ if (!(alert & CPU_MF_INT_CF_MASK))
+ return;
+
+ inc_irq_stat(IRQEXT_CMC);
+- cpuhw = this_cpu_ptr(&cpu_hw_events);
++ cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ /* Measurement alerts are shared and might happen when the PMU
+ * is not reserved. Ignore these alerts in this case. */
+@@ -221,7 +221,7 @@ static void cpumf_measurement_alert(stru
+ #define PMC_RELEASE 1
+ static void setup_pmc_cpu(void *flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ switch (*((int *) flags)) {
+ case PMC_INIT:
+@@ -472,7 +472,7 @@ static void cpumf_pmu_read(struct perf_e
+
+ static void cpumf_pmu_start(struct perf_event *event, int flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+ struct hw_perf_event *hwc = &event->hw;
+
+ if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED)))
+@@ -503,7 +503,7 @@ static void cpumf_pmu_start(struct perf_
+
+ static void cpumf_pmu_stop(struct perf_event *event, int flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+ struct hw_perf_event *hwc = &event->hw;
+
+ if (!(hwc->state & PERF_HES_STOPPED)) {
+@@ -524,7 +524,7 @@ static void cpumf_pmu_stop(struct perf_e
+
+ static int cpumf_pmu_add(struct perf_event *event, int flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ /* Check authorization for the counter set to which this
+ * counter belongs.
+@@ -548,7 +548,7 @@ static int cpumf_pmu_add(struct perf_eve
+
+ static void cpumf_pmu_del(struct perf_event *event, int flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ cpumf_pmu_stop(event, PERF_EF_UPDATE);
+
+@@ -576,7 +576,7 @@ static void cpumf_pmu_del(struct perf_ev
+ */
+ static void cpumf_pmu_start_txn(struct pmu *pmu, unsigned int txn_flags)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ WARN_ON_ONCE(cpuhw->txn_flags); /* txn already in flight */
+
+@@ -596,7 +596,7 @@ static void cpumf_pmu_start_txn(struct p
+ static void cpumf_pmu_cancel_txn(struct pmu *pmu)
+ {
+ unsigned int txn_flags;
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+
+ WARN_ON_ONCE(!cpuhw->txn_flags); /* no txn in flight */
+
+@@ -617,7 +617,7 @@ static void cpumf_pmu_cancel_txn(struct
+ */
+ static int cpumf_pmu_commit_txn(struct pmu *pmu)
+ {
+- struct cpu_hw_events *cpuhw = this_cpu_ptr(&cpu_hw_events);
++ struct cpu_cf_events *cpuhw = this_cpu_ptr(&cpu_cf_events);
+ u64 state;
+
+ WARN_ON_ONCE(!cpuhw->txn_flags); /* no txn in flight */
diff --git a/series.conf b/series.conf
index eaf0548859..6df2d5e95d 100644
--- a/series.conf
+++ b/series.conf
@@ -45467,6 +45467,7 @@
patches.arch/s390-ism-ignore-some-errors-during-deregistration
patches.suse/s390-cpum_cf-move-counter-set-controls-to-a-new-header-file
patches.suse/s390-cpum_cf-prepare-for-in-kernel-counter-measurements
+ patches.suse/s390-cpum_cf-rename-per-cpu-counter-facility-structure-and-variables
patches.fixes/0001-s390-vfio_ap-link-the-vfio_ap-devices-to-the-vfio_ap.patch
patches.drivers/clocksource-drivers-sun5i-Fail-gracefully-when-clock.patch
patches.drivers/clocksource-drivers-exynos_mct-Move-one-shot-check-f.patch