perf arch: Make the default get_cpuid() return compatible error
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 05267c7eac12627fae3f25dfd203bfdb9941f9ca Gitweb: https://git.kernel.org/tip/05267c7eac12627fae3f25dfd203bfdb9941f9ca Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 11 Dec 2019 10:09:24 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 11 Dec 2019 12:25:14 -03:00
perf arch: Make the default get_cpuid() return compatible error
Some of the functions calling get_cpuid() propagate back the error it returns, and all are using errno (positive) values, make the weak default get_cpuid() function return ENOSYS to be consistent and to allow checking if this is an arch not providing this function or if a provided one is having trouble getting the cpuid, to decide if the warning should be provided to the user or just a debug message should be emitted.
--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -850,7 +850,7 @@ int __weak strcmp_cpuid_str(const char *mapcpuid, const char *cpuid)*/ int __weak get_cpuid (char *buffer__maybe_unused ,size_t sz__maybe_unused ) { -return -1 ; +return ENOSYS ;/* Not implemented */ } static int write_cpuid(struct feat_fd *ff,
[tip: perf/urgent] perf top: Do not bail out when perf_env__read_cpuid() returns ENOSYS
In reply to a message not in the archiveThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 61208e6e1003b3fd8d2d1f2a72ec27be43955c0b Gitweb: https://git.kernel.org/tip/61208e6e1003b3fd8d2d1f2a72ec27be43955c0b Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 11 Dec 2019 10:21:59 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Wed, 11 Dec 2019 12:26:25 -03:00
perf top: Do not bail out when perf_env__read_cpuid() returns ENOSYS
'perf top' stopped working on hw architectures that do not provide a get_cpuid() implementation and thus fallback to the weak get_cpuid() default function.
This is done because at annotation time we may need it in the arch specific annotation init routine, but that is only being used by arches that do provide a get_cpuid() implementation:
$ find tools/ -name "*.[ch]" | xargs grep 'evlist->env' tools/perf/builtin-top.c: top.evlist->env = &perf_env; tools/perf/util/evsel.c: return evsel->evlist->env; tools/perf/util/s390-cpumsf.c: sf->machine_type = s390_cpumsf_get_type(session->evlist->env->cpuid); tools/perf/util/header.c: session->evlist->env = &header->env; tools/perf/util/sample-raw.c: const char *arch_pf = perf_env__arch(evlist->env); $
$ find tools/perf/arch -name "*.[ch]" | xargs grep -w get_cpuid tools/perf/arch/x86/util/auxtrace.c: ret = get_cpuid(buffer, sizeof(buffer)); tools/perf/arch/x86/util/header.c:get_cpuid(char *buffer, size_t sz) tools/perf/arch/powerpc/util/header.c:get_cpuid(char *buffer, size_t sz) tools/perf/arch/s390/util/header.c: * Implementation of get_cpuid(). tools/perf/arch/s390/util/header.c:int get_cpuid(char *buffer, size_t sz) tools/perf/arch/s390/util/header.c: if (buf && get_cpuid(buf, 128)) $
For 'report' or 'script', i.e. tools working on perf.data files, that is setup while reading the header, its just top that needs to explicitely read it at tool start.
--- tools/perf/builtin-top.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/builtin-top.c +7 -3
@@ -1568,9 +1568,13 @@ int cmd_top(int argc, const char **argv)*/ status =perf_env__read_cpuid (&perf_env);if (status) { -pr_err ("Couldn't read the cpuid for this machine: %s\n" , -str_error_r (errno, errbuf,sizeof (errbuf))); - goto out_delete_evlist; +/* +* Some arches do not provide a get_cpuid(), so just use pr_debug, otherwise +* warn the user explicitely. +*/ +eprintf (status ==ENOSYS ?1 :0 , verbose, +"Couldn't read the cpuid for this machine: %s\n" , +str_error_r (errno, errbuf,sizeof (errbuf))); } top.evlist->env = &perf_env;