From: Jiri Olsa <olsajiri@gmail.com>
To: Ian Rogers <irogers@google.com>
Cc: Namhyung Kim <namhyung@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] perf evlist: Avoid iteration for empty evlist.
Date: Thu, 17 Mar 2022 09:57:49 +0100 [thread overview]
Message-ID: <YjL4DX+oGZQA4zbn@krava> (raw)
In-Reply-To: <CAP-5=fUkgp0G+Hj8fnO0RdMdbcKMesEHHE5SgS5OPpj_iW_D9w@mail.gmail.com>
On Wed, Mar 16, 2022 at 01:16:30PM -0700, Ian Rogers wrote:
> On Wed, Mar 16, 2022 at 7:08 AM Jiri Olsa <olsajiri@gmail.com> wrote:
> >
> > On Wed, Mar 16, 2022 at 12:10:49AM -0700, Ian Rogers wrote:
> > > As seen with 'perf stat --null ..' and reported in:
> > > https://lore.kernel.org/lkml/YjCLcpcX2peeQVCH@kernel.org/
> > >
> > > Fixes: 472832d2c000 ("perf evlist: Refactor evlist__for_each_cpu()")
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > ---
> > > tools/perf/util/evlist.c | 5 ++++-
> > > 1 file changed, 4 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> > > index 8134d45e2164..a2dba9e00765 100644
> > > --- a/tools/perf/util/evlist.c
> > > +++ b/tools/perf/util/evlist.c
> > > @@ -354,7 +354,10 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin
> > > .affinity = affinity,
> > > };
> > >
> > > - if (itr.affinity) {
> > > + if (evlist__empty(evlist)) {
> > > + /* Ensure the empty list doesn't iterate. */
> > > + itr.evlist_cpu_map_idx = itr.evlist_cpu_map_nr;
> >
> > I can't see the crash anymore, but I'm bit confused with the code
> >
> > if evlist is empty then itr.evsel is bogus.. and the loop code
> > __run_perf_stat is just lucky, right?
>
> The itr.evsel is the list head, so bogus.
>
> > I think we need to set itr.evsel to NULL and skip the loop in
> > case evlist is empty
>
> So that's the effect of this change except that the evsel is the list
> head. I'm not sure it is worth adding the condition to setting the
> evsel to capture that given that with the end condition having been
> met it would be invalid to read it. There's a similar problem for the
> other fields of the iterator.
ah ok, I got it.. but it seems to be just evsel that's wrong,
just as a precaution, could we set it only when it's valid?
with something like below
thanks,
jirka
---
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index a2dba9e00765..76a6c70c3c40 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -346,7 +346,7 @@ struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affin
{
struct evlist_cpu_iterator itr = {
.container = evlist,
- .evsel = evlist__first(evlist),
+ .evsel = evlist__empty(evlist) ? NULL : evlist__first(evlist),
.cpu_map_idx = 0,
.evlist_cpu_map_idx = 0,
.evlist_cpu_map_nr = perf_cpu_map__nr(evlist->core.all_cpus),
prev parent reply other threads:[~2022-03-17 8:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 7:10 [PATCH] perf evlist: Avoid iteration for empty evlist Ian Rogers
2022-03-16 14:08 ` Jiri Olsa
2022-03-16 20:16 ` Ian Rogers
2022-03-17 8:57 ` Jiri Olsa [this message]
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=YjL4DX+oGZQA4zbn@krava \
--to=olsajiri@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@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