From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>
Cc: <pi3orama@163.com>, <linux-kernel@vger.kernel.org>,
Wang Nan <wangnan0@huawei.com>, He Kuang <hekuang@huawei.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>,
Jiri Olsa <jolsa@kernel.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>,
"Zefan Li" <lizefan@huawei.com>
Subject: [PATCH v5 1/8] perf tools: Check 'base' pointer before checking refcnt when put a mmap
Date: Wed, 25 May 2016 05:03:36 +0000 [thread overview]
Message-ID: <1464152623-171824-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1464152623-171824-1-git-send-email-wangnan0@huawei.com>
evlist->mmap[i]->refcnt could be 0 if an evlist has no evsel or all
evsels don't match the evlist during mmap. For example, when all evsels
are overwritable but the evlist itself is normal. To avoid crashing,
perf should check 'base' pointer before checking refcnt, and raise bug
only when base is not NULL.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
tools/perf/util/evlist.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index fbd0d47..f916d25 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -857,9 +857,11 @@ static void perf_evlist__mmap_get(struct perf_evlist *evlist, int idx)
static void perf_evlist__mmap_put(struct perf_evlist *evlist, int idx)
{
- BUG_ON(atomic_read(&evlist->mmap[idx].refcnt) == 0);
+ struct perf_mmap *mmap = &evlist->mmap[idx];
- if (atomic_dec_and_test(&evlist->mmap[idx].refcnt))
+ BUG_ON(mmap->base && atomic_read(&mmap->refcnt) == 0);
+
+ if (atomic_dec_and_test(&mmap->refcnt))
__perf_evlist__munmap(evlist, idx);
}
--
1.8.3.4
next prev parent reply other threads:[~2016-05-25 5:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 5:03 [PATCH v5 0/8] perf tools: Support overwritable ring buffer Wang Nan
2016-05-25 5:03 ` Wang Nan [this message]
2016-05-25 5:03 ` [PATCH v5 2/8] perf tools: Choose correct reading direction according to evlist->backward Wang Nan
2016-05-25 5:03 ` [PATCH v5 3/8] perf tests: Add testcase for auxiliary evlist Wang Nan
2016-05-25 5:03 ` [PATCH v5 4/8] perf record: Introduce rec->overwrite_evlist for overwritable events Wang Nan
2016-05-25 10:16 ` Wangnan (F)
2016-05-25 13:47 ` Wangnan (F)
2016-05-25 14:18 ` Arnaldo Carvalho de Melo
2016-05-25 5:03 ` [PATCH v5 5/8] perf record: Toggle overwrite ring buffer for reading Wang Nan
2016-05-25 5:03 ` [PATCH v5 6/8] perf tools: Enable overwrite settings Wang Nan
2016-05-25 5:03 ` [PATCH v5 7/8] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
2016-05-25 5:03 ` [PATCH v5 8/8] perf tools: Check write_backward during evlist config Wang Nan
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=1464152623-171824-2-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=namhyung@kernel.org \
--cc=pi3orama@163.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
all inboxes | Powered by JetHome®