Skip to content

perf/x86/intel/uncore: PMU setup robustness fixes

Zide Chen linux-perf-users lkml 3 versions – Applied

Status from this message: The following commit has been merged into the perf/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest8 patches 3 repliesApplied
  2. v28 patches 18 repliesSuperseded
  3. v17 patches 14 repliesSuperseded

Changes in v3 from the cover letter

- patch 2/8: Instead of removing atomic_inc(&box->refcnt) in PMU register, add the corresponding atomic_dec_return(&box->refcnt) in PMU unregister. (Dapeng)
- patch 6/8: Minor changes in code comments.
- patch 7/8: Minor changelog update. (Dapeng)
- Add Reviewed-by tags.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/8perf/x86/intel/uncore: Fix PCI PMU cleanup on setup failurearch/x86/events/intel/uncore.c+4 -10 replies
2/8perf/x86/intel/uncore: Fix refcnt and other cleanupsarch/x86/events/intel/uncore.c arch/x86/events/intel/uncore.h+12 -101 reply
3/8perf/x86/intel/uncore: Let init_box() callback report failuresarch/x86/events/intel/uncore.h arch/x86/events/intel/uncore_discovery.c arch/x86/events/intel/uncore_discovery.h +3 more+126 -770 replies
4/8perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup failsarch/x86/events/intel/uncore.c+0 -20 replies
5/8perf/x86/intel/uncore: Factor out box setup codearch/x86/events/intel/uncore.c+28 -120 replies
6/8perf/x86/intel/uncore: Introduce PMU flags and broken statearch/x86/events/intel/uncore.c arch/x86/events/intel/uncore.h arch/x86/events/intel/uncore_snb.c+46 -131 reply
7/8perf/x86/intel/uncore: Fix uncore_box ref/unref orderingarch/x86/events/intel/uncore.c+23 -271 reply
8/8perf/x86/intel/uncore: Implement lazy setup for MSR/MMIO PMUsarch/x86/events/intel/uncore.c arch/x86/events/intel/uncore.h+22 -620 replies

Reviews trailers per patch

All 8 patches have a Reviewed-by or Acked-by.

PatchDapeng MiIan Rogers
1/8R-b
2/8R-b
3/8R-b R-b
4/8R-b R-b
5/8R-b R-b
6/8R-b
7/8R-b R-b
8/8R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/8] perf/x86/intel/uncore: PMU setup robustness fixes

This series fixes correctness issues in Intel uncore PMU setup:

- If all init_box() on a PMU fails, the PMU sysfs node may still exist, while perf events read zeros and silently report wrong data.
- If init_box() fails on only some dies, perf may return partial non-zero counts, which is harder to diagnose.
- CPU hotplug ref/unref ordering bugs can skip init_box() when the first CPU in a die comes online, and can call box_exit() prematurely when the second-to-last CPU goes offline.
- PCI PMU cleanup on setup failure has activeboxes leaks and potential NULL pointer dereference in error paths.

To address this, the series introduces a PMU broken state to track setup failures and switches MSR/MMIO PMUs to lazy registration, matching existing PCI behavior.

To avoid merge conflicts, this series should be applied after:
https://lore.kernel.org/lkml/[email protected]/
(textual conflict, no logical dependency)

Only cosmetic changes only in v3.

V3 changes:
- patch 2/8: Instead of removing atomic_inc(&box->refcnt) in PMU register, add the corresponding atomic_dec_return(&box->refcnt) in PMU unregister. (Dapeng)
- patch 6/8: Minor changes in code comments.
- patch 7/8: Minor changelog update. (Dapeng)
- Add Reviewed-by tags.

V2 changes:
- Add new patch 1 to fix PCI PMU cleanup issues (Sashiko)
- Keep pmu->activeboxes naming and semantics to avoid potential refcnt leaks in the uncore_pci_remove() path. To accomplish this, make the PMU broken flag sticky and decrement pmu->activeboxes on active box only.
- Update commit messages and changelogs according.

V2: https://lore.kernel.org/lkml/[email protected]/
V1: https://lore.kernel.org/lkml/[email protected]/
Sashiko's review: https://sashiko.dev/#/patchset/[email protected]

Zide Chen (8):
perf/x86/intel/uncore: Fix PCI PMU cleanup on setup failure perf/x86/intel/uncore: Fix refcnt and other cleanups perf/x86/intel/uncore: Let init_box() callback report failures perf/x86/intel/uncore: Keep PCI PMUs working when MMIO/MSR setup fails perf/x86/intel/uncore: Factor out box setup code perf/x86/intel/uncore: Introduce PMU flags and broken state perf/x86/intel/uncore: Fix uncore_box ref/unref ordering perf/x86/intel/uncore: Implement lazy setup for MSR/MMIO PMUs

 arch/x86/events/intel/uncore.c           | 225 +++++++++++------------
 arch/x86/events/intel/uncore.h           |  39 +++-
 arch/x86/events/intel/uncore_discovery.c |  21 ++-
 arch/x86/events/intel/uncore_discovery.h |   6 +-
 arch/x86/events/intel/uncore_nhmex.c     |   3 +-
 arch/x86/events/intel/uncore_snb.c       |  82 ++++++---
 arch/x86/events/intel/uncore_snbep.c     |  77 +++++---
 7 files changed, 255 insertions(+), 198 deletions(-)
Signature · 1 line
2.54.0