OSDN Git Service

s390/cpum_sf: do not register PMU if no sampling mode is authorized
authorHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Wed, 31 May 2017 13:22:19 +0000 (15:22 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 16 Nov 2017 14:06:10 +0000 (15:06 +0100)
Previously, the cpum_sf PMU was registered even if there is no
sampling mode authorized.  Add a check and register cpum_sf only
at least one sampling mode is authorized.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/perf_cpum_sf.c

index 4d8ddd8..7e9b9e6 100644 (file)
@@ -1938,6 +1938,9 @@ static int __init init_cpum_sampling_pmu(void)
                return -ENODEV;
        }
 
+       if (!si.as && !si.ad)
+               return -ENODEV;
+
        if (si.bsdes != sizeof(struct hws_basic_entry)) {
                pr_cpumsf_err(RS_INIT_FAILURE_BSDES);
                return -EINVAL;