Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230525071133.2066610-1-irogers@google.com> <20230525071133.2066610-2-irogers@google.com>
 <CAM9d7cgaSPbnjoA6bv8fwkpoyc6nCdXOOrbmBm_jGbZbm3a_4w@mail.gmail.com> <CAP-5=fX0BnzQacr1NRQfis42osk07BuKJ9BqNTf7pGBMoj4ORA@mail.gmail.com>
In-Reply-To: <CAP-5=fX0BnzQacr1NRQfis42osk07BuKJ9BqNTf7pGBMoj4ORA@mail.gmail.com>
From:   Namhyung Kim <namhyung@kernel.org>
Date:   Thu, 25 May 2023 23:00:54 -0700
Message-ID: <CAM9d7ci5NhKTUPv_+v5t-exVOSESTzpV4BrUCfQhXbFLrV0kDg@mail.gmail.com>
Subject: Re: [PATCH v1 01/16] perf header: Make nodes dynamic in write_mem_topology
To:     Ian Rogers <irogers@google.com>
Cc:     Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Adrian Hunter <adrian.hunter@intel.com>,
        "Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
        "Steven Rostedt (Google)" <rostedt@goodmis.org>,
        Ross Zwisler <zwisler@chromium.org>,
        Leo Yan <leo.yan@linaro.org>,
        Tiezhu Yang <yangtiezhu@loongson.cn>,
        Yang Jihong <yangjihong1@huawei.com>,
        Andi Kleen <ak@linux.intel.com>,
        Kan Liang <kan.liang@linux.intel.com>,
        Ravi Bangoria <ravi.bangoria@amd.com>,
        Sean Christopherson <seanjc@google.com>,
        K Prateek Nayak <kprateek.nayak@amd.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Thu, May 25, 2023 at 7:39 PM Ian Rogers <irogers@google.com> wrote:
>
> On Thu, May 25, 2023 at 12:15 PM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > On Thu, May 25, 2023 at 12:12 AM Ian Rogers <irogers@google.com> wrote:
> > >
> > > Avoid a large static array, dynamically allocate the nodes avoiding a
> > > hard coded limited as well.
> > >
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > ---
> > >  tools/perf/util/header.c | 33 +++++++++++++++++++++------------
> > >  1 file changed, 21 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> > > index 2dde3ca20de5..80593ed8c79b 100644
> > > --- a/tools/perf/util/header.c
> > > +++ b/tools/perf/util/header.c
> > > @@ -24,6 +24,7 @@
> > >  #include <bpf/libbpf.h>
> > >  #endif
> > >  #include <perf/cpumap.h>
> > > +#include <tools/libc_compat.h> // reallocarray
> > >
> > >  #include "dso.h"
> > >  #include "evlist.h"
> > > @@ -1396,13 +1397,14 @@ static int memory_node__sort(const void *a, const void *b)
> > >         return na->node - nb->node;
> > >  }
> > >
> > > -static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
> > > +static int build_mem_topology(struct memory_node **nodesp, u64 *cntp)
> > >  {
> > >         char path[PATH_MAX];
> > >         struct dirent *ent;
> > >         DIR *dir;
> > > -       u64 cnt = 0;
> > >         int ret = 0;
> > > +       size_t cnt = 0, size = 0;
> > > +       struct memory_node *nodes = NULL;
> > >
> > >         scnprintf(path, PATH_MAX, "%s/devices/system/node/",
> > >                   sysfs__mountpoint());
> > > @@ -1426,16 +1428,24 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
> > >                 if (r != 1)
> > >                         continue;
> > >
> > > -               if (WARN_ONCE(cnt >= size,
> > > -                       "failed to write MEM_TOPOLOGY, way too many nodes\n")) {
> > > -                       closedir(dir);
> > > -                       return -1;
> > > -               }
> > > +               if (cnt >= size) {
> > > +                       struct memory_node *new_nodes =
> > > +                               reallocarray(nodes, cnt + 4, sizeof(*nodes));
> > >
> > > +                       if (!new_nodes) {
> > > +                               pr_err("Failed to write MEM_TOPOLOGY, size %zd nodes\n", size);
> > > +                               free(nodes);
> > > +                               closedir(dir);
> > > +                               return -ENOMEM;
> > > +                       }
> > > +                       nodes = new_nodes;
> > > +                       size += 4;
> > > +               }
> > >                 ret = memory_node__read(&nodes[cnt++], idx);
> >
> > I think you need to handle error cases here.
> >
> > Thanks,
> > Namhyung
>
> Not sure I follow. The reallocarray tests for failure, frees nodes and
> returns -ENOMEM on error.

Right, but I think it would leak the nodes when the
memory_node__read() fails.

Thanks,
Namhyung