Skip to content

Refactor perf cpumap

Ian Rogers linux-arm-kernel linux-perf-users lkml 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest48 patches 37 repliesIn review
  2. v348 patches 13 repliesSuperseded
  3. v248 patches 9 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v122 patches17 repliesSuperseded

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/48libperf: Add comments to perf_cpu_map.tools/lib/perf/include/internal/cpumap.h+9 -02 replies
2/48perf stat: Add aggr creators that are passed a cpu.tools/perf/util/cpumap.c tools/perf/util/cpumap.h+51 -3411 replies
3/48perf stat: Correct aggregation CPU maptools/perf/util/stat-display.c+1 -11 reply
4/48perf stat: Switch aggregation to use for_each looptools/perf/util/stat-display.c+27 -212 replies
5/48perf stat: Switch to cpu version of cpu_map__gettools/perf/builtin-stat.c tools/perf/util/stat-display.c tools/perf/util/stat.h+57 -503 replies
6/48perf cpumap: Switch cpu_map__build_map to cpu functiontools/perf/builtin-stat.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+11 -310 replies
7/48perf cpumap: Remove map+index get_sockettools/perf/tests/topology.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h +1 more+2 -120 replies
8/48perf cpumap: Remove map+index get_dietools/perf/tests/topology.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h +1 more+2 -120 replies
9/48perf cpumap: Remove map+index get_coretools/perf/tests/topology.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+1 -100 replies
10/48perf cpumap: Remove map+index get_nodetools/perf/tests/topology.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+1 -100 replies
11/48perf cpumap: Add comments to aggr_cpu_idtools/perf/util/cpumap.h+9 -00 replies
12/48perf cpumap: Remove unused cpu_map__sockettools/perf/util/cpumap.h+0 -70 replies
13/48perf cpumap: Simplify equal function name.tools/perf/util/cpumap.c tools/perf/util/cpumap.h tools/perf/util/stat-display.c+18 -160 replies
14/48perf cpumap: Rename empty functions.tools/perf/builtin-stat.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h +1 more+25 -250 replies
15/48perf cpumap: Document cpu__get_node and remove redundant functiontools/perf/util/cpumap.c tools/perf/util/cpumap.h+9 -70 replies
16/48perf cpumap: Remove map from function names that don't use a map.tools/perf/util/cpumap.c tools/perf/util/cpumap.h tools/perf/util/env.c +1 more+27 -140 replies
17/48perf cpumap: Remove cpu_map__cpu, use libperf function.tools/perf/builtin-ftrace.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+3 -93 replies
18/48perf cpumap: Refactor cpu_map__build_maptools/perf/builtin-stat.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+130 -1320 replies
19/48perf cpumap: Rename cpu_map__get_X_aggr_by_cpu functionstools/perf/builtin-stat.c tools/perf/tests/topology.c tools/perf/util/cpumap.c +1 more+45 -240 replies
20/48perf cpumap: Move 'has' function to libperftools/lib/perf/Documentation/libperf.txt tools/lib/perf/cpumap.c tools/lib/perf/include/internal/cpumap.h +8 more+23 -220 replies
21/48perf cpumap: Add some comments to cpu_aggr_maptools/perf/util/cpumap.h+9 -10 replies
22/48perf cpumap: Trim the cpu_aggr_maptools/perf/util/cpumap.c+9 -10 replies
23/48perf stat: Fix memory leak in check_per_pkgtools/perf/util/stat.c+3 -20 replies
24/48perf cpumap: Add CPU to aggr_cpu_idtools/perf/tests/topology.c tools/perf/util/cpumap.c tools/perf/util/cpumap.h+48 -40 replies
25/48perf stat-display: Avoid use of core for CPU.tools/perf/util/stat-display.c+22 -230 replies
26/48perf evsel: Derive CPUs and threads in alloc_countstools/perf/tests/openat-syscall-all-cpus.c tools/perf/util/counts.c tools/perf/util/counts.h +2 more+15 -202 replies
27/48libperf: Switch cpu to more accurate cpu_map_idxtools/lib/perf/evsel.c tools/lib/perf/include/perf/evsel.h+50 -480 replies
28/48libperf: Use cpu not index for evsel mmaptools/lib/perf/evsel.c+2 -10 replies
29/48perf counts: Switch name cpu to cpu_map_idxtools/perf/util/counts.h+6 -60 replies
30/48perf stat: Rename aggr_data cpu to imply it's an indextools/perf/util/stat-display.c+5 -50 replies
31/48perf stat: Use perf_cpu_map__for_each_cputools/perf/util/stat-display.c+6 -50 replies
32/48perf script: Use for each cpu to aid readabilitytools/perf/builtin-script.c+3 -40 replies
33/48libperf: Allow NULL in perf_cpu_map__idxtools/lib/perf/cpumap.c+6 -10 replies
34/48perf evlist: Refactor evlist__for_each_cpu.tools/perf/builtin-stat.c tools/perf/util/evlist.c tools/perf/util/evlist.h +1 more+210 -1660 replies
35/48perf evsel: Pass cpu not cpu map index to synthesizetools/perf/builtin-stat.c+3 -20 replies
36/48perf stat: Correct variable name for read countertools/perf/builtin-stat.c tools/perf/util/evsel.c tools/perf/util/evsel.h+35 -350 replies
37/48perf evsel: Rename CPU around get_group_fdtools/perf/util/evsel.c+11 -110 replies
38/48perf evsel: Reduce scope of evsel__ignore_missing_threadtools/perf/util/evsel.c tools/perf/util/evsel.h+4 -80 replies
39/48perf evsel: Rename variable cpu to indextools/perf/util/evsel.c tools/perf/util/evsel.h tools/perf/util/stat.c +1 more+48 -470 replies
40/48perf test: Use perf_cpu_map__for_each_cputools/perf/tests/openat-syscall-all-cpus.c+14 -140 replies
41/48perf stat: Correct check_per_pkg cputools/perf/util/stat.c+3 -20 replies
42/48perf stat: Swap variable name cpu to indextools/perf/util/stat-shadow.c tools/perf/util/stat.c tools/perf/util/stat.h+164 -1640 replies
43/48libperf: Sync evsel documentationtools/lib/perf/Documentation/libperf.txt+5 -50 replies
44/48perf bpf: Rename cpu to cpu_map_idxtools/perf/util/bpf_counter.c tools/perf/util/bpf_counter.h+9 -112 replies
45/48perf c2c: Use more intention revealing iteratortools/perf/builtin-c2c.c+5 -50 replies
46/48perf script: Fix flipped index and cputools/perf/builtin-script.c+1 -10 replies
47/48perf stat: Correct first_shadow_cpu to return indextools/perf/util/stat-display.c+7 -80 replies
48/48perf cpumap: Give CPUs their own type.tools/lib/perf/cpumap.c tools/lib/perf/evlist.c tools/lib/perf/evsel.c +56 more+408 -3478 replies

