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;
Date:   Fri, 18 Feb 2022 10:01:25 +0100
From:   Jiri Olsa <olsajiri@gmail.com>
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc:     Jiri Olsa <jolsa@kernel.org>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Andrii Nakryiko <andrii@kernel.org>,
        lkml <linux-kernel@vger.kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Ingo Molnar <mingo@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Ian Rogers <irogers@google.com>,
        "linux-perf-use." <linux-perf-users@vger.kernel.org>,
        bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH 1/3] perf tools: Remove
 bpf_program__set_priv/bpf_program__priv usage
Message-ID: <Yg9gZa0hxfFcOk57@krava>
References: <20220217131916.50615-1-jolsa@kernel.org>
 <20220217131916.50615-2-jolsa@kernel.org>
 <CAEf4BzboYd4y53KjKwNMCqE6oV9ms0zbtKCGweEGtjZvCe1f0w@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAEf4BzboYd4y53KjKwNMCqE6oV9ms0zbtKCGweEGtjZvCe1f0w@mail.gmail.com>
Precedence: bulk

On Thu, Feb 17, 2022 at 01:47:16PM -0800, Andrii Nakryiko wrote:
> On Thu, Feb 17, 2022 at 5:19 AM Jiri Olsa <jolsa@kernel.org> wrote:
> >
> > Both bpf_program__set_priv/bpf_program__priv are deprecated
> > and will be eventually removed.
> >
> > Using hashmap to replace that functionality.
> >
> > Suggested-by: Andrii Nakryiko <andrii@kernel.org>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  tools/perf/util/bpf-loader.c | 91 +++++++++++++++++++++++++++++-------
> >  1 file changed, 75 insertions(+), 16 deletions(-)
> >
> 
> [...]
> 
> > +
> > +static int program_set_priv(struct bpf_program *prog, void *priv)
> > +{
> > +       void *old_priv;
> > +
> > +       if (!bpf_program_hash) {
> > +               bpf_program_hash = hashmap__new(ptr_hash, ptr_equal, NULL);
> > +               if (!bpf_program_hash)
> 
> should use IS_ERR here

ah right, thanks

jirka

> 
> > +                       return -ENOMEM;
> > +       }
> > +
> > +       old_priv = program_priv(prog);
> > +       if (old_priv) {
> > +               clear_prog_priv(prog, old_priv);
> > +               return hashmap__set(bpf_program_hash, prog, priv, NULL, NULL);
> > +       }
> > +       return hashmap__add(bpf_program_hash, prog, priv);
> >  }
> 
> [...]