lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 181/255] perf: Fix event multiplexing for exclusive groups
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit 2714c3962f304d031d5016c963c4b459337b0749 ]

    Commit 9e6302056f80 ("perf: Use hrtimers for event multiplexing")
    placed the hrtimer (re)start call in the wrong place. Instead of
    capturing all scheduling failures, it only considered the PMU failure.

    The result is that groups using perf_event_attr::exclusive are no
    longer rotated.

    Fixes: 9e6302056f80 ("perf: Use hrtimers for event multiplexing")
    Reported-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Link: https://lkml.kernel.org/r/20201029162902.038667689@infradead.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/events/core.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/events/core.c b/kernel/events/core.c
    index c245ccd426b71..a06ac60d346f1 100644
    --- a/kernel/events/core.c
    +++ b/kernel/events/core.c
    @@ -2597,7 +2597,6 @@ group_error:

    error:
    pmu->cancel_txn(pmu);
    - perf_mux_hrtimer_restart(cpuctx);
    return -EAGAIN;
    }

    @@ -3653,6 +3652,7 @@ static int merge_sched_in(struct perf_event *event, void *data)

    *can_add_hw = 0;
    ctx->rotate_necessary = 1;
    + perf_mux_hrtimer_restart(cpuctx);
    }

    return 0;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 15:10    [W:2.818 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site