Reviews trailers per patch

22 of 48 patches have a Reviewed-by or Acked-by.

PatchJames ClarkJohn GarryKajol Jain
1/48R-b R-b R-b
2/48R-b
3/48T-b
4/48R-b
5/48R-b
6/48R-b
7/48R-b
8/48R-b
9/48R-b
10/48R-b
11/48R-b
12/48R-b
13/48R-b
14/48R-b
15/48R-b
16/48R-b
17/48R-b
18/48R-b
19/48R-b
20/48R-b
21/48R-b
22/48R-b
23/48R-b
24/48
25/48
26/48
27/48
28/48
29/48
30/48
31/48
32/48
33/48
34/48
35/48
36/48
37/48
38/48
39/48
40/48
41/48
42/48
43/48
44/48
45/48
46/48
47/48
48/48

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/48] Refactor perf cpumap

Perf cpu map has various functions where a cpumap and index are passed in order to load the cpu. A problem with this is that the wrong index may be passed for the cpumap, causing problems like aggregation on the wrong CPU:
https://lore.kernel.org/lkml/[email protected]/

This patch set refactors the cpu map API, reducing it and explicitly passing the cpu (rather than the pair) to functions that need it. Comments are added at the same time. Changes modify the same file/function more than once as refactoring and fixes are broken apart for the sake of bisection.

