Cpumap improvements for large MAX_NR_CPUS
Ian Rogers
reviewercover Cpumap improvements for large MAX_NR_CPUS
Prompted by Kyle Meyer's <[email protected]> report of the MAX_NR_CPUS value being too small, initiate some clean up of its use. Kyle's patch is at the head of the series. The additional patches hide MAX_NR_CPUS as exposed from cpumap.h, reduce its use by removing perf_cpu_map__read, and try to better size the temporary CPU array in perf_cpu_map__new.
Ian Rogers (7):
perf cpumap: Reduce transitive dependencies on libperf MAX_NR_CPUS libperf cpumap: Hide/reduce scope of MAX_NR_CPUS libperf cpumap: Be tolerant of newline at the end of a cpumask perf pmu: Remove use of perf_cpu_map__read
libperf cpumap: Remove use of perf_cpu_map__read libperf cpumap: Remove perf_cpu_map__read
libperf cpumap: Grow array of read CPUs in smaller increments
Kyle Meyer (1):
perf: Increase MAX_NR_CPUS to 4096
tools/lib/perf/Documentation/libperf.txt | 1 - tools/lib/perf/cpumap.c | 82 +++++------------------- tools/lib/perf/include/internal/cpumap.h | 4 -- tools/lib/perf/include/perf/cpumap.h | 2 - tools/lib/perf/libperf.map | 1 - tools/perf/builtin-annotate.c | 1 + tools/perf/builtin-diff.c | 1 + tools/perf/builtin-kwork.c | 1 + tools/perf/builtin-mem.c | 1 + tools/perf/builtin-sched.c | 1 + tools/perf/perf.h | 2 +- tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +- tools/perf/util/kwork.h | 1 + tools/perf/util/pmu.c | 30 ++++++--- tools/perf/util/session.c | 1 + tools/perf/util/svghelper.c | 1 + 16 files changed, 47 insertions(+), 87 deletions(-)
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 1/8 perf: Increase MAX_NR_CPUS to 4096
From: Kyle Meyer <[email protected]>
Systems have surpassed 2048 CPUs. Increase MAX_NR_CPUS to 4096.
Bitmaps declared with MAX_NR_CPUS bits will increase from 256B to 512B, cpus_runtime will increase from 81960B to 163880B, and max_entries will increase from 8192B to 16384B.
--- tools/lib/perf/include/internal/cpumap.h | 2 +- tools/perf/perf.h | 2 +- tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)
tools/lib/perf/include/internal/cpumap.h +1 -1
@@ -22,7 +22,7 @@ DECLARE_RC_STRUCT(perf_cpu_map) { };#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 2048 +#define MAX_NR_CPUS 4096#endif struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus);
tools/perf/perf.h +1 -1
@@ -3,7 +3,7 @@#define _PERF_PERF_H#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 2048 +#define MAX_NR_CPUS 4096#endif enum perf_affinity {
tools/perf/util/bpf_skel/kwork_top.bpf.c +3 -1
@@ -18,7 +18,9 @@ enum kwork_class_type { };#define MAX_ENTRIES 102400 -#define MAX_NR_CPUS 2048 +#ifndef MAX_NR_CPUS +#define MAX_NR_CPUS 4096 +#endif #define PF_KTHREAD 0x00200000#define MAX_COMMAND_LEN 16
Signature · 1 line
2.47.0.338.g60cca15819-goog
Re: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
Hi Ian,
Quoted 22 lines · Ian Rogers
From: Kyle Meyer <[email protected]>
Systems have surpassed 2048 CPUs. Increase
MAX_NR_CPUSto 4096.Bitmaps declared with
MAX_NR_CPUSbits will increase from 256B to 512B,cpus_runtimewill increase from 81960B to 163880B, andmax_entrieswill increase from 8192B to 16384B.Signed-off-by Kyle Meyer <[email protected]>Reviewed-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/cpumap.h | 2 +- tools/perf/perf.h | 2 +- tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)tools/lib/perf/include/internal/cpumap.h +0
-0
tools/lib/perf/include/internal/cpumap.h DECLARE_RC_STRUCT(perf_cpu_map) { · line 26
Quoted 6 lines
tools/lib/perf/include/internal/cpumap.h +1
-1@@ -22,7 +22,7 @@ DECLARE_RC_STRUCT(perf_cpu_map) { };#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 2048 +#define MAX_NR_CPUS 4096#endif
This series is fine for me. Just wandering if we can use a central place to maintain the macro, e.g. lib/perf/include/perf/cpumap.h. It is pointless to define exactly same macros in different headers. As least, I think we can unify this except the kwork bpf program?
P.s. for dynamically allocating per CPU maps in eBPF program, we can refer to the code samples/bpf/xdp_sample_user.c, but this is another topic.
Thanks,
Leo
Quoted 33 lines
tools/lib/perf/include/internal/cpumap.h +0
-0struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus);tools/perf/perf.h +1
-1@@ -3,7 +3,7 @@#define _PERF_PERF_H#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 2048 +#define MAX_NR_CPUS 4096#endif enum perf_affinity {tools/perf/util/bpf_skel/kwork_top.bpf.c +3
-2@@ -18,7 +18,9 @@ enum kwork_class_type { };#define MAX_ENTRIES 102400 -#define MAX_NR_CPUS 2048 +#ifndef MAX_NR_CPUS +#define MAX_NR_CPUS 4096 +#endif #define PF_KTHREAD 0x00200000#define MAX_COMMAND_LEN 16 --2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerRe: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
Quoted 38 lines · Leo Yan
Hi Ian,
Quoted 22 lines · Ian Rogers
From: Kyle Meyer <[email protected]>
Systems have surpassed 2048 CPUs. Increase
MAX_NR_CPUSto 4096.Bitmaps declared with
MAX_NR_CPUSbits will increase from 256B to 512B,cpus_runtimewill increase from 81960B to 163880B, andmax_entrieswill increase from 8192B to 16384B.Signed-off-by Kyle Meyer <[email protected]>Reviewed-by Ian Rogers <[email protected]>--- tools/lib/perf/include/internal/cpumap.h | 2 +- tools/perf/perf.h | 2 +- tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)tools/lib/perf/include/internal/cpumap.h +0
-0tools/lib/perf/include/internal/cpumap.h DECLARE_RC_STRUCT(perf_cpu_map) { · line 26
Quoted 6 lines
tools/lib/perf/include/internal/cpumap.h +1
-1@@ -22,7 +22,7 @@ DECLARE_RC_STRUCT(perf_cpu_map) { };#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 2048 +#define MAX_NR_CPUS 4096#endif This series is fine for me. Just wandering if we can use a central place to maintain the macro, e.g.
lib/perf/include/perf/cpumap.h. It is pointless to define exactly same macros in different headers. As least, I think we can unify this except the kwork bpf program?
Quoted 3 lines
P.s. for dynamically allocating per CPU maps in eBPF program, we can refer to the code
samples/bpf/xdp_sample_user.c, but this is another topic.
Thanks Leo,
can I take this as an acked-by? Wrt a single constant I agree, following these changes MAX_NR_CPUS is just used for a warning in libperf's cpumap.c. I think we're agreed that getting rid of the constant would be best. I also think the cpumap logic is duplicating something that libc is providing in cpu_set:
https://man7.org/linux/man-pages/man3/CPU_SET.3.html
And we have more than one representation in perf for the sake of the disk representation:
https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/lib/perf/include/perf/event.h?h=perf-tools-next#n227
Just changing the int to be a s16 would lower the memory overhead, which is why I'd kind of like the abstraction to be minimal.
Thanks,
Ian
Re: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
Hi Ian,
On Fri, Dec 06, 2024 at 08:25:06AM -0800, Ian Rogers wrote:
[...]
Quoted 5 lines
Quoted 5 lines
This series is fine for me. Just wandering if we can use a central place to maintain the macro, e.g.
lib/perf/include/perf/cpumap.h. It is pointless to define exactly same macros in different headers. As least, I think we can unify this except the kwork bpf program?
Quoted 7 lines
Quoted 3 lines
P.s. for dynamically allocating per CPU maps in eBPF program, we can refer to the code
samples/bpf/xdp_sample_user.c, but this is another topic.Thanks Leo,
can I take this as an acked-by?
Yeah. I will give my review tags in the cover letter.
Quoted 8 lines
Wrt a single constant I agree,
following these changesMAX_NR_CPUSis just used for a warning in libperf'scpumap.c. I think we're agreed that getting rid of the constant would be best. I also think the cpumap logic is duplicating something that libc is providing incpu_set.And we have more than one representation in perf for the sake of the disk representation:
Thanks for sharing the info.
Quoted 2 lines
Just changing the int to be a s16 would lower the memory overhead, which is why I'd kind of like the abstraction to be minimal.
Here I am not clear what for "changing the int to be a s16". Could you elaberate a bit for this?
Lastly, I also found multiple files use "MAX_CPUS" rather than "MAX_NR_CPUS". Polish them in a new series?
Thanks,
Leo
Ian Rogers
reviewerRe: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
Quoted 31 lines · Leo Yan
Hi Ian,
On Fri, Dec 06, 2024 at 08:25:06AM -0800, Ian Rogers wrote:
[...]
Quoted 5 lines
Quoted 5 lines
This series is fine for me. Just wandering if we can use a central place to maintain the macro, e.g.
lib/perf/include/perf/cpumap.h. It is pointless to define exactly same macros in different headers. As least, I think we can unify this except the kwork bpf program?Quoted 7 lines
Quoted 3 lines
P.s. for dynamically allocating per CPU maps in eBPF program, we can refer to the code
samples/bpf/xdp_sample_user.c, but this is another topic.Thanks Leo,
can I take this as an acked-by?
Yeah. I will give my review tags in the cover letter.
Quoted 8 lines
Wrt a single constant I agree,
following these changesMAX_NR_CPUSis just used for a warning in libperf'scpumap.c. I think we're agreed that getting rid of the constant would be best. I also think the cpumap logic is duplicating something that libc is providing incpu_set.And we have more than one representation in perf for the sake of the disk representation:
Quoted 7 lines
Thanks for sharing the info.
Quoted 2 lines
Just changing the int to be a s16 would lower the memory overhead, which is why I'd kind of like the abstraction to be minimal.
Here I am not clear what for "changing the int to be a s16". Could you elaberate a bit for this?
I meant this :-)
https://lore.kernel.org/lkml/[email protected]/
Quoted 2 lines
Lastly, I also found multiple files use "
MAX_CPUS" rather than "MAX_NR_CPUS". Polish them in a new series?
Makes sense.
Thanks,
Ian
RE: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
..
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Just changing the int to be a s16 would lower the memory overhead, which is why I'd kind of like the abstraction to be minimal.
Here I am not clear what for "changing the int to be a s16". Could you elaberate a bit for this?
I meant this :-)
https://lore.kernel.org/lkml/[email protected]/
How many time is this allocated?
If it is 2 bytes in a larger structure it is likely to be noise. For a local the code is likely to be worse.
Any maths and you start forcing the compiler to mask the value (on pretty much anything except x86).
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Ian Rogers
reviewerRe: [PATCH v1 1/8] perf: Increase MAX_NR_CPUS to 4096
Quoted 8 lines · David Laight
..
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines
Just changing the int to be a s16 would lower the memory overhead, which is why I'd kind of like the abstraction to be minimal.
Here I am not clear what for "changing the int to be a s16". Could you elaberate a bit for this?
Quoted 8 lines
Quoted 2 lines
I meant this :-)
https://lore.kernel.org/lkml/[email protected]/How many time is this allocated?
If it is 2 bytes in a larger structure it is likely to be noise. For a local the code is likely to be worse.
Any maths and you start forcing the compiler to mask the value (on pretty much anything except x86).
So the data structure is a sorted array of ints, this changes it to int16s. On the 32 socket GNR with > 2048 logical CPUs, the array would be over 8kb before and 4kb after for all online CPUs. On my more modest desktop with 72 logical cores the size goes from 288 bytes down to 144, a reduction of 2 cache lines. I'm not super excited about the memory savings, but the patch is only 8 lines in difference.
Thanks,
Ian
Ian Rogers
reviewerPATCH 2/8 perf cpumap: Reduce transitive dependencies on libperf MAX_NR_CPUS
In reply to Ian Rogerslibperf exposes MAX_NR_CPUS via tools/lib/perf/include/internal/cpumap.h which is internal. The preferred dependency should be the definition in tools/perf/perf.h. Add the includes of perf.h so that MAX_NR_CPUS can be hidden in libperf.
--- tools/perf/builtin-annotate.c | 1 + tools/perf/builtin-diff.c | 1 + tools/perf/builtin-kwork.c | 1 + tools/perf/builtin-mem.c | 1 + tools/perf/builtin-sched.c | 1 + tools/perf/util/kwork.h | 1 + tools/perf/util/session.c | 1 + tools/perf/util/svghelper.c | 1 + 8 files changed, 8 insertions(+)
tools/perf/builtin-annotate.c +1 -0
@@ -7,6 +7,7 @@* a histogram of results, along various sorting keys. */ #include "builtin.h" +#include "perf.h" #include "util/color.h" #include <linux/list.h>
tools/perf/builtin-diff.c +1 -0
@@ -6,6 +6,7 @@* DSOs and symbol information, sort them and produce a diff. */ #include "builtin.h" +#include "perf.h" #include "util/debug.h" #include "util/event.h"
tools/perf/builtin-kwork.c +1 -0
@@ -6,6 +6,7 @@*/ #include "builtin.h" +#include "perf.h" #include "util/data.h" #include "util/evlist.h"
tools/perf/builtin-mem.c +1 -0
@@ -4,6 +4,7 @@#include <sys/stat.h> #include <unistd.h> #include "builtin.h" +#include "perf.h" #include <subcmd/parse-options.h> #include "util/auxtrace.h"
tools/perf/builtin-sched.c +1 -0
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include "builtin.h" +#include "perf.h" #include "perf-sys.h" #include "util/cpumap.h"
tools/perf/util/kwork.h +1 -0
@@ -1,6 +1,7 @@#ifndef PERF_UTIL_KWORK_H #define PERF_UTIL_KWORK_H +#include "perf.h" #include "util/tool.h" #include "util/time-utils.h"
tools/perf/util/session.c +1 -0
@@ -37,6 +37,7 @@#include "arch/common.h" #include "units.h" #include "annotate.h" +#include "perf.h" #include <internal/lib.h> static int perf_session__deliver_event(struct perf_session *session,
tools/perf/util/svghelper.c +1 -0
@@ -21,6 +21,7 @@#include <perf/cpumap.h> #include "env.h" +#include "perf.h" #include "svghelper.h" static u64 first_time, last_time;
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 3/8 libperf cpumap: Hide/reduce scope of MAX_NR_CPUS
In reply to Ian RogersAvoid redefinition of MAX_NR_CPUS as a global constant, the original definition is tools/perf/perf.h.
--- tools/lib/perf/cpumap.c | 2 ++ tools/lib/perf/include/internal/cpumap.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
tools/lib/perf/cpumap.c +2 -0
@@ -11,6 +11,8 @@#include <limits.h> #include "internal.h" +#define MAX_NR_CPUS 4096 +void perf_cpu_map__set_nr (struct perf_cpu_map *map,int nr_cpus) {RC_CHK_ACCESS (map)->nr = nr_cpus;
tools/lib/perf/include/internal/cpumap.h +0 -4
@@ -21,10 +21,6 @@ DECLARE_RC_STRUCT(perf_cpu_map) {struct perf_cpu map[]; }; -#ifndef MAX_NR_CPUS -#define MAX_NR_CPUS 4096 -#endif -struct perf_cpu_map *perf_cpu_map__alloc (int nr_cpus);int perf_cpu_map__idx (const struct perf_cpu_map *cpus,struct perf_cpu cpu);bool perf_cpu_map__is_subset (const struct perf_cpu_map *a,const struct perf_cpu_map *b);
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 4/8 libperf cpumap: Be tolerant of newline at the end of a cpumask
In reply to Ian RogersFile cpumasks often have a newline that shouldn't trigger the invalid parsing case in perf_cpu_map__new.
--- tools/lib/perf/cpumap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/perf/cpumap.c +2 -2
@@ -240,7 +240,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) p =NULL ; start_cpu =strtoul (cpu_list, &p,0 );if (start_cpu >=INT_MAX - || (*p !='\0' && *p !=',' && *p !='-' )) + || (*p !='\0' && *p !=',' && *p !='-' && *p !='\n' )) goto invalid;if (*p =='-' ) {
@@ -248,7 +248,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) p =NULL ; end_cpu =strtoul (cpu_list, &p,0 ); -if (end_cpu >=INT_MAX || (*p !='\0' && *p !=',' )) +if (end_cpu >=INT_MAX || (*p !='\0' && *p !=',' && *p !='\n' )) goto invalid;if (end_cpu < start_cpu)
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 5/8 perf pmu: Remove use of perf_cpu_map__read
In reply to Ian RogersRemove use of a FILE and switch to reading a string that is then passed to perf_cpu_map__new. Being able to remove perf_cpu_map__read avoids duplicated parsing logic.
--- tools/perf/util/pmu.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)
tools/perf/util/pmu.c +20 -10
@@ -12,6 +12,7 @@#include <stdbool.h> #include <dirent.h> #include <api/fs/fs.h> +#include <api/io.h> #include <locale.h> #include <fnmatch.h> #include <math.h>
@@ -748,26 +749,35 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias, int err_loc, struct lis* Uncore PMUs have a "cpumask" file under sysfs. CPU PMUs (e.g. on arm/arm64) * may have a "cpus" file. */ -static struct perf_cpu_map *pmu_cpumask (int dirfd,const char *name,bool is_core) +static struct perf_cpu_map *pmu_cpumask (int dirfd,const char *pmu_name,bool is_core) { -struct perf_cpu_map *cpus;const char *templates[] = {"cpumask" ,"cpus" ,NULL };const char **template; -char pmu_name[PATH_MAX ]; -struct perf_pmu pmu = {.name = pmu_name}; -FILE *file; -strlcpy (pmu_name, name,sizeof (pmu_name));for (template = templates; *template; template++) { - file =perf_pmu__open_file_at (&pmu, dirfd, *template); -if (!file) +struct io io; +char buf[128 ]; +char *cpumask =NULL ; +size_t cpumask_len; +ssize_t ret; +struct perf_cpu_map *cpus; + + io.fd =perf_pmu__pathname_fd (dirfd, pmu_name, *template,O_RDONLY ); +if (io.fd <0 )continue ; - cpus =perf_cpu_map__read (file); -fclose (file); + +io__init (&io, io.fd, buf,sizeof (buf)); + ret =io__getline (&io, &cpumask, &cpumask_len); +close (io.fd); +if (ret <0 ) +continue ; + + cpus =perf_cpu_map__new (cpumask); +free (cpumask);if (cpus)return cpus; }
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 6/8 libperf cpumap: Remove use of perf_cpu_map__read
In reply to Ian RogersRemove use of a FILE and switch to reading a string that is then passed to perf_cpu_map__new. Being able to remove perf_cpu_map__read avoids duplicated parsing logic.
--- tools/lib/perf/cpumap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/lib/perf/cpumap.c +6 -5
@@ -10,6 +10,7 @@#include <ctype.h> #include <limits.h> #include "internal.h" +#include <api/fs/fs.h> #define MAX_NR_CPUS 4096
@@ -102,12 +103,12 @@ static struct perf_cpu_map *cpu_map__new_sysconf(void)static struct perf_cpu_map *cpu_map__new_sysfs_online (void ) {struct perf_cpu_map *cpus =NULL ; -FILE *onlnf; +char *buf =NULL ; +size_t buf_len; - onlnf =fopen ("/sys/devices/system/cpu/online" ,"r" ); -if (onlnf) { - cpus =perf_cpu_map__read (onlnf); -fclose (onlnf); +if (sysfs__read_str ("devices/system/cpu/online" , &buf, &buf_len) >=0 ) { + cpus =perf_cpu_map__new (buf); +free (buf); }return cpus; }
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 7/8 libperf cpumap: Remove perf_cpu_map__read
In reply to Ian RogersFunction is no longer used and duplicates the parsing logic from perf_cpu_map__new. Remove to allow simplification.
--- tools/lib/perf/Documentation/libperf.txt | 1 - tools/lib/perf/cpumap.c | 56 ------------------------ tools/lib/perf/include/perf/cpumap.h | 2 - tools/lib/perf/libperf.map | 1 - 4 files changed, 60 deletions(-)
tools/lib/perf/Documentation/libperf.txt +0 -1
@@ -39,7 +39,6 @@ SYNOPSIS struct perf_cpu_map *perf_cpu_map__new_any_cpu(void); struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); - struct perf_cpu_map *perf_cpu_map__read(FILE *file); struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig, struct perf_cpu_map *other);
tools/lib/perf/cpumap.c +0 -56
62 lines not on this page · raw message
tools/lib/perf/include/perf/cpumap.h +0 -2
@@ -3,7 +3,6 @@#define __LIBPERF_CPUMAP_H#include <perf/core.h> -#include <stdio.h> #include <stdbool.h> /** A wrapper around a CPU to avoid confusion with the perf_cpu_map's map's indices. */
@@ -37,7 +36,6 @@ LIBPERF_API struct perf_cpu_map *perf_cpu_map__new_online_cpus(void);* perf_cpu_map__new_online_cpus is returned. */ LIBPERF_API struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list); -LIBPERF_API struct perf_cpu_map *perf_cpu_map__read(FILE *file); LIBPERF_API struct perf_cpu_map *perf_cpu_map__get(struct perf_cpu_map *map); LIBPERF_API struct perf_cpu_map *perf_cpu_map__merge(struct perf_cpu_map *orig,struct perf_cpu_map *other);
tools/lib/perf/libperf.map +0 -1
@@ -6,7 +6,6 @@ LIBPERF_0.0.1 { perf_cpu_map__get; perf_cpu_map__put; perf_cpu_map__new; - perf_cpu_map__read; perf_cpu_map__nr; perf_cpu_map__cpu; perf_cpu_map__has_any_cpu_or_is_empty;
Signature · 1 line
2.47.0.338.g60cca15819-goog
Ian Rogers
reviewerPATCH 8/8 libperf cpumap: Grow array of read CPUs in smaller increments
In reply to Ian RogersInstead of growing the array by 2048, grow by the larger of the current range or 16. As ranges are typical for things like the online CPUs this will mean a single allocation happens. While uncore CPU maps will grow 16 at a time which is a value that is generous except say on large servers.
--- tools/lib/perf/cpumap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/lib/perf/cpumap.c +5 -4
@@ -212,7 +212,7 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) goto invalid;if (nr_cpus == max_entries) { - max_entries +=MAX_NR_CPUS ; + max_entries +=max (end_cpu - start_cpu +1 ,16UL ); tmp =realloc (tmp_cpus, max_entries *sizeof (struct perf_cpu ));if (tmp ==NULL ) goto invalid;
@@ -226,14 +226,15 @@ struct perf_cpu_map *perf_cpu_map__new(const char *cpu_list) cpu_list = p; } -if (nr_cpus >0 ) +if (nr_cpus >0 ) { cpus =cpu_map__trim_new (nr_cpus, tmp_cpus); -else if (*cpu_list !='\0' ) { + }else if (*cpu_list !='\0' ) {pr_warning ("Unexpected characters at end of cpu list ('%s'), using online CPUs." , cpu_list); cpus =perf_cpu_map__new_online_cpus (); - }else + }else { cpus =perf_cpu_map__new_any_cpu (); + } invalid:free (tmp_cpus); out:
Signature · 1 line
2.47.0.338.g60cca15819-goog
Quoted 7 lines · Ian Rogers
Prompted by Kyle Meyer's <[email protected]> report of the
MAX_NR_CPUSvalue being too small, initiate some clean up of its use. Kyle's patch is at the head of the series. The additional patches hideMAX_NR_CPUSas exposed fromcpumap.h, reduce its use by removingperf_cpu_map__read, and try to better size the temporary CPU array inperf_cpu_map__new.
Quoted 10 lines · Leo Yan
Quoted 7 lines · Ian Rogers
Prompted by Kyle Meyer's <[email protected]> report of the
MAX_NR_CPUSvalue being too small, initiate some clean up of its use. Kyle's patch is at the head of the series. The additional patches hideMAX_NR_CPUSas exposed fromcpumap.h, reduce its use by removingperf_cpu_map__read, and try to better size the temporary CPU array inperf_cpu_map__new.Reviewed-by Leo Yan <[email protected]>
Thanks, applied to perf-tools-next,
- Arnaldo