perf/core: sched_task() dispatch and branch entry fixes
Status from this message: The following commit has been merged into the perf/urgent branch of tip:
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v6 posting 2/23 patches 4 repliesIn review
- v7 Latest3 patches 5 repliesApplied
- v6 posting 1/23 patches 7 repliesSuperseded
Earlier versions · 5
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v5 | 4 patches | 23 replies | Superseded | |
| v4 | 4 patches | 4 replies | Superseded | |
| v3 | 4 patches | 1 reply | Superseded | |
| v2 | 4 patches | 10 replies | Superseded | |
| v1 | 3 patches | 3 replies | Superseded |
Changes in v7 from the cover letter
- Patch 1: pass &cpc->epc unconditionally. cpc->task_epc is NULL there both before and after patch 2, so the conditional was dead.
- Patch 2: gate perf_pmu_sched_task() on cpc->task_epc alone. It is never set without a task context scheduled in, so the cpuctx->task_ctx test was redundant and the two gates are now inverses.
- Patch 3: fill the entry at each site instead of renaming the helper, as suggested by Peter.
- Dropped the v6 review tags, all three patches changed.
Patches in v7 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | perf/core: Fix NULL pmu_ctx passed to pmu->sched_task()kernel/ | +1 | 1 reply | |
| 2/3 | perf/core: Run sched_task() for PMUs with only CPU-wide eventskernel/ | +9 | 0 replies | |
| 3/3 | perf/core: Fill branch entries with a single assignmentarch/ arch/ arch/ +2 more | +48 | 0 replies |
Reviews trailers per patch
None of the 3 patches has a Reviewed-by or Acked-by.
| Patch | Yifan Wu |
|---|---|
| Series | T-b |
| 1/3 | |
| 2/3 | |
| 3/3 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v7 0/3] perf/core: sched_task() dispatch and branch entry fixes
These three fixes were found while adding BRBE support for bpf_get_branch_snapshot() on arm64 and were carried in that series until v6 [1]. They do not depend on it, so they go on their own; the version number continues from that series to avoid two numbering schemes for the same patches.
Patch 1 stops __perf_pmu_sched_task() passing a NULL pmu_ctx to pmu->sched_task(). armv8pmu_sched_task() is the only implementation that dereferences the argument, so the oops needs BRBE.
Patch 2 makes perf_pmu_sched_task() visit PMUs whose events are all CPU-wide. They are skipped today on every switch to a task that has a perf context but no event on that PMU, so branch records leak across the task boundary with perf record -b -a. intel_pmu_lbr_add() calls perf_sched_cb_inc() unconditionally, so x86 LBR is affected the same way.
Patch 3 has each caller fill struct perf_branch_entry in one assignment rather than clearing the bitfields first, and drops perf_clear_branch_entry_bitfields(). The helper had drifted from the
struct: new_type and priv were never cleared, and arm_pmuv3.c allocates the per-CPU branch stack with kmalloc().
Tested on a 128 CPU arm64 machine with BRBE. A WARN_ON_ONCE() at the gate patch 2 adds to perf_ctx_sched_task_cb() fires within seconds of running perf record -b -a alongside a task-bound event pinned to a different CPU. Also built for x86, which patch 3 touches.
Changes in v7:
- Patch 1: pass &cpc->epc unconditionally. cpc->task_epc is NULL there both before and after patch 2, so the conditional was dead.
- Patch 2: gate perf_pmu_sched_task() on cpc->task_epc alone. It is never set without a task context scheduled in, so the cpuctx->task_ctx test was redundant and the two gates are now inverses.
- Patch 3: fill the entry at each site instead of renaming the helper, as suggested by Peter.
- Dropped the v6 review tags, all three patches changed.
Changes in v6:
- Split the sched_task() fix into patches 1 and 2; the NULL dereference and the missed dispatch are separate bugs with different reachability.
- Gate perf_ctx_sched_task_cb() on cpc->task_epc. v5 removed the early return in perf_pmu_sched_task() without it, so both paths ran for a task whose event for that PMU is pinned to another CPU. Caught by the WARN_ON_ONCE() described above.
- Tag patches 1 and 2 for stable.
- Send separately from the BRBE series, rebased onto tip perf/core.
[1] https://lore.kernel.org/all/[email protected]/
v6: https://lore.kernel.org/bpf/[email protected]/
Puranjay Mohan (3):
perf/core: Fix NULL pmu_ctx passed to pmu->sched_task() perf/core: Run sched_task() for PMUs with only CPU-wide events perf/core: Fill branch entries with a single assignment
arch/x86/events/amd/brs.c | 9 +++-- arch/x86/events/amd/lbr.c | 16 ++++----- arch/x86/events/intel/lbr.c | 65 ++++++++++++++++++++----------------- drivers/perf/arm_brbe.c | 2 +- include/linux/perf_event.h | 17 ---------- kernel/events/core.c | 15 ++++++--- 6 files changed, 58 insertions(+), 66 deletions(-)
Signature · 1 line
2.53.0-Meta