Re: [PATCH 2/4] perf tools: Mark ksymbol dsos with kernel type

From: Arnaldo Carvalho de Melo
Date: Mon Feb 10 2020 - 10:18:05 EST


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@xxxxxxxxxxxxx>
> Tested-by: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxx>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
> 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?


- Arnaldo

> return -ENOMEM;
>
> map->start = event->ksymbol.addr;
> --
> 2.24.1
>

--

- Arnaldo