lkml.org 
[lkml]   [2016]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/5] perf/x86/intel/bts: Fix BTS PMI detection
    Date
    Since BTS doesn't have a dedicated PMI status bit, the driver needs to
    take extra care to check for the condition that triggers it to avoid
    spurious NMI warnings.

    Regardless of the local BTS context state, the only way of knowing that
    the NMI is ours is to compare the write pointer against the interrupt
    threshold.

    Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    ---
    arch/x86/events/intel/bts.c | 19 +++++++++++++++----
    1 file changed, 15 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c
    index 61e1d713b1..9233edf993 100644
    --- a/arch/x86/events/intel/bts.c
    +++ b/arch/x86/events/intel/bts.c
    @@ -446,26 +446,37 @@ bts_buffer_reset(struct bts_buffer *buf, struct perf_output_handle *handle)

    int intel_bts_interrupt(void)
    {
    + struct debug_store *ds = this_cpu_ptr(&cpu_hw_events)->ds;
    struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
    struct perf_event *event = bts->handle.event;
    struct bts_buffer *buf;
    s64 old_head;
    - int err = -ENOSPC;
    + int err = -ENOSPC, handled = 0;
    +
    + /*
    + * The only surefire way of knowing if this NMI is ours is by checking
    + * the write ptr against the PMI threshold.
    + */
    + if (ds->bts_index >= ds->bts_interrupt_threshold)
    + handled = 1;

    /*
    * this is wrapped in intel_bts_enable_local/intel_bts_disable_local,
    * so we can only be INACTIVE or STOPPED
    */
    if (READ_ONCE(bts->state) == BTS_STATE_STOPPED)
    - return 0;
    + return handled;

    buf = perf_get_aux(&bts->handle);
    + if (!buf)
    + return handled;
    +
    /*
    * Skip snapshot counters: they don't use the interrupt, but
    * there's no other way of telling, because the pointer will
    * keep moving
    */
    - if (!buf || buf->snapshot)
    + if (buf->snapshot)
    return 0;

    old_head = local_read(&buf->head);
    @@ -473,7 +484,7 @@ int intel_bts_interrupt(void)

    /* no new data */
    if (old_head == local_read(&buf->head))
    - return 0;
    + return handled;

    perf_aux_output_end(&bts->handle, local_xchg(&buf->data_size, 0),
    !!local_xchg(&buf->lost, 0));
    --
    2.9.3
    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:2.652 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site