• Paul Burton's avatar
    MIPS: Fix perf event init · fd0b19ed
    Paul Burton authored
    Commit c311c797 ("cpumask: make "nr_cpumask_bits" unsigned")
    modified mipspmu_event_init() to cast the struct perf_event cpu field to
    an unsigned integer before it is compared with nr_cpumask_bits (and
    *ahem* did so without copying the linux-mips mailing list or any MIPS
    developers...). This is broken because the cpu field may be -1 for
    events which follow a process rather than being affine to a particular
    CPU. When this is the case the cast to an unsigned int results in a
    value equal to ULONG_MAX, which is always greater than nr_cpumask_bits
    so we always fail mipspmu_event_init() and return -ENODEV.
    
    The check against nr_cpumask_bits seems nonsensical anyway, so this
    patch simply removes it. The cpu field is going to either be -1 or a
    valid CPU number. Comparing it with nr_cpumask_bits is effectively
    checking that it's a valid cpu number, but it seems safe to rely on the
    core perf events code to ensure that's the case.
    
    The end result is that this fixes use of perf on MIPS when not
    constraining events to a particular CPU, and fixes the "perf list hw"
    command which fails to list any events without this.
    Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
    Fixes: c311c797 ("cpumask: make "nr_cpumask_bits" unsigned")
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: linux-mips@linux-mips.org
    Cc: stable <stable@vger.kernel.org> # v4.12+
    Patchwork: https://patchwork.linux-mips.org/patch/17323/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    fd0b19ed
perf_event_mipsxx.c 47.3 KB