redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf tools: Propagate get_cpuid() error 

For consistency, propagate the exact cause for get_cpuid() to have
failed.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-9ig269f7ktnhh99g4l15vpu2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
alistair/sunxi64-5.4-dsi
Arnaldo Carvalho de Melo 2019-09-30 10:55:34 -03:00
parent 6bdfd9f118
commit f67001a4a0
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/arch/powerpc/util/header.c
View File

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -30,7 +31,7 @@ get_cpuid(char *buffer, size_t sz)
buffer[nb-1] = '\0'; buffer[nb-1] = '\0';
return 0; return 0;
} }
return -1; return ENOBUFS;
} }
char * char *

9
tools/perf/arch/s390/util/header.c
View File

@ -8,6 +8,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -54,7 +55,7 @@ int get_cpuid(char *buffer, size_t sz)
sysinfo = fopen(SYSINFO, "r"); sysinfo = fopen(SYSINFO, "r");
if (sysinfo == NULL) if (sysinfo == NULL)
return -1; return errno;
while ((read = getline(&line, &line_sz, sysinfo)) != -1) { while ((read = getline(&line, &line_sz, sysinfo)) != -1) {
if (!strncmp(line, SYSINFO_MANU, strlen(SYSINFO_MANU))) { if (!strncmp(line, SYSINFO_MANU, strlen(SYSINFO_MANU))) {
@ -89,7 +90,7 @@ int get_cpuid(char *buffer, size_t sz)
/* Missing manufacturer, type or model information should not happen */ /* Missing manufacturer, type or model information should not happen */
if (!manufacturer[0] || !type[0] || !model[0]) if (!manufacturer[0] || !type[0] || !model[0])
return -1; return EINVAL;
/* /*
* Scan /proc/service_levels and return the CPU-MF counter facility * Scan /proc/service_levels and return the CPU-MF counter facility
@ -133,14 +134,14 @@ skip_sysinfo:
else else
nbytes = snprintf(buffer, sz, "%s,%s,%s", manufacturer, type, nbytes = snprintf(buffer, sz, "%s,%s,%s", manufacturer, type,
model); model);
return (nbytes >= sz) ? -1 : 0; return (nbytes >= sz) ? ENOBUFS : 0;
} }
char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused) char *get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
{ {
char *buf = malloc(128); char *buf = malloc(128);
if (buf && get_cpuid(buf, 128) < 0) if (buf && get_cpuid(buf, 128))
zfree(&buf); zfree(&buf);
return buf; return buf;
} }

3
tools/perf/arch/x86/util/header.c
View File

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -58,7 +59,7 @@ __get_cpuid(char *buffer, size_t sz, const char *fmt)
buffer[nb-1] = '\0'; buffer[nb-1] = '\0';
return 0; return 0;
} }
return -1; return ENOBUFS;
} }
int int

7
tools/perf/builtin-kvm.c
View File

@ -705,14 +705,15 @@ static int process_sample_event(struct perf_tool *tool,
static int cpu_isa_config(struct perf_kvm_stat *kvm) static int cpu_isa_config(struct perf_kvm_stat *kvm)
{ {
char buf[64], *cpuid; char buf[128], *cpuid;
int err; int err;
if (kvm->live) { if (kvm->live) {
err = get_cpuid(buf, sizeof(buf)); err = get_cpuid(buf, sizeof(buf));
if (err != 0) { if (err != 0) {
pr_err("Failed to look up CPU type\n"); pr_err("Failed to look up CPU type: %s\n",
return err; str_error_r(err, buf, sizeof(buf)));
return -err;
} }
cpuid = buf; cpuid = buf;
} else } else