mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 20:21:57 +00:00
2b42b09b88
With commit:e1e455f4f4(perf tools: Work around lack of sched_getcpu in glibc < 2.6), perf_bench numa mem with -c or -m option is not able to correctly calculate convergence. With the above commit, sched_getcpu always seems to return -1. The intention of commite1e455fwas to add a sched_getcpu in glibc < 2.6. Hence keep the sched_getcpu definition under an ifdef. This regression happened occurred between v4.0 and v4.1 Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Vinson Lee <vlee@twitter.com> Fixes:e1e455f4f4("perf tools: Work around lack of sched_getcpu in glibc < 2.6") Link: http://lkml.kernel.org/r/20150624111004.GA5220@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
97 lines
1.8 KiB
C
97 lines
1.8 KiB
C
#include <sched.h>
|
|
#include "util.h"
|
|
#include "../perf.h"
|
|
#include "cloexec.h"
|
|
#include "asm/bug.h"
|
|
#include "debug.h"
|
|
|
|
static unsigned long flag = PERF_FLAG_FD_CLOEXEC;
|
|
|
|
#ifdef __GLIBC_PREREQ
|
|
#if !__GLIBC_PREREQ(2, 6)
|
|
int __weak sched_getcpu(void)
|
|
{
|
|
errno = ENOSYS;
|
|
return -1;
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
static int perf_flag_probe(void)
|
|
{
|
|
/* use 'safest' configuration as used in perf_evsel__fallback() */
|
|
struct perf_event_attr attr = {
|
|
.type = PERF_TYPE_SOFTWARE,
|
|
.config = PERF_COUNT_SW_CPU_CLOCK,
|
|
.exclude_kernel = 1,
|
|
};
|
|
int fd;
|
|
int err;
|
|
int cpu;
|
|
pid_t pid = -1;
|
|
char sbuf[STRERR_BUFSIZE];
|
|
|
|
cpu = sched_getcpu();
|
|
if (cpu < 0)
|
|
cpu = 0;
|
|
|
|
/*
|
|
* Using -1 for the pid is a workaround to avoid gratuitous jump label
|
|
* changes.
|
|
*/
|
|
while (1) {
|
|
/* check cloexec flag */
|
|
fd = sys_perf_event_open(&attr, pid, cpu, -1,
|
|
PERF_FLAG_FD_CLOEXEC);
|
|
if (fd < 0 && pid == -1 && errno == EACCES) {
|
|
pid = 0;
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
err = errno;
|
|
|
|
if (fd >= 0) {
|
|
close(fd);
|
|
return 1;
|
|
}
|
|
|
|
WARN_ONCE(err != EINVAL && err != EBUSY,
|
|
"perf_event_open(..., PERF_FLAG_FD_CLOEXEC) failed with unexpected error %d (%s)\n",
|
|
err, strerror_r(err, sbuf, sizeof(sbuf)));
|
|
|
|
/* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */
|
|
while (1) {
|
|
fd = sys_perf_event_open(&attr, pid, cpu, -1, 0);
|
|
if (fd < 0 && pid == -1 && errno == EACCES) {
|
|
pid = 0;
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
err = errno;
|
|
|
|
if (fd >= 0)
|
|
close(fd);
|
|
|
|
if (WARN_ONCE(fd < 0 && err != EBUSY,
|
|
"perf_event_open(..., 0) failed unexpectedly with error %d (%s)\n",
|
|
err, strerror_r(err, sbuf, sizeof(sbuf))))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
unsigned long perf_event_open_cloexec_flag(void)
|
|
{
|
|
static bool probed;
|
|
|
|
if (!probed) {
|
|
if (perf_flag_probe() <= 0)
|
|
flag = 0;
|
|
probed = true;
|
|
}
|
|
|
|
return flag;
|
|
}
|