Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp6708429rwl; Mon, 9 Jan 2023 11:56:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXvExaInsvXYiiqjVZyNC0+xbSxf0FQPurPDxopvB3e18/fWrB0FyCcnS8M+frjxp43xbREN X-Received: by 2002:a17:903:3253:b0:192:6bfe:2a32 with SMTP id ji19-20020a170903325300b001926bfe2a32mr48651452plb.56.1673294170971; Mon, 09 Jan 2023 11:56:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673294170; cv=none; d=google.com; s=arc-20160816; b=BLXYdn0IBc77sm7ZcbJ9Q7SSxqp43qFUcEgKkJj9fZo/vaAbjZASr2p7B0ZoAjzQsS FrvDBDy+8kUtZy3x0mz6sjBpLVDgjQhKDmYa5Ln/QF+NMMZkvZjqw2z0OrfubSL2opbi HM+MiLRRSiDUmix5zRN45+c39s5OwZusDEr9aWevJGjOMZ97XNckl3Lvi9412ZA7B7+9 rpzrq9Jafk2rdrzALoL+h6uOwo0uE4ioqvz3tkVmH3c+WwvPhDMtO6Tkx5OxhUC70dHp MJQBTvUyd/xAff+oguZ6yVJi60jRbn97artU2nYchU3bGqHIf2m4gxa+tsLUXCHt1yUL tg8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=B4GAcDOHnS45dwGYt1z3etvzuHK9xKfgR9hh2p9DLcE=; b=SyWdpsK+AYZcv4jy68UWOa5exojxNaqinL6FVMBO0++F0hDMCTDDH2wA4PSzauvyN0 y0nlpV1lByOQ7JrwzSFvtJf4T7gPcRn4gsVGDi7ERw6rKdRNYdZsdN+VM4eJ+hSPlPv/ 7GaohCWdfkb2bYELPIHb+dpC4mltoTSk/UWR03hZzCEsVow6ORBr1ZqrZRaccGtFah3j +oYP4F1OoFdqzwucSkB6uFbXSbt7tHZypDOgwotcQE8DCibtaqVAITytpWFN7jBrR7xf mMfcf0Ltr/jS1uObAMfdjNB+k95ulYrg6sFIsIBE5h/1z0tveU6JukEf2ZuPiYWs6FGN 9YMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=HSrwfJ5q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e16-20020a17090301d000b00189b36a5427si9452048plh.16.2023.01.09.11.56.04; Mon, 09 Jan 2023 11:56:10 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=HSrwfJ5q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237402AbjAITfD (ORCPT + 53 others); Mon, 9 Jan 2023 14:35:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbjAITfA (ORCPT ); Mon, 9 Jan 2023 14:35:00 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92E0915FD2 for ; Mon, 9 Jan 2023 11:34:57 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id m8-20020a05600c3b0800b003d96f801c48so9955457wms.0 for ; Mon, 09 Jan 2023 11:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=B4GAcDOHnS45dwGYt1z3etvzuHK9xKfgR9hh2p9DLcE=; b=HSrwfJ5qNjtlE7TvEa9AjxfLddO2riQHjySYFqMRi6zVB1Op7NV/whHtRu2sNKo23K fPvMutXlNoMr/VAB1hCS7RsnP4OmI4ZtVWXgvedzImZKTiICqCKBOqzOXJq8tL7lbHI/ 6Ve/HgVrkzDAub3AbSkBjkz71Hduv5PzG1Jsl6TDcSJGm5g7DCirlsTJhSCvdlEbmOaL wkoqtzlcmOgC8g2WKHQOoUEzAbck4CHqIS3HaEcTah92z+CxfKWBilY9z9JXMdKBLzNJ oHnHS2P9vowSUYlioAU4+MPzh/DmnCe1fm96swaMvCHNTGYd9DoVZKIWBC1glX9o24hu 7Bkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=B4GAcDOHnS45dwGYt1z3etvzuHK9xKfgR9hh2p9DLcE=; b=zb9kpBtXoid38ANQOk09vo/UDWzqJZxaPk/NWljjTSbQ16S5BTsiQy1/7uMGnBax/g lyCS4jTm03o7ZCra77bvH600kxDtcSVDnfGcBGIweEWxfsFP9IKwqJXWGBGsd4J4rKnx oPsE0o1Rog0iylJO2CKBfZrHXdHGz211KuUk7If7VpO7jTnJL4fqkHPDkIJgJkk4ShNH 9qGEQCccyyViWibaewLAttouPrbFN+bVEzvTwi8LdFZKASQ+RbR/p2heRB1b550+jy22 GcPcT9fIT3wBYdtmV863RJlO2FUY5BV0R3LWR4xq9C1VlUwcxAMRuNLQvdWUYdGA+xCh vRpA== X-Gm-Message-State: AFqh2kqRlujbSoRAdm8vMhWe7gI4Y3tzYGeYcDlZc5Dui2HZ6cH+5ooC 1pRD/fR7cQhc63iK4JhFSPOBB50XEhqeeXKj/5B+9A== X-Received: by 2002:a1c:4c04:0:b0:3d9:edae:ed7 with SMTP id z4-20020a1c4c04000000b003d9edae0ed7mr222654wmf.182.1673292896011; Mon, 09 Jan 2023 11:34:56 -0800 (PST) MIME-Version: 1.0 References: <20230106151320.619514-1-irogers@google.com> In-Reply-To: From: Ian Rogers Date: Mon, 9 Jan 2023 11:34:44 -0800 Message-ID: Subject: Re: [PATCH v3 1/2] perf build: Properly guard libbpf includes To: Jiri Olsa Cc: Arnaldo Carvalho de Melo , Mike Leach , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-17.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL,USER_IN_DEF_SPF_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 9, 2023 at 11:29 AM Ian Rogers wrote: > > On Mon, Jan 9, 2023 at 10:37 AM Ian Rogers wrote: > > > > On Mon, Jan 9, 2023 at 10:10 AM Jiri Olsa wrote: > > > > > > On Mon, Jan 09, 2023 at 12:12:15PM -0300, Arnaldo Carvalho de Melo wrote: > > > > Em Fri, Jan 06, 2023 at 11:06:46AM -0800, Ian Rogers escreveu: > > > > > So trying to get build-test working on my Debian derived distro is a > > > > > PITA with broken feature detection for options I don't normally use. > > > > > > > > Its really difficult to have perf building with so many dependent > > > > libraries, mowing out some should be in order. > > > > > > > > > I'll try to fix this. > > > > > > > > Thanks. > > > > > > > > > In any case I think I've spotted what is really happening here and it > > > > > isn't a failure but a feature :-D The build is specifying > > > > > > > > I get it. > > > > > > > > > LIBBPF_DYNAMIC=1 which means you get the libbpf headers from > > > > > /usr/include. I think the build is trying to do this on a system with > > > > > an old libbpf and hence getting the failures above. Previously, even > > > > > though we wanted the dynamic headers we still had a -I, this time for > > > > > the install_headers version. Now you really are using the system > > > > > version and it is broken. This means a few things: > > > > > - the libbpf feature test should fail if code like above is going to fail, > > > > > > > > Agreed. > > > > > > > > > - we may want to contemplate supporting older libbpfs (I'd rather not), > > > > > > > > I'd rather require everybody to be up to the latest trends, but I really > > > > don't think that is a reasonable expectation. > > > > > > > > > - does build-test have a way to skip known issues like this? > > > > > > > > Unsure, Jiri? > > > > > > I don't think so it just triggers the build, it's up to the features check > > > to disable the feature if the library is not compatible with perf code > > > > > > could we add that specific libbpf call to the libbpf feature check? > > > > Looking at the failure closer, the failing code is code inside a > > feature check trying to workaround the feature not being present. We > > need to do something like: > > > > ``` > > diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c > > index 6e9b06cf06ee..a1c3cc230273 100644 > > --- a/tools/perf/util/bpf-loader.c > > +++ b/tools/perf/util/bpf-loader.c > > @@ -33,17 +33,18 @@ > > #include > > > > #ifndef HAVE_LIBBPF_BPF_PROGRAM__SET_INSNS > > -int bpf_program__set_insns(struct bpf_program *prog __maybe_unused, > > - struct bpf_insn *new_insns __maybe_unused, > > size_t new_insn_cnt __maybe_un > > used) > > +static int bpf_program__set_insns(struct bpf_program *prog __maybe_unused, > > + struct bpf_insn *new_insns __maybe_unused, > > + size_t new_insn_cnt __maybe_unused) > > { > > pr_err("%s: not support, update libbpf\n", __func__); > > return -ENOTSUP; > > } > > > > -int libbpf_register_prog_handler(const char *sec __maybe_unused, > > - enum bpf_prog_type prog_type __maybe_unused, > > - enum bpf_attach_type exp_attach_type > > __maybe_unused, > > - const struct > > libbpf_prog_handler_opts *opts __maybe_unused) > > +static int libbpf_register_prog_handler(const char *sec __maybe_unused, > > + enum bpf_prog_type prog_type > > __maybe_unused, > > + enum bpf_attach_type > > exp_attach_type __maybe_unused, > > + const void *opts __maybe_unused) > > { > > pr_err("%s: not support, update libbpf\n", __func__); > > return -ENOTSUP; > > ``` > > > > There are some other fixes necessary too. I'll try to write the fuller > > patch but I have no means for testing except for undefining > > HAVE_LIBBPF_BPF_PROGRAM__SET_INSNS. > > > > Thanks, > > Ian > > So libbpf_prog_handler_opts is missing in the failing build, this > points to a libbpf before 0.8. I'm somewhat concerned that to work > around these linkage problems we're adding runtime errors - we may > build but the functionality is totally crippled. Is it worth > maintaining these broken builds or to just upfront fail the feature > test? > > We can also switch the feature tests for LIBBPF_MAJOR_VERSION and > LIBBPF_MINOR_VERSION checks. This would have the property of letting > us tie the error messages to what version of libbpf is assumed. > > In this case we could have a feature test for the libbpf version and > if the version is before libbpf 0.8 fail the feature check. A quick > way to do this is: > ``` > diff --git a/tools/build/feature/test-libbpf.c > b/tools/build/feature/test-libbpf.c > index a508756cf4cc..dadd8186b71d 100644 > --- a/tools/build/feature/test-libbpf.c > +++ b/tools/build/feature/test-libbpf.c > @@ -1,6 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0 > #include > > +#if (LIBBPF_MAJOR_VERSION == 0) && (LIBBPF_MINOR_VERSION < 8) > +#error At least libbpf 0.8 is assumed for Linux tools. > +#endif > + > int main(void) > { > return bpf_object__open("test") ? 0 : -1; > ``` > > Thanks, > Ian Oh, just to note. While failing the feature test is disappointing for a libbpf that isn't very old, we have the newer libbpf to statically build in. Developers won't be impacted due to the static route. If you are a distro maintainer, you should just update your libbpf. So we could just bump the API assumption to 1.0 as I believe that'd have the advantage of removing feature tests, workarounds, untested code (like what broke here), etc. What do you think? Thanks, Ian > > > jirka > > > > > > > > > > > But yeah, previous experiences with Andrii were that we can do not too > > > > costly feature checks, not using .c programs that would fail if some > > > > required feature wasn't present but instead would just do some grep on a > > > > header and if some "smell" wasn't scent, just fail the cap query. > > > > > > > > - Arnaldo