lkml.org 
[lkml]   [2019]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 115/249] perf/x86/intel/uncore: Handle invalid event coding for free-running counter
    Date
    From: Kan Liang <kan.liang@linux.intel.com>

    [ Upstream commit 543ac280b3576c0009e8c0fcd4d6bfc9978d7bd0 ]

    Counting with invalid event coding for free-running counter may cause
    OOPs, e.g. uncore_iio_free_running_0/event=1/.

    Current code only validate the event with free-running event format,
    event=0xff,umask=0xXY. Non-free-running event format never be checked
    for the PMU with free-running counters.

    Add generic hw_config() to check and reject the invalid event coding
    for free-running PMU.

    Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: acme@kernel.org
    Cc: eranian@google.com
    Fixes: 0f519f0352e3 ("perf/x86/intel/uncore: Support IIO free-running counters on SKX")
    Link: https://lkml.kernel.org/r/1556672028-119221-2-git-send-email-kan.liang@linux.intel.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/events/intel/uncore.h | 10 ++++++++++
    arch/x86/events/intel/uncore_snbep.c | 1 +
    2 files changed, 11 insertions(+)

    diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h
    index 79eb2e21e4f0..28499e39679f 100644
    --- a/arch/x86/events/intel/uncore.h
    +++ b/arch/x86/events/intel/uncore.h
    @@ -419,6 +419,16 @@ static inline bool is_freerunning_event(struct perf_event *event)
    (((cfg >> 8) & 0xff) >= UNCORE_FREERUNNING_UMASK_START);
    }

    +/* Check and reject invalid config */
    +static inline int uncore_freerunning_hw_config(struct intel_uncore_box *box,
    + struct perf_event *event)
    +{
    + if (is_freerunning_event(event))
    + return 0;
    +
    + return -EINVAL;
    +}
    +
    static inline void uncore_disable_box(struct intel_uncore_box *box)
    {
    if (box->pmu->type->ops->disable_box)
    diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
    index b10e04387f38..8e4e8e423839 100644
    --- a/arch/x86/events/intel/uncore_snbep.c
    +++ b/arch/x86/events/intel/uncore_snbep.c
    @@ -3585,6 +3585,7 @@ static struct uncore_event_desc skx_uncore_iio_freerunning_events[] = {

    static struct intel_uncore_ops skx_uncore_iio_freerunning_ops = {
    .read_counter = uncore_msr_read_counter,
    + .hw_config = uncore_freerunning_hw_config,
    };

    static struct attribute *skx_uncore_iio_freerunning_formats_attr[] = {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-15 16:15    [W:4.052 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site