mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-21 06:59:28 +07:00
cd8dd032f6
When converting from atomic_t to refcount_t we didn't follow the usual
step of initializing it to one before taking any new reference, which
trips over checking if taking a reference for a freed refcount_t, fix
it.
Brendan's report:
---
It's 4.12-rc7, with node v4.4.1. I'm building 4.13-rc1 now, as I hit
what I think is another unrelated perf bug and I'm starting to wonder
what else is broken on that version:
(root) /mnt/src/linux-4.12-rc7/tools/perf # ./perf record -F 99 -a -e
cpu-clock --cgroup=docker/f9e9d5df065b14646e8a11edc837a13877fd90c171137b2ba3feb67a0201cb65
-g
perf: /mnt/src/linux-4.12-rc7/tools/include/linux/refcount.h:108:
refcount_inc: Assertion `!(!refcount_inc_not_zero(r))' failed.
Aborted
that used to work...
---
Testing it:
Before:
# perf stat -e cycles -C 0 --cgroup /
perf: /home/acme/git/linux/tools/include/linux/refcount.h:108: refcount_inc: Assertion `!(!refcount_inc_not_zero(r))' failed.
Aborted (core dumped)
#
After:
# perf stat -e cycles -C 0 --cgroup /
^C
Performance counter stats for 'CPU(s) 0':
132,081,393 cycles /
2.492942763 seconds time elapsed
#
Reported-by: Brendan Gregg <brendan.d.gregg@gmail.com>
Acked-by: Elena Reshetova <elena.reshetova@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David Carrillo-Cisneros <davidcc@google.com>
Cc: Kees Kook <keescook@chromium.org>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sudeep Holla <Sudeep.Holla@arm.com>
Cc: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 79c5fe6db8
("perf cgroup: Convert cgroup_sel.refcnt from atomic_t to refcount_t")
Link: http://lkml.kernel.org/n/tip-l7ovfblq14ip2i08m1g0fkhv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
189 lines
3.5 KiB
C
189 lines
3.5 KiB
C
#include "util.h"
|
|
#include "../perf.h"
|
|
#include <subcmd/parse-options.h>
|
|
#include "evsel.h"
|
|
#include "cgroup.h"
|
|
#include "evlist.h"
|
|
#include <linux/stringify.h>
|
|
|
|
int nr_cgroups;
|
|
|
|
static int
|
|
cgroupfs_find_mountpoint(char *buf, size_t maxlen)
|
|
{
|
|
FILE *fp;
|
|
char mountpoint[PATH_MAX + 1], tokens[PATH_MAX + 1], type[PATH_MAX + 1];
|
|
char path_v1[PATH_MAX + 1], path_v2[PATH_MAX + 2], *path;
|
|
char *token, *saved_ptr = NULL;
|
|
|
|
fp = fopen("/proc/mounts", "r");
|
|
if (!fp)
|
|
return -1;
|
|
|
|
/*
|
|
* in order to handle split hierarchy, we need to scan /proc/mounts
|
|
* and inspect every cgroupfs mount point to find one that has
|
|
* perf_event subsystem
|
|
*/
|
|
path_v1[0] = '\0';
|
|
path_v2[0] = '\0';
|
|
|
|
while (fscanf(fp, "%*s %"__stringify(PATH_MAX)"s %"__stringify(PATH_MAX)"s %"
|
|
__stringify(PATH_MAX)"s %*d %*d\n",
|
|
mountpoint, type, tokens) == 3) {
|
|
|
|
if (!path_v1[0] && !strcmp(type, "cgroup")) {
|
|
|
|
token = strtok_r(tokens, ",", &saved_ptr);
|
|
|
|
while (token != NULL) {
|
|
if (!strcmp(token, "perf_event")) {
|
|
strcpy(path_v1, mountpoint);
|
|
break;
|
|
}
|
|
token = strtok_r(NULL, ",", &saved_ptr);
|
|
}
|
|
}
|
|
|
|
if (!path_v2[0] && !strcmp(type, "cgroup2"))
|
|
strcpy(path_v2, mountpoint);
|
|
|
|
if (path_v1[0] && path_v2[0])
|
|
break;
|
|
}
|
|
fclose(fp);
|
|
|
|
if (path_v1[0])
|
|
path = path_v1;
|
|
else if (path_v2[0])
|
|
path = path_v2;
|
|
else
|
|
return -1;
|
|
|
|
if (strlen(path) < maxlen) {
|
|
strcpy(buf, path);
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
static int open_cgroup(char *name)
|
|
{
|
|
char path[PATH_MAX + 1];
|
|
char mnt[PATH_MAX + 1];
|
|
int fd;
|
|
|
|
|
|
if (cgroupfs_find_mountpoint(mnt, PATH_MAX + 1))
|
|
return -1;
|
|
|
|
snprintf(path, PATH_MAX, "%s/%s", mnt, name);
|
|
|
|
fd = open(path, O_RDONLY);
|
|
if (fd == -1)
|
|
fprintf(stderr, "no access to cgroup %s\n", path);
|
|
|
|
return fd;
|
|
}
|
|
|
|
static int add_cgroup(struct perf_evlist *evlist, char *str)
|
|
{
|
|
struct perf_evsel *counter;
|
|
struct cgroup_sel *cgrp = NULL;
|
|
int n;
|
|
/*
|
|
* check if cgrp is already defined, if so we reuse it
|
|
*/
|
|
evlist__for_each_entry(evlist, counter) {
|
|
cgrp = counter->cgrp;
|
|
if (!cgrp)
|
|
continue;
|
|
if (!strcmp(cgrp->name, str)) {
|
|
refcount_inc(&cgrp->refcnt);
|
|
break;
|
|
}
|
|
|
|
cgrp = NULL;
|
|
}
|
|
|
|
if (!cgrp) {
|
|
cgrp = zalloc(sizeof(*cgrp));
|
|
if (!cgrp)
|
|
return -1;
|
|
|
|
cgrp->name = str;
|
|
refcount_set(&cgrp->refcnt, 1);
|
|
|
|
cgrp->fd = open_cgroup(str);
|
|
if (cgrp->fd == -1) {
|
|
free(cgrp);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* find corresponding event
|
|
* if add cgroup N, then need to find event N
|
|
*/
|
|
n = 0;
|
|
evlist__for_each_entry(evlist, counter) {
|
|
if (n == nr_cgroups)
|
|
goto found;
|
|
n++;
|
|
}
|
|
if (refcount_dec_and_test(&cgrp->refcnt))
|
|
free(cgrp);
|
|
|
|
return -1;
|
|
found:
|
|
counter->cgrp = cgrp;
|
|
return 0;
|
|
}
|
|
|
|
void close_cgroup(struct cgroup_sel *cgrp)
|
|
{
|
|
if (cgrp && refcount_dec_and_test(&cgrp->refcnt)) {
|
|
close(cgrp->fd);
|
|
zfree(&cgrp->name);
|
|
free(cgrp);
|
|
}
|
|
}
|
|
|
|
int parse_cgroups(const struct option *opt __maybe_unused, const char *str,
|
|
int unset __maybe_unused)
|
|
{
|
|
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
|
|
const char *p, *e, *eos = str + strlen(str);
|
|
char *s;
|
|
int ret;
|
|
|
|
if (list_empty(&evlist->entries)) {
|
|
fprintf(stderr, "must define events before cgroups\n");
|
|
return -1;
|
|
}
|
|
|
|
for (;;) {
|
|
p = strchr(str, ',');
|
|
e = p ? p : eos;
|
|
|
|
/* allow empty cgroups, i.e., skip */
|
|
if (e - str) {
|
|
/* termination added */
|
|
s = strndup(str, e - str);
|
|
if (!s)
|
|
return -1;
|
|
ret = add_cgroup(evlist, s);
|
|
if (ret) {
|
|
free(s);
|
|
return -1;
|
|
}
|
|
}
|
|
/* nr_cgroups is increased een for empty cgroups */
|
|
nr_cgroups++;
|
|
if (!p)
|
|
break;
|
|
str = p+1;
|
|
}
|
|
return 0;
|
|
}
|