v2. Incorproates fixes suggested Jiri Olsa, rewrites the evlist CPU
iterator in part in a way suggested by Riccardo Mancini. The new fixes start at patch 23. The final change was suggested by John Garry to make the CPUs have their own struct wrapper.

v3. Incorporates fixes suggested by Namhyung Kim.

v4. Rebases and incorporates fixes suggested by Jiri Olsa.

Ian Rogers (48):
libperf: Add comments to perf_cpu_map.
perf stat: Add aggr creators that are passed a cpu. perf stat: Correct aggregation CPU map
perf stat: Switch aggregation to use for_each loop perf stat: Switch to cpu version of cpu_map__get
perf cpumap: Switch cpu_map__build_map to cpu function perf cpumap: Remove map+index get_socket
perf cpumap: Remove map+index get_die
perf cpumap: Remove map+index get_core
perf cpumap: Remove map+index get_node
perf cpumap: Add comments to aggr_cpu_id
perf cpumap: Remove unused cpu_map__socket
perf cpumap: Simplify equal function name.
perf cpumap: Rename empty functions.
perf cpumap: Document cpu__get_node and remove redundant function perf cpumap: Remove map from function names that don't use a map. perf cpumap: Remove cpu_map__cpu, use libperf function. perf cpumap: Refactor cpu_map__build_map
perf cpumap: Rename cpu_map__get_X_aggr_by_cpu functions perf cpumap: Move 'has' function to libperf
perf cpumap: Add some comments to cpu_aggr_map
perf cpumap: Trim the cpu_aggr_map
perf stat: Fix memory leak in check_per_pkg
perf cpumap: Add CPU to aggr_cpu_id
perf stat-display: Avoid use of core for CPU.
perf evsel: Derive CPUs and threads in alloc_counts
libperf: Switch cpu to more accurate cpu_map_idx
libperf: Use cpu not index for evsel mmap
perf counts: Switch name cpu to cpu_map_idx
perf stat: Rename aggr_data cpu to imply it's an index perf stat: Use perf_cpu_map__for_each_cpu
perf script: Use for each cpu to aid readability
libperf: Allow NULL in perf_cpu_map__idx
perf evlist: Refactor evlist__for_each_cpu.
perf evsel: Pass cpu not cpu map index to synthesize perf stat: Correct variable name for read counter
perf evsel: Rename CPU around get_group_fd
perf evsel: Reduce scope of evsel__ignore_missing_thread perf evsel: Rename variable cpu to index
perf test: Use perf_cpu_map__for_each_cpu
perf stat: Correct check_per_pkg cpu
perf stat: Swap variable name cpu to index
libperf: Sync evsel documentation
perf bpf: Rename cpu to cpu_map_idx
perf c2c: Use more intention revealing iterator
perf script: Fix flipped index and cpu
perf stat: Correct first_shadow_cpu to return index perf cpumap: Give CPUs their own type.

 tools/lib/perf/Documentation/libperf.txt      |  11 +-
 tools/lib/perf/cpumap.c                       | 131 +++--
 tools/lib/perf/evlist.c                       |   4 +-
 tools/lib/perf/evsel.c                        |  92 ++--
 tools/lib/perf/include/internal/cpumap.h      |  18 +-
 tools/lib/perf/include/internal/evlist.h      |   3 +-
 tools/lib/perf/include/internal/evsel.h       |   4 +-
 tools/lib/perf/include/internal/mmap.h        |   5 +-
 tools/lib/perf/include/perf/cpumap.h          |   8 +-
 tools/lib/perf/include/perf/evsel.h           |  10 +-
 tools/lib/perf/libperf.map                    |   1 +
 tools/lib/perf/mmap.c                         |   2 +-
 tools/perf/arch/arm/util/cs-etm.c             |  16 +-
 tools/perf/bench/epoll-ctl.c                  |   2 +-
 tools/perf/bench/epoll-wait.c                 |   2 +-
 tools/perf/bench/futex-hash.c                 |   2 +-
 tools/perf/bench/futex-lock-pi.c              |   2 +-
 tools/perf/bench/futex-requeue.c              |   2 +-
 tools/perf/bench/futex-wake-parallel.c        |   2 +-
 tools/perf/bench/futex-wake.c                 |   2 +-
 tools/perf/builtin-c2c.c                      |  15 +-
 tools/perf/builtin-ftrace.c                   |   2 +-
 tools/perf/builtin-kmem.c                     |   2 +-
 tools/perf/builtin-record.c                   |   2 +-
 tools/perf/builtin-sched.c                    |  71 +--
 tools/perf/builtin-script.c                   |  10 +-
 tools/perf/builtin-stat.c                     | 516 +++++++++---------
 tools/perf/tests/attr.c                       |   6 +-
 tools/perf/tests/bitmap.c                     |   2 +-
 tools/perf/tests/cpumap.c                     |   6 +-
 tools/perf/tests/event_update.c               |   6 +-
 tools/perf/tests/mem2node.c                   |   2 +-
 tools/perf/tests/mmap-basic.c                 |   4 +-
 tools/perf/tests/openat-syscall-all-cpus.c    |  39 +-
 tools/perf/tests/stat.c                       |   3 +-
 tools/perf/tests/topology.c                   |  43 +-
 tools/perf/util/affinity.c                    |   2 +-
 tools/perf/util/auxtrace.c                    |  12 +-
 tools/perf/util/auxtrace.h                    |   5 +-
 tools/perf/util/bpf_counter.c                 |  16 +-
 tools/perf/util/bpf_counter.h                 |   4 +-
 tools/perf/util/counts.c                      |   8 +-
 tools/perf/util/counts.h                      |  14 +-
 tools/perf/util/cpumap.c                      | 253 ++++-----
 tools/perf/util/cpumap.h                      | 116 ++--
 tools/perf/util/cputopo.c                     |   6 +-
 tools/perf/util/env.c                         |  29 +-
 tools/perf/util/env.h                         |   3 +-
 tools/perf/util/evlist.c                      | 148 ++---
 tools/perf/util/evlist.h                      |  50 +-
 tools/perf/util/evsel.c                       | 143 ++---
 tools/perf/util/evsel.h                       |  27 +-
 tools/perf/util/expr.c                        |   2 +-
 tools/perf/util/header.c                      |   6 +-
 tools/perf/util/mmap.c                        |  19 +-
 tools/perf/util/mmap.h                        |   3 +-
 tools/perf/util/perf_api_probe.c              |  15 +-
 tools/perf/util/python.c                      |   4 +-
 tools/perf/util/record.c                      |  11 +-
 .../scripting-engines/trace-event-python.c    |   6 +-
 tools/perf/util/session.c                     |  10 +-
 tools/perf/util/stat-display.c                | 138 ++---
 tools/perf/util/stat-shadow.c                 | 308 +++++------
 tools/perf/util/stat.c                        |  47 +-
 tools/perf/util/stat.h                        |   9 +-
 tools/perf/util/svghelper.c                   |   6 +-
 tools/perf/util/synthetic-events.c            |  12 +-
 tools/perf/util/synthetic-events.h            |   3 +-
 tools/perf/util/util.h                        |   5 +-
 69 files changed, 1333 insertions(+), 1155 deletions(-)
Signature · 1 line
2.34.1.448.ga2b2bfdf31-goog