lkml.org 
[lkml]   [2020]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCHv2 2/4] perf tools: Mark ksymbol dsos with kernel type
Em Mon, Feb 10, 2020 at 09:08:47PM +0100, Jiri Olsa escreveu:
> On Mon, Feb 10, 2020 at 04:25:37PM +0100, Jiri Olsa wrote:
> > On Mon, Feb 10, 2020 at 12:17:59PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Mon, Feb 10, 2020 at 03:32:16PM +0100, Jiri Olsa escreveu:
> > > > We add ksymbol map into machine->kmaps, so it needs to be
> > > > created as 'struct kmap', which is dependent on its dso
> > > > having kernel type.
> > > >
> > > > Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> > > > Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> > > > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > > > ---
> > > > tools/perf/util/machine.c | 10 ++++++++--
> > > > 1 file changed, 8 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> > > > index e3e5490f6de5..0a43dc83d7b2 100644
> > > > --- a/tools/perf/util/machine.c
> > > > +++ b/tools/perf/util/machine.c
> > > > @@ -727,8 +727,14 @@ static int machine__process_ksymbol_register(struct machine *machine,
> > > > struct map *map = maps__find(&machine->kmaps, event->ksymbol.addr);
> > > >
> > > > if (!map) {
> > > > - map = dso__new_map(event->ksymbol.name);
> > > > - if (!map)
> > > > + struct dso *dso = dso__new(event->ksymbol.name);
> > > > +
> > > > + if (dso) {
> > > > + dso->kernel = DSO_TYPE_KERNEL;
> > > > + map = map__new2(0, dso);
> > > > + }
> > > > +
> > > > + if (!dso || !map)
> > >
> > > We leak dso if map creation fails?
> >
> > yep :-\ will post v2
>
> v2 attached, it's also all in my perf/top branch

Thanks for fixing it, will process it into my perf/urgent branch.

- Arnaldo

> thanks,
> jirka
>
>
> ---
> We add ksymbol map into machine->kmaps, so it needs to be
> created as 'struct kmap', which is dependent on its dso
> having kernel type.
>
> Reported-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/machine.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index e3e5490f6de5..0ad026561c7f 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -727,9 +727,17 @@ static int machine__process_ksymbol_register(struct machine *machine,
> struct map *map = maps__find(&machine->kmaps, event->ksymbol.addr);
>
> if (!map) {
> - map = dso__new_map(event->ksymbol.name);
> - if (!map)
> + struct dso *dso = dso__new(event->ksymbol.name);
> +
> + if (dso) {
> + dso->kernel = DSO_TYPE_KERNEL;
> + map = map__new2(0, dso);
> + }
> +
> + if (!dso || !map) {
> + dso__put(dso);
> return -ENOMEM;
> + }
>
> map->start = event->ksymbol.addr;
> map->end = map->start + event->ksymbol.len;
> --
> 2.24.1
>

--

- Arnaldo

\
 
 \ /
  Last update: 2020-02-11 14:47    [W:0.096 / U:2.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site