From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D3C6C433E2 for ; Mon, 7 Sep 2020 16:03:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 357562080A for ; Mon, 7 Sep 2020 16:03:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730338AbgIGQDY (ORCPT ); Mon, 7 Sep 2020 12:03:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729966AbgIGP76 (ORCPT ); Mon, 7 Sep 2020 11:59:58 -0400 Received: from sym2.noone.org (sym2.noone.org [IPv6:2a01:4f8:120:4161::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6C43C061573; Mon, 7 Sep 2020 08:59:54 -0700 (PDT) Received: by sym2.noone.org (Postfix, from userid 1002) id 4BlXzQ607Bzvjc1; Mon, 7 Sep 2020 17:59:46 +0200 (CEST) Date: Mon, 7 Sep 2020 17:59:46 +0200 From: Tobias Klauser To: Jiri Olsa Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Alexei Starovoitov , Daniel Borkmann , netdev@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Jesper Dangaard Brouer Subject: Re: [PATCH] perf tools: Do not use deprecated bpf_program__title Message-ID: <20200907155945.2ynl7dojgx572j62@distanz.ch> References: <20200907110237.1329532-1-jolsa@kernel.org> <20200907110549.GI1199773@krava> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200907110549.GI1199773@krava> User-Agent: NeoMutt/20170113 (1.7.2) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 2020-09-07 at 13:05:49 +0200, Jiri Olsa wrote: > On Mon, Sep 07, 2020 at 01:02:37PM +0200, Jiri Olsa wrote: > > The bpf_program__title function got deprecated in libbpf, > > use the suggested alternative. > > > > Fixes: 521095842027 ("libbpf: Deprecate notion of BPF program "title" in favor of "section name"") > > Signed-off-by: Jiri Olsa > > Arnaldo, > the commit in 'Fixes' is not yet in your tree yet and the patch > below will make the perf compilation fail in your perf/core.. > > it fixes perf compilation on top of bpf-next tree.. so I think it > should go in through bpf-next tree > > thanks, > jirka > > > --- > > tools/perf/util/bpf-loader.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c > > index 2feb751516ab..73de3973c8ec 100644 > > --- a/tools/perf/util/bpf-loader.c > > +++ b/tools/perf/util/bpf-loader.c > > @@ -328,7 +328,7 @@ config_bpf_program(struct bpf_program *prog) > > probe_conf.no_inlines = false; > > probe_conf.force_add = false; > > > > - config_str = bpf_program__title(prog, false); > > + config_str = bpf_program__section_name(prog); > > if (IS_ERR(config_str)) { > > pr_debug("bpf: unable to get title for program\n"); > > return PTR_ERR(config_str); > > @@ -454,7 +454,7 @@ preproc_gen_prologue(struct bpf_program *prog, int n, > > if (err) { > > const char *title; > > > > - title = bpf_program__title(prog, false); > > + title = bpf_program__section_name(prog); > > if (!title) > > title = "[unknown]"; I think bpf_program__title at line 457 in preproc_gen_prologue also needs to be changed given the following build failure: util/bpf-loader.c: In function 'preproc_gen_prologue': util/bpf-loader.c:457:3: error: 'bpf_program__title' is deprecated: BPF program title is confusing term; please use bpf_program__section_name() instead [-Werror=deprecated-declarations] 457 | title = bpf_program__title(prog, false); | ^~~~~ In file included from util/bpf-loader.c:10: /home/tklauser/src/linux/tools/lib/bpf/libbpf.h:203:13: note: declared here 203 | const char *bpf_program__title(const struct bpf_program *prog, bool needs_copy); | ^~~~~~~~~~~~~~~~~~