Messages in this thread | | | From | Arnaldo Carvalho de Melo <> | Date | Fri, 26 Apr 2019 12:12:51 -0300 | Subject | Re: [PATCH] perf/report: Report OOM in perf report status line |
| |
Em Fri, Apr 26, 2019 at 04:44:06PM +0200, Jiri Olsa escreveu: > On Fri, Apr 26, 2019 at 11:16:07AM -0300, Arnaldo Carvalho de Melo wrote: > > SNIP > > > > util/session.c: In function ‘perf_session__process_events’: > > > util/session.c:1936:7: error: ‘skip’ may be used uninitialized in this function [-Werror=maybe-uninitialized] > > > err = skip; > > > ~~~~^~~~~~ > > > util/session.c:1874:6: note: ‘skip’ was declared here > > > s64 skip; > > > ^~~~ > > > cc1: all warnings being treated as errors > > > mv: cannot stat '/tmp/build/perf/util/.session.o.tmp': No such file or directory > > > make[4]: *** [/home/acme/git/perf/tools/build/Makefile.build:96: /tmp/build/perf/util/session.o] Error 1 > > > make[3]: *** [/home/acme/git/perf/tools/build/Makefile.build:139: util] Error 2 > > > make[2]: *** [Makefile.perf:559: /tmp/build/perf/perf-in.o] Error 2 > > > make[1]: *** [Makefile.perf:215: sub-make] Error 2 > > > make: *** [Makefile:110: install-bin] Error 2 > > > make: Leaving directory '/home/acme/git/perf/tools/perf' > > > > So, here is your patch: > > > > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > > index b17f1c9bc965..e89716175588 100644 > > --- a/tools/perf/util/session.c > > +++ b/tools/perf/util/session.c > > @@ -1930,10 +1930,10 @@ reader__process_events(struct reader *rd, struct perf_session *session, > > > > if (size < sizeof(struct perf_event_header) || > > (skip = rd->process(session, event, file_pos)) < 0) { > > - pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n", > > + pr_err("%#" PRIx64 " [%#x]: failed to process type: %d [%s]\n", > > file_offset + head, event->header.size, > > - event->header.type); > > - err = -EINVAL; > > + event->header.type, strerror(-skip)); > > + err = skip; > > goto out; > > } > > > > [acme@quaco perf]$ > > > > What happens if (size < sizeof(struct perf_event_header)) is true? size > > will have an undefined value, so the right thing is to have this patch > > on top of yours, so that err get, as before, set to -EINVAL when the > > size is less than the perf_event_header sizeof: > > I'd think you need to squash your change with the original patch > for the bisecting sake, right?
Yes, that is what I did.
> > +++ b/tools/perf/util/session.c > > @@ -1928,6 +1928,8 @@ reader__process_events(struct reader *rd, struct perf_session *session, > > > > size = event->header.size; > > > > + skip = -EINVAL; > > + > > if (size < sizeof(struct perf_event_header) || > > (skip = rd->process(session, event, file_pos)) < 0) { > > pr_err("%#" PRIx64 " [%#x]: failed to process type: %d [%s]\n", > > > > --- > > > > With two Reviewed-by tags, I jumped to quickly at applying, please > > compile test next time guys ;-) :-)
> ugh.. need to slow down, this is happening too often now :-\
Right, I'll test build everything, and I do like reviewers, who don't? Its just that when I see reviewed-by tags I end up relaxing a bit :-)
- Arnaldo
| |