From: David Carrillo-Cisneros <davidcc@google.com>
To: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@kernel.org>
Cc: Kees Kook <keescook@chromium.org>,
Sudeep Holla <Sudeep.Holla@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Wang Nan <wangnan0@huawei.com>,
Elena Reshetova <elena.reshetova@intel.com>,
Stephane Eranian <eranian@google.com>,
Paul Turner <pjt@google.com>,
David Carrillo-Cisneros <davidcc@google.com>
Subject: [PATCH 1/4] perf tool cgroup: Initialize cgroup refcnt with refcount_set
Date: Tue, 18 Jul 2017 18:18:36 -0700 [thread overview]
Message-ID: <20170719011839.99399-2-davidcc@google.com> (raw)
In-Reply-To: <20170719011839.99399-1-davidcc@google.com>
Atomic reference counters were replaced by refcount_t in
commit 79c5fe6db8c7 ("perf/core: Fix error handling in perf_event_alloc()")
In util/cgroup.c atomic_inc was replaced by refcount_inc, but the latter
is not mean to initiliaze refcounts with zero value. Add a path
to initialize cgrp->refcnt == 0 using refcount_set.
Before this patch:
$ perf stat -e cycles -C 0 -G /
perf_before: /usr/local/.../tools/include/linux/refcount.h:108: refcount_inc: Assertion `!(!refcount_inc_not_zero(r))' failed.
Aborted (core dumped)
After this patch:
$ perf stat -e cycles -C 0 -G /
Performance counter stats for 'CPU(s) 0':
17,516,664 cycles /
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Change-Id: I8f00f61aaecce876e7df448bd7f850b20db13ef1
---
tools/perf/util/cgroup.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
index 03347748f3fa..7bbc19b3caf3 100644
--- a/tools/perf/util/cgroup.c
+++ b/tools/perf/util/cgroup.c
@@ -133,7 +133,10 @@ static int add_cgroup(struct perf_evlist *evlist, char *str)
return -1;
found:
- refcount_inc(&cgrp->refcnt);
+ if (refcount_read(&cgrp->refcnt) == 0)
+ refcount_set(&cgrp->refcnt, 1);
+ else
+ refcount_inc(&cgrp->refcnt);
counter->cgrp = cgrp;
return 0;
}
--
2.13.2.932.g7449e964c-goog
next prev parent reply other threads:[~2017-07-19 1:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 1:18 [PATCH 0/4] Resubmitted forgotten patches David Carrillo-Cisneros
2017-07-19 1:18 ` David Carrillo-Cisneros [this message]
2017-07-21 16:55 ` [PATCH 1/4] perf tool cgroup: Initialize cgroup refcnt with refcount_set Arnaldo Carvalho de Melo
2017-07-19 1:18 ` [PATCH 2/4] perf tools: Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS to makefile David Carrillo-Cisneros
2017-07-26 17:22 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-07-19 1:18 ` [PATCH 3/4] perf annotate: Process tracing data in pipe mode David Carrillo-Cisneros
2017-07-26 17:22 ` [tip:perf/core] " tip-bot for David Carrillo-Cisneros
2017-07-19 1:18 ` [PATCH 4/4] tools: perf: Fix linker error when libelf config is disabled David Carrillo-Cisneros
2017-07-26 17:23 ` [tip:perf/core] perf jvmti: " tip-bot for Sudeep Holla
2017-07-19 8:45 ` [PATCH 0/4] Resubmitted forgotten patches Jiri Olsa
2017-07-21 17:00 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170719011839.99399-2-davidcc@google.com \
--to=davidcc@google.com \
--cc=Sudeep.Holla@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=elena.reshetova@intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pjt@google.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox