From: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
To: Adrian Hunter <adrian.hunter@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H . Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Leo Yan <leo.yan@linaro.org>, Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH RFC 2/6] perf dso: Refactor dso_cache__read()
Date: Fri, 25 Oct 2019 11:54:00 -0300 [thread overview]
Message-ID: <20191025145400.GB24735@kernel.org> (raw)
In-Reply-To: <20191025130000.13032-3-adrian.hunter@intel.com>
Em Fri, Oct 25, 2019 at 03:59:56PM +0300, Adrian Hunter escreveu:
> Refactor dso_cache__read() to separate populating the cache from copying
> data from it. This is preparation for adding a cache "write" that will
> update the data in the cache.
Ditto for 2/6 and 3/6, i.e. applying them now.
- Arnaldo
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> tools/perf/util/dso.c | 64 +++++++++++++++++++++++++------------------
> 1 file changed, 37 insertions(+), 27 deletions(-)
>
> diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
> index e11ddf86f2b3..460330d125b6 100644
> --- a/tools/perf/util/dso.c
> +++ b/tools/perf/util/dso.c
> @@ -768,7 +768,7 @@ dso_cache__free(struct dso *dso)
> pthread_mutex_unlock(&dso->lock);
> }
>
> -static struct dso_cache *dso_cache__find(struct dso *dso, u64 offset)
> +static struct dso_cache *__dso_cache__find(struct dso *dso, u64 offset)
> {
> const struct rb_root *root = &dso->data.cache;
> struct rb_node * const *p = &root->rb_node;
> @@ -863,54 +863,64 @@ static ssize_t file_read(struct dso *dso, struct machine *machine,
> return ret;
> }
>
> -static ssize_t
> -dso_cache__read(struct dso *dso, struct machine *machine,
> - u64 offset, u8 *data, ssize_t size)
> +static struct dso_cache *dso_cache__populate(struct dso *dso,
> + struct machine *machine,
> + u64 offset, ssize_t *ret)
> {
> u64 cache_offset = offset & DSO__DATA_CACHE_MASK;
> struct dso_cache *cache;
> struct dso_cache *old;
> - ssize_t ret;
>
> cache = zalloc(sizeof(*cache) + DSO__DATA_CACHE_SIZE);
> - if (!cache)
> - return -ENOMEM;
> + if (!cache) {
> + *ret = -ENOMEM;
> + return NULL;
> + }
>
> if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO)
> - ret = bpf_read(dso, cache_offset, cache->data);
> + *ret = bpf_read(dso, cache_offset, cache->data);
> else
> - ret = file_read(dso, machine, cache_offset, cache->data);
> + *ret = file_read(dso, machine, cache_offset, cache->data);
>
> - if (ret > 0) {
> - cache->offset = cache_offset;
> - cache->size = ret;
> + if (*ret <= 0) {
> + free(cache);
> + return NULL;
> + }
>
> - old = dso_cache__insert(dso, cache);
> - if (old) {
> - /* we lose the race */
> - free(cache);
> - cache = old;
> - }
> + cache->offset = cache_offset;
> + cache->size = *ret;
>
> - ret = dso_cache__memcpy(cache, offset, data, size);
> + old = dso_cache__insert(dso, cache);
> + if (old) {
> + /* we lose the race */
> + free(cache);
> + cache = old;
> }
>
> - if (ret <= 0)
> - free(cache);
> + return cache;
> +}
>
> - return ret;
> +static struct dso_cache *dso_cache__find(struct dso *dso,
> + struct machine *machine,
> + u64 offset,
> + ssize_t *ret)
> +{
> + struct dso_cache *cache = __dso_cache__find(dso, offset);
> +
> + return cache ? cache : dso_cache__populate(dso, machine, offset, ret);
> }
>
> static ssize_t dso_cache_read(struct dso *dso, struct machine *machine,
> u64 offset, u8 *data, ssize_t size)
> {
> struct dso_cache *cache;
> + ssize_t ret = 0;
>
> - cache = dso_cache__find(dso, offset);
> - if (cache)
> - return dso_cache__memcpy(cache, offset, data, size);
> - else
> - return dso_cache__read(dso, machine, offset, data, size);
> + cache = dso_cache__find(dso, machine, offset, &ret);
> + if (!cache)
> + return ret;
> +
> + return dso_cache__memcpy(cache, offset, data, size);
> }
>
> /*
> --
> 2.17.1
--
- Arnaldo
next prev parent reply other threads:[~2019-10-25 14:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 12:59 [PATCH RFC 0/6] perf/x86: Add perf text poke event Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 1/6] " Adrian Hunter
2019-10-30 10:47 ` Leo Yan
2019-10-30 12:46 ` Peter Zijlstra
2019-10-30 14:19 ` Leo Yan
2019-10-30 15:00 ` Mike Leach
2019-10-30 16:23 ` Peter Zijlstra
2019-10-31 7:31 ` Leo Yan
2019-11-01 10:04 ` Peter Zijlstra
2019-11-01 10:09 ` Peter Zijlstra
2019-11-04 2:23 ` Leo Yan
2019-11-08 15:05 ` Leo Yan
2019-11-11 14:46 ` Peter Zijlstra
2019-11-11 15:39 ` Will Deacon
2019-11-11 16:05 ` Peter Zijlstra
2019-11-11 17:29 ` Will Deacon
2019-11-11 20:32 ` Peter Zijlstra
[not found] ` <CAJ9a7VgZH7g=rFDpKf=FzEcyBVLS_WjqbrqtRnjOi7WOY4st+w@mail.gmail.com>
2019-11-01 10:06 ` Peter Zijlstra
2019-11-04 10:40 ` Peter Zijlstra
2019-11-04 12:32 ` Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 2/6] perf dso: Refactor dso_cache__read() Adrian Hunter
2019-10-25 14:54 ` Arnaldo Carvalho de Melo [this message]
2019-10-28 15:39 ` Jiri Olsa
2019-10-29 9:19 ` Adrian Hunter
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 3/6] perf dso: Add dso__data_write_cache_addr() Adrian Hunter
2019-10-28 15:45 ` Jiri Olsa
2019-10-29 9:20 ` Adrian Hunter
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 4/6] perf tools: Add support for PERF_RECORD_TEXT_POKE Adrian Hunter
2019-10-25 12:59 ` [PATCH RFC 5/6] perf auxtrace: Add auxtrace_cache__remove() Adrian Hunter
2019-10-25 14:48 ` Arnaldo Carvalho de Melo
2019-11-12 11:18 ` [tip: perf/core] " tip-bot2 for Adrian Hunter
2019-10-25 13:00 ` [PATCH RFC 6/6] perf intel-pt: Add support for text poke events Adrian Hunter
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=20191025145400.GB24735@kernel.org \
--to=arnaldo.melo@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).